The following commit has been merged in the master branch:
commit 5c35ffd6670aba11021b2139c656ff4386c0e026
Author: Markus Wanner <mar...@bluegap.ch>
Date:   Thu Apr 11 22:03:54 2013 +0200

    Matching changelog:
     * Drop Build-Dep on postgresql server binaries - they are not needed.
     * Downgrade postgresql-9.1-postgis dependency on postgis to a
       recommendation.
     * Upgrade postgresql-9.1-java misc-depends from suggestion to dependency.
     * Fix a common spelling error in liblwgeom/lwout_wkt.c (thanks, lintian).
     * Ignore changes to auto-updated files (via source/options). Let
       debian/rules cleanup some more generated files.
     * rules: swap dh_makeshlibs and dh_installdeb.
     * Update and improve watchfile.
    
    Not matching changelog:
     * Revive libpostgis-java: I don't think we can get away without packaging
       this. (Especially not w/o an entry in the changelog).

diff --git a/debian/changelog b/debian/changelog
index 88afb7e..936e93b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,22 @@
-postgis (2.0.1-1) unstable; urgency=low
-
-  * New upstream release, 2.0.1
-  * Removed old patches
-  * Added Makefile.comments patch
-
- -- Jerome Villeneuve Larouche <jlarou...@mapgears.com>  Fri, 17 Aug 2012 
14:56:22 +0000
+postgis (2.0.3-1) UNRELEASED; urgency=low
+
+  [Markus Wanner]
+  * New upstream release, 2.0.3
+  * Drop Build-Dep on postgresql server binaries - they are not needed.
+  * Downgrade postgresql-9.1-postgis dependency on postgis to a
+    recommendation.
+  * Upgrade postgresql-9.1-java misc-depends from suggestion to dependency.
+  * Fix a common spelling error in liblwgeom/lwout_wkt.c.
+  * Ignore changes to auto-updated files (via source/options). Let
+    debian/rules cleanup some more generated files.
+  * rules: swap dh_makeshlibs and dh_installdeb.
+  * Update and improve watchfile.
+
+  [Jerome Villeneuve Larouche]
+  * Removed old patches (generator, html_doc_resources, install)
+  * Added patch fixmakedoc for doc/Makefile.comments.
+
+ -- Markus Wanner <mar...@bluegap.ch>  Fri, 12 Apr 2013 13:02:33 +0200
 
 postgis (1.5.3-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f16ed63..0128a44 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Stephen Frost <sfr...@debian.org>, Francesco Paolo 
Lovergine <frankie
 Build-Depends: debhelper (>= 8), autotools-dev, flex, bison, libgeos-dev (>= 
3.1.1),
  libproj-dev (>= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl,
  default-jdk, libpg-java, fastjar, libjts-java (>= 1.7), imagemagick,
- libcunit1-dev, dblatex, libxml2-dev, libgtk2.0-dev, postgresql-server-dev-9.1,
- ant, libgdal-dev, postgresql-9.1
+ libcunit1-dev, dblatex, libxml2-dev, libgtk2.0-dev,
+ postgresql-server-dev-9.1, ant, libgdal-dev
 Standards-Version: 3.9.2
 Homepage: http://postgis.refractions.net/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/postgis.git
@@ -15,7 +15,8 @@ Vcs-Git: git://git.debian.org/git/pkg-grass/postgis.git
 
 Package: postgresql-9.1-postgis
 Architecture: any
-Depends: ${shlibs:Depends}, postgis, postgresql-9.1, ${misc:Depends}
+Depends: ${shlibs:Depends}, postgresql-9.1, ${misc:Depends}
+Recommends: postgis
 Conflicts: postgis (<< 1.2.1)
 Description: Geographic objects support for PostgreSQL 9.1
  PostGIS adds support for geographic objects to the PostgreSQL 
object-relational
@@ -27,8 +28,8 @@ Description: Geographic objects support for PostgreSQL 9.1
  This package supports PostgreSQL 9.1.
 
 Package: postgis
-Suggests: postgresql-9.1-postgis
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: postgresql-9.1-postgis
 Architecture: any
 Description: Geographic objects support for PostgreSQL -- common files
  PostGIS adds support for geographic objects to the PostgreSQL 
object-relational
@@ -40,3 +41,19 @@ Description: Geographic objects support for PostgreSQL -- 
common files
  This package contains the PostGIS userland binaries, common files and
  documentation.
 
+Package: libpostgis-java
+Architecture: all
+Section: java
+Depends: libpg-java, ${misc:Depends}
+Suggests: postgresql-9.1-postgis
+Conflicts: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
+Replaces: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
+Description: Geographic objects support for PostgreSQL -- JDBC support
+ PostGIS adds support for geographic objects to the PostgreSQL 
object-relational
+ database. In effect, PostGIS "spatially enables" the PostgreSQL server, 
+ allowing it to be used as a backend spatial database for geographic 
information
+ systems (GIS), much like ESRI's SDE or Oracle's Spatial extension. PostGIS
+ follows the OpenGIS "Simple Features Specification for SQL".
+ .
+ This package contains JDBC support for PostGIS.
+
diff --git a/debian/patches/fix-spelling.diff b/debian/patches/fix-spelling.diff
new file mode 100644
index 0000000..ab43b82
--- /dev/null
+++ b/debian/patches/fix-spelling.diff
@@ -0,0 +1,38 @@
+--- a/liblwgeom/lwout_wkt.c
++++ b/liblwgeom/lwout_wkt.c
+@@ -325,7 +325,7 @@
+               }
+               else
+               {
+-                      lwerror("lwcompound_to_wkt_sb: Unknown type recieved %d 
- %s", type, lwtype_name(type));
++                      lwerror("lwcompound_to_wkt_sb: Unknown type received %d 
- %s", type, lwtype_name(type));
+               }
+       }
+       stringbuffer_append(sb, ")");
+@@ -372,7 +372,7 @@
+                       lwcompound_to_wkt_sb((LWCOMPOUND*)cpoly->rings[i], sb, 
precision, variant );
+                       break;
+               default:
+-                      lwerror("lwcurvepoly_to_wkt_sb: Unknown type recieved 
%d - %s", type, lwtype_name(type));
++                      lwerror("lwcurvepoly_to_wkt_sb: Unknown type received 
%d - %s", type, lwtype_name(type));
+               }
+       }
+       stringbuffer_append(sb, ")");
+@@ -420,7 +420,7 @@
+                       lwcompound_to_wkt_sb((LWCOMPOUND*)mcurv->geoms[i], sb, 
precision, variant );
+                       break;
+               default:
+-                      lwerror("lwmcurve_to_wkt_sb: Unknown type recieved %d - 
%s", type, lwtype_name(type));
++                      lwerror("lwmcurve_to_wkt_sb: Unknown type received %d - 
%s", type, lwtype_name(type));
+               }
+       }
+       stringbuffer_append(sb, ")");
+@@ -464,7 +464,7 @@
+                       lwcurvepoly_to_wkt_sb((LWCURVEPOLY*)msurf->geoms[i], 
sb, precision, variant);
+                       break;
+               default:
+-                      lwerror("lwmsurface_to_wkt_sb: Unknown type recieved %d 
- %s", type, lwtype_name(type));
++                      lwerror("lwmsurface_to_wkt_sb: Unknown type received %d 
- %s", type, lwtype_name(type));
+               }
+       }
+       stringbuffer_append(sb, ")");
diff --git a/debian/patches/fixmakedoc b/debian/patches/fixmakedoc
index 28a573f..3741f5c 100644
--- a/debian/patches/fixmakedoc
+++ b/debian/patches/fixmakedoc
@@ -19,7 +19,7 @@
  
 --- a/doc/Makefile
 +++ b/doc/Makefile
-@@ -245,7 +245,7 @@
+@@ -244,7 +244,7 @@
        rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html
        rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis
  
@@ -28,3 +28,4 @@
  
  uninstall: comments-uninstall
  
+
diff --git a/debian/patches/generator b/debian/patches/generator
deleted file mode 100644
index 11d19c0..0000000
--- a/debian/patches/generator
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: postgis/doc/html/image_src/generator.c
-===================================================================
---- postgis.orig/doc/html/image_src/generator.c        2011-03-24 
17:12:30.000000000 +0100
-+++ postgis/doc/html/image_src/generator.c     2011-03-24 17:36:08.000000000 
+0100
-@@ -363,7 +363,7 @@
-       while ( fgets ( line, sizeof line, pfile ) != NULL && !isspace(*line) )
-       {
- 
--              char output[2048];
-+              char output[4096];
-               char *ptr = output;
-               char *styleName;
-               int useDefaultStyle;
diff --git a/debian/patches/html_doc_resources 
b/debian/patches/html_doc_resources
deleted file mode 100644
index 981f462..0000000
--- a/debian/patches/html_doc_resources
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: postgis/doc/Makefile
-===================================================================
---- postgis.orig/doc/Makefile  2011-09-15 15:14:47.000000000 +0200
-+++ postgis/doc/Makefile       2011-11-21 16:06:03.000000000 +0100
-@@ -134,12 +134,16 @@
-       @mkdir -p $(PGSQL_DOCDIR)/postgis
-       @mkdir -p $(PGSQL_MANDIR)/man1
-       cp html/postgis.html $(PGSQL_DOCDIR)/postgis/postgis.html
-+      cp html/style.css $(PGSQL_DOCDIR)/postgis/style.css
-+      cp -r html/images $(PGSQL_DOCDIR)/postgis/
-       cp ../README.postgis $(PGSQL_DOCDIR)/postgis/README.postgis
-       cp man/pgsql2shp.1 $(PGSQL_MANDIR)/man1/pgsql2shp.1
-       cp man/shp2pgsql.1 $(PGSQL_MANDIR)/man1/shp2pgsql.1
- 
- uninstall:
-       rm -f $(PGSQL_DOCDIR)/postgis/postgis.html
-+      rm -f $(PGSQL_DOCDIR)/postgis/style.css
-+      rm -rf $(PGSQL_DOCDIR)/postgis/images
-       rm -f $(PGSQL_DOCDIR)/postgis/README.postgis
-       rm -f $(PGSQL_MANDIR)/man1/shp2pgsql.1
-       rm -f $(PGSQL_MANDIR)/man1/pgsql2shp.1
diff --git a/debian/patches/install b/debian/patches/install
deleted file mode 100644
index 243e1ab..0000000
--- a/debian/patches/install
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: postgis/java/jdbc/Makefile
-===================================================================
---- postgis.orig/java/jdbc/Makefile    2011-03-24 17:12:30.000000000 +0100
-+++ postgis/java/jdbc/Makefile 2011-03-24 17:35:23.000000000 +0100
-@@ -251,8 +251,8 @@
- install: jar installdirs
-       @echo Testing for successful inclusion of ../Makefile.config
-       test ../Makefile.config
--      $(INSTALL_DATA) postgis.jar $(DESTDIR)
--      $(INSTALL_DATA) postgis_debug.jar $(DESTDIR)
-+      install -m 644 postgis.jar $(DESTDIR)
-+      install -m 644 postgis_debug.jar $(DESTDIR)
- 
- installdirs:
-       @mkdir -p $(DESTDIR)
diff --git a/debian/patches/series b/debian/patches/series
index 3bef349..f4800ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fixmakedoc
+fix-spelling.diff
diff --git a/debian/rules b/debian/rules
index 6673d08..0955b5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,8 @@ clean:
        [ ! -f GNUmakefile ] || $(MAKE) distclean || true
        $(MAKE) -C doc images-clean
        rm -f $(CURDIR)/debian/*.postinst $(CURDIR)/debian/*.postrm
+       rm -rf postgis/postgis_upgrade_20_minor.sql.in 
raster/rt_pg/rtpostgis_drop.sql \
+               raster/rt_pg/rtpostgis_upgrade_cleanup.sql
        dh_clean 
 
 install: install-indep install-arch
@@ -139,8 +141,8 @@ binary-common:
        dh_strip
        dh_compress 
        dh_fixperms
-       dh_installdeb
        dh_makeshlibs
+       dh_installdeb
        dh_shlibdeps
        dh_gencontrol
        dh_md5sums
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..6d981f3
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+# Ignore changes on auto-updated files
+extend-diff-ignore = "(^|/)(libtool|postgis/sqldefines.h)$"
diff --git a/debian/watch b/debian/watch
index dd3d1da..17e9464 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,6 @@
-# Example watch control file for uscan
-# You can run the "uscan" command to check for upstream updates and more.
-# Site         Directory               Pattern                 Version Script
-version=2
-http://postgis.refractions.net/download/postgis-([0-9\.]*)\.tar\.gz    debian  
uupdate
+version=3
+
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/
 \
+ http://download.osgeo.org/postgis/source/ \
+ 
(?:.*/|)postgis[\-\._]?([\d\.]+(?:(?:RC|rc|pre|dev|beta|alpha|b|a)\d+)?)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
+

-- 
PostGIS for PostgreSQL

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to