This is an automated email from the git hooks/post-receive script. markus_wanner-guest pushed a commit to branch master in repository postgis.
commit 124b3bacf6d64fb8bc0ae18db32592a4e4ad76d8 Author: Markus Wanner <mar...@bluegap.ch> Date: Mon Mar 31 11:35:31 2014 +0200 Adjust liblwgeom to the new release. --- debian/changelog | 2 + debian/control | 174 +-------------------- debian/control.in | 6 +- debian/liblwgeom-2.1.1.install | 1 - debian/liblwgeom-2.1.2.install | 1 + ...wgeom-2.1.1.symbols => liblwgeom-2.1.2.symbols} | 2 +- debian/rules | 2 +- 7 files changed, 11 insertions(+), 177 deletions(-) diff --git a/debian/changelog b/debian/changelog index e908456..a6bd954 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ postgis (2.1.2-1) UNRELEASED; urgency=medium * New upstream release, 2.1.1. Closes: #728724. + * Adapt liblwgeom package name and dependencies to match the new release + version number. * Add a suggestion for postgis-doc. Closes: #737497. * Refresh patches debian-versions, honor-build-flags, and java-version-fix. diff --git a/debian/control b/debian/control index 8a5087b..d193005 100644 --- a/debian/control +++ b/debian/control @@ -66,7 +66,7 @@ Description: Geographic objects support for PostgreSQL -- JDBC support . This package contains JDBC support for PostGIS. -Package: liblwgeom-2.1.1 +Package: liblwgeom-2.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, libjson0 (>= 0.9~), ${misc:Depends} @@ -86,7 +86,7 @@ Package: liblwgeom-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, - liblwgeom-2.1.1 (= ${binary:Version}) + liblwgeom-2.1.2 (= ${binary:Version}) Breaks: postgis (<< 2.0.0) Description: PostGIS "Lightweight Geometry" library - Development files PostGIS adds support for geographic objects to the PostgreSQL @@ -101,177 +101,9 @@ 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-scripts, liblwgeom-2.1.1, - ${misc:Depends} -Recommends: postgis, postgresql-contrib-9.0 -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-scripts -Architecture: all -Depends: ${misc:Depends} -Recommends: postgresql-9.0-postgis-2.1 -Replaces: postgresql-9.0-postgis-2.0-scripts (<< 2.1.0~), - postgresql-9.0-postgis-2.1-scripts (<< 2.1.0-4~) -Breaks: postgresql-9.0-postgis-2.0-scripts (<< 2.1.0~), - postgresql-9.0-postgis-2.1-scripts (<< 2.1.0-4~) -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.0-postgis-2.1-scripts -Architecture: all -Depends: ${misc:Depends} -Description: PostGIS for PostgreSQL 9.0 -- scripts -- dummy package - This package contained SQL scripts to upgrade from earlier PostGIS - versions for PostgreSQL 9.0 as well as Perl utility scripts. - It got renamed to postgresql-9.0-postgis-scripts. - . - This is a transitional dummy package. It can safely be removed. - -Package: postgresql-9.0-postgis-2.0-scripts -Architecture: all -Depends: ${misc:Depends} -Description: PostGIS 2.0 for PostgreSQL 9.0 -- scripts -- dummy package - This package contained the scripts for PostGIS version 2.0, that's - now deprecated. It extended PostgreSQL 9.0. - . - This is a transitional dummy package. It can safely be removed - together with the dependent postgresql-9.0-postgis package. - -Package: postgresql-9.1-postgis-2.1 -Depends: ${shlibs:Depends}, postgresql-9.1, - postgresql-9.1-postgis-scripts, liblwgeom-2.1.1, - ${misc:Depends} -Recommends: postgis, postgresql-contrib-9.1 -Breaks: postgis (<< 1.2.1) -Architecture: any -Description: Geographic objects support for PostgreSQL 9.1 - 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.1. - -Package: postgresql-9.1-postgis-scripts -Architecture: all -Depends: ${misc:Depends} -Recommends: postgresql-9.1-postgis-2.1 -Replaces: postgresql-9.1-postgis-2.0-scripts (<< 2.1.0~), - postgresql-9.1-postgis-2.1-scripts (<< 2.1.0-4~) -Breaks: postgresql-9.1-postgis-2.0-scripts (<< 2.1.0~), - postgresql-9.1-postgis-2.1-scripts (<< 2.1.0-4~) -Description: Geographic objects support for PostgreSQL 9.1 -- 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.1 as well as Perl utility scripts. - -Package: postgresql-9.1-postgis-2.1-scripts -Architecture: all -Depends: ${misc:Depends} -Description: PostGIS for PostgreSQL 9.1 -- scripts -- dummy package - This package contained SQL scripts to upgrade from earlier PostGIS - versions for PostgreSQL 9.1 as well as Perl utility scripts. - It got renamed to postgresql-9.1-postgis-scripts. - . - This is a transitional dummy package. It can safely be removed. - -Package: postgresql-9.1-postgis-2.0-scripts -Architecture: all -Depends: ${misc:Depends} -Description: PostGIS 2.0 for PostgreSQL 9.1 -- scripts -- dummy package - This package contained the scripts for PostGIS version 2.0, that's - now deprecated. It extended PostgreSQL 9.1. - . - This is a transitional dummy package. It can safely be removed - together with the dependent postgresql-9.1-postgis package. - -Package: postgresql-9.2-postgis-2.1 -Depends: ${shlibs:Depends}, postgresql-9.2, - postgresql-9.2-postgis-scripts, liblwgeom-2.1.1, - ${misc:Depends} -Recommends: postgis, postgresql-contrib-9.2 -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-scripts -Architecture: all -Depends: ${misc:Depends} -Recommends: postgresql-9.2-postgis-2.1 -Replaces: postgresql-9.2-postgis-2.0-scripts (<< 2.1.0~), - postgresql-9.2-postgis-2.1-scripts (<< 2.1.0-4~) -Breaks: postgresql-9.2-postgis-2.0-scripts (<< 2.1.0~), - postgresql-9.2-postgis-2.1-scripts (<< 2.1.0-4~) -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. - -Package: postgresql-9.2-postgis-2.1-scripts -Architecture: all -Depends: ${misc:Depends} -Description: PostGIS for PostgreSQL 9.2 -- scripts -- dummy package - This package contained SQL scripts to upgrade from earlier PostGIS - versions for PostgreSQL 9.2 as well as Perl utility scripts. - It got renamed to postgresql-9.2-postgis-scripts. - . - This is a transitional dummy package. It can safely be removed. - -Package: postgresql-9.2-postgis-2.0-scripts -Architecture: all -Depends: ${misc:Depends} -Description: PostGIS 2.0 for PostgreSQL 9.2 -- scripts -- dummy package - This package contained the scripts for PostGIS version 2.0, that's - now deprecated. It extended PostgreSQL 9.2. - . - This is a transitional dummy package. It can safely be removed - together with the dependent postgresql-9.2-postgis package. - Package: postgresql-9.3-postgis-2.1 Depends: ${shlibs:Depends}, postgresql-9.3, - postgresql-9.3-postgis-scripts, liblwgeom-2.1.1, + postgresql-9.3-postgis-scripts, liblwgeom-2.1.2, ${misc:Depends} Recommends: postgis, postgresql-contrib-9.3 Breaks: postgis (<< 1.2.1) diff --git a/debian/control.in b/debian/control.in index 9b42e73..640b627 100644 --- a/debian/control.in +++ b/debian/control.in @@ -66,7 +66,7 @@ Description: Geographic objects support for PostgreSQL -- JDBC support . This package contains JDBC support for PostGIS. -Package: liblwgeom-2.1.1 +Package: liblwgeom-2.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, libjson0 (>= 0.9~), ${misc:Depends} @@ -86,7 +86,7 @@ Package: liblwgeom-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, - liblwgeom-2.1.1 (= ${binary:Version}) + liblwgeom-2.1.2 (= ${binary:Version}) Breaks: postgis (<< 2.0.0) Description: PostGIS "Lightweight Geometry" library - Development files PostGIS adds support for geographic objects to the PostgreSQL @@ -103,7 +103,7 @@ Description: PostGIS "Lightweight Geometry" library - Development files Package: postgresql-PGVERSION-postgis-2.1 Depends: ${shlibs:Depends}, postgresql-PGVERSION, - postgresql-PGVERSION-postgis-scripts, liblwgeom-2.1.1, + postgresql-PGVERSION-postgis-scripts, liblwgeom-2.1.2, ${misc:Depends} Recommends: postgis, postgresql-contrib-PGVERSION Breaks: postgis (<< 1.2.1) diff --git a/debian/liblwgeom-2.1.1.install b/debian/liblwgeom-2.1.1.install deleted file mode 100644 index 80ff65e..0000000 --- a/debian/liblwgeom-2.1.1.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/liblwgeom-2.1.1.so diff --git a/debian/liblwgeom-2.1.2.install b/debian/liblwgeom-2.1.2.install new file mode 100644 index 0000000..7b04344 --- /dev/null +++ b/debian/liblwgeom-2.1.2.install @@ -0,0 +1 @@ +usr/lib/liblwgeom-2.1.2.so diff --git a/debian/liblwgeom-2.1.1.symbols b/debian/liblwgeom-2.1.2.symbols similarity index 99% rename from debian/liblwgeom-2.1.1.symbols rename to debian/liblwgeom-2.1.2.symbols index c59e639..518b56f 100644 --- a/debian/liblwgeom-2.1.1.symbols +++ b/debian/liblwgeom-2.1.2.symbols @@ -1,4 +1,4 @@ -liblwgeom-2.1.1.so liblwgeom-2.1.1 #MINVER# +liblwgeom-2.1.2.so liblwgeom-2.1.2 #MINVER# GEOS2LWGEOM@Base 2.0.0 LWGEOM2GEOS@Base 2.0.0 LWGEOM_GEOS_buildArea@Base 2.0.0 diff --git a/debian/rules b/debian/rules index 9d6be84..ec03c3a 100755 --- a/debian/rules +++ b/debian/rules @@ -306,7 +306,7 @@ install-arch: build-arch check: build-arch-stamp # Run unit tests (against the newest Postgres version only, for # now). - echo "LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-2.1.1.so'" \ + echo "LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION).so'" \ > $(CURDIR)/postgis-check-env.tmp (set -e; \ test -z '$(CHECK)' || \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel