[SCM] postgis branch, master, updated. upstream/2.0.1-52-g467b742

[Markus Wanner]

The following commit has been merged in the master branch:
commit 467b742905c66ea7eed5c9bc3626dd5638aaa948
Author: Markus Wanner <markus at bluegap.ch>
Date:   Fri Jun 14 14:44:57 2013 +0200

    Build-Deps: correct libgeos-dev version requirement, depend on
    libpostgresql-jdbc-java instead of (transitional) libpg-java.

diff --git a/debian/changelog b/debian/changelog
index 14e6e60..555f6fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ postgis (2.0.3-2) UNRELEASED; urgency=low
 
   * Rather than depending on the transitional libgdal-dev package, use
     libgdal1-dev right away.
+  * Build-Deps: correct libgeos-dev version requirement, depend on
+    libpostgresql-jdbc-java instead of (transitional) libpg-java.
 
  -- Markus Wanner <markus at bluegap.ch>  Fri, 14 Jun 2013 13:08:58 +0200
 
diff --git a/debian/control b/debian/control
index 16efade..daf1459 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,11 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Stephen Frost <sfrost at debian.org>, Francesco Paolo
  Lovergine <frankie at debian.org>, Markus Wanner <markus at bluegap.ch>
 Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
- flex, bison, libgeos-dev (>= 3.1.1), libjson0-dev (>= 0.9~),
+ flex, bison, libgeos-dev (>= 3.3.0~), libjson0-dev (>= 0.9~),
  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 (>= 2.5.0~), libgtk2.0-dev,
- libgdal1-dev (>= 1.6.0~), postgresql-server-dev-all
+ default-jdk, libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7),
+ imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
+ libgtk2.0-dev, libgdal1-dev (>= 1.6.0~), postgresql-server-dev-all
 Build-Depends-Indep: libpostgresql-jdbc-java, libsurefire-java,
  libmaven-clean-plugin-java, libmaven-compiler-plugin-java,
  libmaven-jar-plugin-java, libmaven-resources-plugin-java, maven2
@@ -21,7 +21,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-grass/postgis.git
 Package: postgis
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: postgresql-9.2-postgis-2.0
+Suggests: postgresql-9.1-postgis-2.0
 Description: Geographic objects support for PostgreSQL
  PostGIS adds support for geographic objects to the PostgreSQL
  object-relational database. In effect, PostGIS "spatially enables"
@@ -51,7 +51,7 @@ Package: libpostgis-java
 Architecture: all
 Section: java
 Depends: libpostgresql-jdbc-java, ${misc:Depends}
-Suggests: postgresql-9.2-postgis-2.0
+Suggests: postgresql-9.1-postgis-2.0
 Breaks: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
 Replaces: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
 Description: Geographic objects support for PostgreSQL -- JDBC support
diff --git a/debian/control.in b/debian/control.in
index 5e42f12..8fcf2e9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,11 +5,11 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Stephen Frost <sfrost at debian.org>, Francesco Paolo
  Lovergine <frankie at debian.org>, Markus Wanner <markus at bluegap.ch>
 Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
- flex, bison, libgeos-dev (>= 3.1.1), libjson0-dev (>= 0.9~),
+ flex, bison, libgeos-dev (>= 3.3.0~), libjson0-dev (>= 0.9~),
  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 (>= 2.5.0~), libgtk2.0-dev,
- libgdal1-dev (>= 1.6.0~), postgresql-server-dev-all
+ default-jdk, libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7),
+ imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
+ libgtk2.0-dev, libgdal1-dev (>= 1.6.0~), postgresql-server-dev-all
 Build-Depends-Indep: libpostgresql-jdbc-java, libsurefire-java,
  libmaven-clean-plugin-java, libmaven-compiler-plugin-java,
  libmaven-jar-plugin-java, libmaven-resources-plugin-java, maven2

-- 
PostGIS for PostgreSQL