Author: aboudreault-guest Date: 2010-10-08 15:12:07 +0000 (Fri, 08 Oct 2010) New Revision: 2941
Removed: packages/postgis/trunk/debian/patches/getopt.dpatch Modified: packages/postgis/trunk/debian/changelog packages/postgis/trunk/debian/control packages/postgis/trunk/debian/patches/00list packages/postgis/trunk/debian/rules Log: New upstream release of postgis: 1.5.2 Modified: packages/postgis/trunk/debian/changelog =================================================================== --- packages/postgis/trunk/debian/changelog 2010-10-08 14:47:06 UTC (rev 2940) +++ packages/postgis/trunk/debian/changelog 2010-10-08 15:12:07 UTC (rev 2941) @@ -1,3 +1,11 @@ +postgis (1.5.2-1) unstable; urgency=low + + * New upstream release, with a few bug fixes. + * Added shp2pgsql-gui binary. + * Removed patches, applied upstream: getopt. + + -- Alan Boudreault <aboudrea...@mapgears.com> Wed, 29 Sep 2010 09:16:10 -0400 + postgis (1.5.1-5) unstable; urgency=high * This version requires geos >= 3.1.1, debian/control updated. Modified: packages/postgis/trunk/debian/control =================================================================== --- packages/postgis/trunk/debian/control 2010-10-08 14:47:06 UTC (rev 2940) +++ packages/postgis/trunk/debian/control 2010-10-08 15:12:07 UTC (rev 2941) @@ -5,7 +5,8 @@ Uploaders: Stephen Frost <sfr...@debian.org>, Francesco Paolo Lovergine <fran...@debian.org> Build-Depends: debhelper (>= 7), autotools-dev, flex, bison, postgresql-server-dev-8.4, libgeos-dev (>= 3.1.1), libproj-dev (>= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl, libpg-java, - default-jdk, fastjar, libjts-java (>= 1.7), dpatch, imagemagick, libcunit1-dev, dblatex, libxml2-dev + default-jdk, fastjar, libjts-java (>= 1.7), dpatch, imagemagick, libcunit1-dev, dblatex, libxml2-dev, + libgtk2.0-dev Standards-Version: 3.8.4 Homepage: http://postgis.refractions.net/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/postgis/ Modified: packages/postgis/trunk/debian/patches/00list =================================================================== --- packages/postgis/trunk/debian/patches/00list 2010-10-08 14:47:06 UTC (rev 2940) +++ packages/postgis/trunk/debian/patches/00list 2010-10-08 15:12:07 UTC (rev 2941) @@ -1,3 +1,2 @@ install generator -getopt Deleted: packages/postgis/trunk/debian/patches/getopt.dpatch =================================================================== --- packages/postgis/trunk/debian/patches/getopt.dpatch 2010-10-08 14:47:06 UTC (rev 2940) +++ packages/postgis/trunk/debian/patches/getopt.dpatch 2010-10-08 15:12:07 UTC (rev 2941) @@ -1,288 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## getopt.dpatch by Francesco Paolo Lovergine <fran...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -...@dpatch@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' postgis-1.5.1~/loader/getopt.c postgis-1.5.1/loader/getopt.c ---- postgis-1.5.1~/loader/getopt.c 2010-02-01 18:35:55.000000000 +0100 -+++ postgis-1.5.1/loader/getopt.c 2010-05-22 19:10:55.000000000 +0200 -@@ -31,7 +31,7 @@ - */ - - #define ERR(s, c)\ -- if(opterr){\ -+ if(pgis_opterr){\ - char errbuf[2];\ - errbuf[0] = (char)c; errbuf[1] = '\n';\ - (void) write(2, argv[0], (unsigned)strlen(argv[0]));\ -@@ -39,10 +39,10 @@ - (void) write(2, errbuf, 2);\ - } - --int opterr = 1; --int optind = 1; --int optopt; --char *optarg; -+int pgis_opterr = 1; -+int pgis_optind = 1; -+int pgis_optopt; -+char *pgis_optarg; - - int - pgis_getopt(int argc, char **argv, char *opts) -@@ -53,51 +53,51 @@ - - if (sp == 1) - { -- if (optind >= argc || -- argv[optind][0] != '-' /* && argv[optind][0] != '/' */ || -- argv[optind][1] == '\0') -+ if (pgis_optind >= argc || -+ argv[pgis_optind][0] != '-' /* && argv[pgis_optind][0] != '/' */ || -+ argv[pgis_optind][1] == '\0') - { - return(EOF); - } -- else if (strcmp(argv[optind], "--") == 0) -+ else if (strcmp(argv[pgis_optind], "--") == 0) - { -- optind++; -+ pgis_optind++; - return(EOF); - } - } -- optopt = c = argv[optind][sp]; -+ pgis_optopt = c = argv[pgis_optind][sp]; - if (c == ':' || (cp=strchr(opts, c)) == 0) - { - ERR(": illegal option -- ", c); -- if (argv[optind][++sp] == '\0') -+ if (argv[pgis_optind][++sp] == '\0') - { -- optind++; -+ pgis_optind++; - sp = 1; - } - return('?'); - } - if (*++cp == ':') - { -- if (argv[optind][sp+1] != '\0') -- optarg = &argv[optind++][sp+1]; -- else if (++optind >= argc) -+ if (argv[pgis_optind][sp+1] != '\0') -+ pgis_optarg = &argv[pgis_optind++][sp+1]; -+ else if (++pgis_optind >= argc) - { - ERR(": option requires an argument -- ", c); - sp = 1; - return('?'); - } - else -- optarg = argv[optind++]; -+ pgis_optarg = argv[pgis_optind++]; - sp = 1; - } - else - { -- if (argv[optind][++sp] == '\0') -+ if (argv[pgis_optind][++sp] == '\0') - { - sp = 1; -- optind++; -+ pgis_optind++; - } -- optarg = NULL; -+ pgis_optarg = NULL; - } - return(c); - } -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' postgis-1.5.1~/loader/getopt.h postgis-1.5.1/loader/getopt.h ---- postgis-1.5.1~/loader/getopt.h 2009-12-19 04:56:06.000000000 +0100 -+++ postgis-1.5.1/loader/getopt.h 2010-05-22 19:10:55.000000000 +0200 -@@ -1,9 +1,9 @@ - /* declarations for getopt and envargs */ - --extern int opterr; --extern int optind; --extern int optopt; --extern char *optarg; -+extern int pgis_opterr; -+extern int pgis_optind; -+extern int pgis_optopt; -+extern char *pgis_optarg; - - extern int pgis_getopt(int argc, char **argv, char *opts); - extern void envargs(int *pargc, char ***pargv, char *envstr); -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' postgis-1.5.1~/loader/pgsql2shp.c postgis-1.5.1/loader/pgsql2shp.c ---- postgis-1.5.1~/loader/pgsql2shp.c 2010-02-01 18:35:55.000000000 +0100 -+++ postgis-1.5.1/loader/pgsql2shp.c 2010-05-22 19:12:46.000000000 +0200 -@@ -1307,10 +1307,10 @@ - binary = 1; - break; - case 'f': -- shp_file = optarg; -+ shp_file = pgis_optarg; - break; - case 'h': -- snprintf(buf + strlen(buf), 255, "host=%s ", optarg); -+ snprintf(buf + strlen(buf), 255, "host=%s ", pgis_optarg); - break; - case 'd': - dswitchprovided = 1; -@@ -1321,16 +1321,16 @@ - unescapedattrs = 1; - break; - case 'u': -- snprintf(buf + strlen(buf), 255, "user=%s ", optarg); -+ snprintf(buf + strlen(buf), 255, "user=%s ", pgis_optarg); - break; - case 'p': -- snprintf(buf + strlen(buf), 255, "port=%s ", optarg); -+ snprintf(buf + strlen(buf), 255, "port=%s ", pgis_optarg); - break; - case 'P': -- snprintf(buf + strlen(buf), 255, "password=%s ", optarg); -+ snprintf(buf + strlen(buf), 255, "password=%s ", pgis_optarg); - break; - case 'g': -- geo_col_name = optarg; -+ geo_col_name = pgis_optarg; - break; - case 'k': - keep_fieldname_case = 1; -@@ -1343,15 +1343,15 @@ - } - - curindex=0; -- for (; optind<ARGC; optind++) -+ for (; pgis_optind<ARGC; pgis_optind++) - { - if (curindex == 0) - { -- snprintf(buf + strlen(buf), 255, "dbname=%s", ARGV[optind]); -+ snprintf(buf + strlen(buf), 255, "dbname=%s", ARGV[pgis_optind]); - } - else if (curindex == 1) - { -- parse_table(ARGV[optind]); -+ parse_table(ARGV[pgis_optind]); - - } - curindex++; -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' postgis-1.5.1~/loader/shp2pgsql-cli.c postgis-1.5.1/loader/shp2pgsql-cli.c ---- postgis-1.5.1~/loader/shp2pgsql-cli.c 2010-02-03 22:42:20.000000000 +0100 -+++ postgis-1.5.1/loader/shp2pgsql-cli.c 2010-05-22 19:14:00.000000000 +0200 -@@ -92,9 +92,9 @@ - break; - - case 's': -- if (optarg) -+ if (pgis_optarg) - { -- sscanf(optarg, "%d", &(config->sr_id)); -+ sscanf(pgis_optarg, "%d", &(config->sr_id)); - } - else - { -@@ -105,7 +105,7 @@ - break; - - case 'g': -- config->geom = optarg; -+ config->geom = pgis_optarg; - break; - - case 'k': -@@ -129,11 +129,11 @@ - break; - - case 'W': -- config->encoding = optarg; -+ config->encoding = pgis_optarg; - break; - - case 'N': -- switch (optarg[0]) -+ switch (pgis_optarg[0]) - { - case 'a': - config->null_policy = POLICY_NULL_ABORT; -@@ -161,10 +161,10 @@ - } - - /* Determine the shapefile name from the next argument, if no shape file, exit. */ -- if (optind < argc) -+ if (pgis_optind < argc) - { -- config->shp_file = argv[optind]; -- optind++; -+ config->shp_file = argv[pgis_optind]; -+ pgis_optind++; - } - else - { -@@ -173,25 +173,25 @@ - } - - /* Determine the table and schema names from the next argument */ -- if (optind < argc) -+ if (pgis_optind < argc) - { - char *ptr; - -- ptr = strchr(argv[optind], '.'); -+ ptr = strchr(argv[pgis_optind], '.'); - - /* Schema qualified table name */ - if (ptr) - { -- config->schema = malloc(strlen(argv[optind]) + 1); -- snprintf(config->schema, ptr - argv[optind] + 1, "%s", argv[optind]); -+ config->schema = malloc(strlen(argv[pgis_optind]) + 1); -+ snprintf(config->schema, ptr - argv[pgis_optind] + 1, "%s", argv[pgis_optind]); - -- config->table = malloc(strlen(argv[optind])); -- snprintf(config->table, strlen(argv[optind]) - strlen(config->schema), "%s", ptr + 1); -+ config->table = malloc(strlen(argv[pgis_optind])); -+ snprintf(config->table, strlen(argv[pgis_optind]) - strlen(config->schema), "%s", ptr + 1); - } - else - { -- config->table = malloc(strlen(argv[optind]) + 1); -- strcpy(config->table, argv[optind]); -+ config->table = malloc(strlen(argv[pgis_optind]) + 1); -+ strcpy(config->table, argv[pgis_optind]); - } - } - -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' postgis-1.5.1~/loader/shp2pgsql-gui.c postgis-1.5.1/loader/shp2pgsql-gui.c ---- postgis-1.5.1~/loader/shp2pgsql-gui.c 2010-02-01 18:35:55.000000000 +0100 -+++ postgis-1.5.1/loader/shp2pgsql-gui.c 2010-05-22 19:15:14.000000000 +0200 -@@ -1212,19 +1212,19 @@ - switch (c) - { - case 'U': -- conn->username = optarg; -+ conn->username = pgis_optarg; - break; - case 'p': -- conn->port = optarg; -+ conn->port = pgis_optarg; - break; - case 'W': -- conn->password = optarg; -+ conn->password = pgis_optarg; - break; - case 'd': -- conn->database = optarg; -+ conn->database = pgis_optarg; - break; - case 'h': -- conn->host = optarg; -+ conn->host = pgis_optarg; - break; - default: - usage(); Modified: packages/postgis/trunk/debian/rules =================================================================== --- packages/postgis/trunk/debian/rules 2010-10-08 14:47:06 UTC (rev 2940) +++ packages/postgis/trunk/debian/rules 2010-10-08 15:12:07 UTC (rev 2941) @@ -68,7 +68,8 @@ ./configure \ --docdir=\$${prefix}/share/doc/postgis \ --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info + --infodir=\$${prefix}/share/info \ + --with-pgconfig=/usr/lib/postgresql/8.4/bin/pg_config # PostGIS JDBC (with debug support) $(MAKE) -C java/jdbc clean DEBUGJAR=postgis_debug.fastjar JAR=fastjar JAVAC=javac $(MAKE) -C java/jdbc jar @@ -96,7 +97,8 @@ --datadir=\$${prefix}/share/postgresql-8.4-postgis \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ - --with-pgconfig=/usr/lib/postgresql/8.4/bin/pg_config + --with-pgconfig=/usr/lib/postgresql/8.4/bin/pg_config \ + --with-gui $(MAKE) $(MAKE) -C doc $(MAKE) install DESTDIR=$(CURDIR)/debian/postgresql-8.4-postgis _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
