The following commit has been merged in the master branch: commit d0159e1e97bc90a153edf75a755e4154bd691cc6 Author: Markus Wanner <mar...@bluegap.ch> Date: Tue Aug 27 11:17:41 2013 +0200
* Modify pgversions to use a new pg_buildext feature. Fixes an issue on wheezy+pgapt, where the newest isn't necessarily the default Postgres version. diff --git a/debian/changelog b/debian/changelog index 13bcce9..7128c9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ postgis (2.1.0-1) UNRELEASED; urgency=low * New upstream release - * Update pgversions + * Update pgversions, use '9.0+' feature of pg-common >= 148. * Adjust liblwgeom version and symbols for new version. * Update build dependencies according to README.postgis (FIXME: prefer geos-3.4) diff --git a/debian/control b/debian/control index 01cc42b..60fcfcb 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev, libproj-dev (>= 4.6.0), libssl-dev, xsltproc, docbook, docbook-xsl, imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~), libgtk2.0-dev, libgdal-dev (>= 1.9.0~) | libgdal1-dev (>= 1.9.0~), - postgresql-server-dev-all, postgresql-common (>= 146), postgresql + postgresql-server-dev-all, postgresql-common (>= 148~), postgresql Build-Depends-Indep: openjdk-8-jdk | openjdk-7-jdk | openjdk-6-jdk, libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7), maven2, libmaven-clean-plugin-java, libmaven-jar-plugin-java, @@ -23,7 +23,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.1 +Suggests: postgresql-9.1-postgis-2.1 Description: Geographic objects support for PostgreSQL PostGIS adds support for geographic objects to the PostgreSQL object-relational database. In effect, PostGIS "spatially enables" @@ -53,7 +53,7 @@ Package: libpostgis-java Architecture: all Section: java Depends: libpostgresql-jdbc-java, ${misc:Depends} -Suggests: postgresql-9.2-postgis-2.1 +Suggests: postgresql-9.1-postgis-2.1 Breaks: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java Replaces: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java Description: Geographic objects support for PostgreSQL -- JDBC support @@ -101,38 +101,6 @@ Description: PostGIS "Lightweight Geometry" library - Development files processing functions, are implemented here. This package contains the development files. -Package: postgresql-9.0-postgis-2.1 -Depends: ${shlibs:Depends}, postgresql-9.0, - postgresql-9.0-postgis-2.1-scripts, liblwgeom-2.1.0, - ${misc:Depends} -Recommends: postgis -Breaks: postgis (<< 1.2.1) -Architecture: any -Description: Geographic objects support for PostgreSQL 9.0 - 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 supports PostgreSQL 9.0. - -Package: postgresql-9.0-postgis-2.1-scripts -Architecture: all -Depends: ${misc:Depends} -Recommends: postgresql-9.0-postgis-2.1 -Description: Geographic objects support for PostgreSQL 9.0 -- scripts - 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 SQL scripts to upgrade from earlier PostGIS - versions for PostgreSQL 9.0 as well as Perl utility scripts. - Package: postgresql-9.1-postgis-2.1 Depends: ${shlibs:Depends}, postgresql-9.1, postgresql-9.1-postgis-2.1-scripts, liblwgeom-2.1.0, @@ -165,35 +133,3 @@ Description: Geographic objects support for PostgreSQL 9.1 -- scripts This package contains SQL scripts to upgrade from earlier PostGIS versions for PostgreSQL 9.1 as well as Perl utility scripts. -Package: postgresql-9.2-postgis-2.1 -Depends: ${shlibs:Depends}, postgresql-9.2, - postgresql-9.2-postgis-2.1-scripts, liblwgeom-2.1.0, - ${misc:Depends} -Recommends: postgis -Breaks: postgis (<< 1.2.1) -Architecture: any -Description: Geographic objects support for PostgreSQL 9.2 - 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 supports PostgreSQL 9.2. - -Package: postgresql-9.2-postgis-2.1-scripts -Architecture: all -Depends: ${misc:Depends} -Recommends: postgresql-9.2-postgis-2.1 -Description: Geographic objects support for PostgreSQL 9.2 -- scripts - 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 SQL scripts to upgrade from earlier PostGIS - versions for PostgreSQL 9.2 as well as Perl utility scripts. - diff --git a/debian/control.in b/debian/control.in index fa12b82..e3ab48c 100644 --- a/debian/control.in +++ b/debian/control.in @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev, libproj-dev (>= 4.6.0), libssl-dev, xsltproc, docbook, docbook-xsl, imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~), libgtk2.0-dev, libgdal-dev (>= 1.9.0~) | libgdal1-dev (>= 1.9.0~), - postgresql-server-dev-all, postgresql-common (>= 146), postgresql + postgresql-server-dev-all, postgresql-common (>= 148~), postgresql Build-Depends-Indep: openjdk-8-jdk | openjdk-7-jdk | openjdk-6-jdk, libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7), maven2, libmaven-clean-plugin-java, libmaven-jar-plugin-java, diff --git a/debian/pgversions b/debian/pgversions index 4228be8..dcde5a0 100644 --- a/debian/pgversions +++ b/debian/pgversions @@ -1,5 +1,2 @@ # Note that postgis-2.1 is not recommended for 9.0, anymore. -9.0 -9.1 -9.2 -9.3 +9.0+ -- 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