← Back to branch summary

~ubuntu-branches/ubuntu/vivid/grass/vivid-proposed

« back to all changes in this revision

Viewing changes to general/g.setproj/proj.c

  • Committer: Package Import Robot
  • Author(s): Bas Couwenberg
  • Date: 2015-02-20 23:12:08 UTC
  • mfrom: (8.2.6 experimental)
  • Revision ID: package-import@ubuntu.com-20150220231208-1u6qvqm84v430b10
Tags: 7.0.0-1~exp1
* New upstream release.
* Update python-ctypes-ternary.patch to use if/else instead of and/or.
* Drop check4dev patch, rely on upstream check.
* Add build dependency on libpq-dev to grass-dev for libpq-fe.h.
* Drop patches applied upstream, refresh remaining patches.
* Update symlinks for images switched from jpg to png.

Show diffs side-by-side

added added

removed removed

Lines of Context:
general/g.setproj/proj.c
13
13
    struct proj_unit *unit;
14
14
    FILE *fp;
15
15
 
16
 
    sprintf(buf, "%s/etc/proj-units.table", G_gisbase());
 
16
    sprintf(buf, "%s/etc/proj/units.table", G_gisbase());
17
17
 
18
18
    fp = fopen(buf, "r");
19
19
    if (!fp)
51
51
    struct proj_desc *res;
52
52
    FILE *fp;
53
53
 
54
 
    sprintf(buf, "%s/etc/proj-desc.table", G_gisbase());
 
54
    sprintf(buf, "%s/etc/proj/desc.table", G_gisbase());
55
55
 
56
56
    fp = fopen(buf, "r");
57
57
    if (!fp)
93
93
    int done;
94
94
    FILE *fp;
95
95
 
96
 
    sprintf(buf, "%s/etc/proj-parms.table", G_gisbase());
 
96
    sprintf(buf, "%s/etc/proj/parms.table", G_gisbase());
97
97
 
98
98
    fp = fopen(buf, "r");
99
99
    if (!fp)
165
165
            parm->ask = 0;
166
166
        else {
167
167
            parm->ask = 1;
168
 
            G_warning(_("Unrecognized 'ask' value in proj-parms.table: %s"),
 
168
            G_warning(_("Unrecognized 'ask' value in parms.table: %s"),
169
169
                      ask);
170
170
        }
171
171
 
175
175
            parm->def_exists = 1;
176
176
        else {
177
177
            parm->def_exists = 0;
178
 
            G_warning(_("Unrecognized default value in proj-parms.table: %s"),
 
178
            G_warning(_("Unrecognized default value in parms.table: %s"),
179
179
                      dfl);
180
180
        }
181
181
    }