The following commit has been merged in the master branch: commit cc7a441bd3a265afe4f7773d2460e3111eefd67b Author: Markus Wanner <mar...@bluegap.ch> Date: Thu Sep 26 15:55:28 2013 +0200
Re-apply the scripts upgrade fixes. Other than an increment to 2.1.0-4, this rev matches b9ad98. diff --git a/debian/changelog b/debian/changelog index 016e904..ff238c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +postgis (2.1.0-4) UNRELEASED; urgency=low + + * Add transitional postgis-2.0-scripts packages for all Pg versions ever + supported. These effectively remove scripts and the postgis.control + file prior to installing a newer *-postgis-2.1-scrips package, which + Breaks+Replaces it. Add appropriate notification messages on upgrade. + + -- Markus Wanner <mar...@bluegap.ch> Thu, 26 Sep 2013 15:55:00 +0200 + postgis (2.1.0-3) unstable; urgency=low * Update patch upstream-r11934 to cover rev 11979, instead. It seems to diff --git a/debian/control b/debian/control index 9537f89..3ebcf17 100644 --- a/debian/control +++ b/debian/control @@ -101,6 +101,42 @@ Description: PostGIS "Lightweight Geometry" library - Development files processing functions, are implemented here. This package contains the development files. +Package: postgresql-8.4-postgis-2.0-scripts +Architecture: all +Depends: ${misc:Depends} +Description: PostGIS for PostgreSQL 8.4 -- scripts -- dummy package + This package contained the scripts for PostGIS version 2.0, that's + now deprecated. It extended PostgreSQL 8.4. + . + 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 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. + +Package: postgresql-9.1-postgis-2.0-scripts +Architecture: all +Depends: ${misc:Depends} +Description: PostGIS 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. + +Package: postgresql-9.2-postgis-2.0-scripts +Architecture: all +Depends: ${misc:Depends} +Description: PostGIS 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. + Package: postgresql-9.3-postgis-2.1 Depends: ${shlibs:Depends}, postgresql-9.3, postgresql-9.3-postgis-2.1-scripts, liblwgeom-2.1.0, @@ -122,6 +158,8 @@ Package: postgresql-9.3-postgis-2.1-scripts Architecture: all Depends: ${misc:Depends} Recommends: postgresql-9.3-postgis-2.1 +Replaces: postgresql-9.3-postgis-2.0-scripts (<< 2.1.0~) +Breaks: postgresql-9.3-postgis-2.0-scripts (<< 2.1.0~) Description: Geographic objects support for PostgreSQL 9.3 -- scripts PostGIS adds support for geographic objects to the PostgreSQL object-relational database. In effect, PostGIS "spatially enables" diff --git a/debian/control.in b/debian/control.in index e3ab48c..7c4b857 100644 --- a/debian/control.in +++ b/debian/control.in @@ -122,6 +122,8 @@ Package: postgresql-PGVERSION-postgis-2.1-scripts Architecture: all Depends: ${misc:Depends} Recommends: postgresql-PGVERSION-postgis-2.1 +Replaces: postgresql-PGVERSION-postgis-2.0-scripts (<< 2.1.0~) +Breaks: postgresql-PGVERSION-postgis-2.0-scripts (<< 2.1.0~) Description: Geographic objects support for PostgreSQL PGVERSION -- scripts PostGIS adds support for geographic objects to the PostgreSQL object-relational database. In effect, PostGIS "spatially enables" @@ -132,3 +134,39 @@ Description: Geographic objects support for PostgreSQL PGVERSION -- scripts . This package contains SQL scripts to upgrade from earlier PostGIS versions for PostgreSQL PGVERSION as well as Perl utility scripts. + +Package: postgresql-8.4-postgis-2.0-scripts +Architecture: all +Depends: ${misc:Depends} +Description: PostGIS for PostgreSQL 8.4 -- scripts -- dummy package + This package contained the scripts for PostGIS version 2.0, that's + now deprecated. It extended PostgreSQL 8.4. + . + 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 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. + +Package: postgresql-9.1-postgis-2.0-scripts +Architecture: all +Depends: ${misc:Depends} +Description: PostGIS 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. + +Package: postgresql-9.2-postgis-2.0-scripts +Architecture: all +Depends: ${misc:Depends} +Description: PostGIS 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. diff --git a/debian/postgresql-8.4-postgis-2.0-scripts.config b/debian/postgresql-8.4-postgis-2.0-scripts.config new file mode 100644 index 0000000..a67d43e --- /dev/null +++ b/debian/postgresql-8.4-postgis-2.0-scripts.config @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +# Should first check for installed extensions. +db_input critical postgis/pg8.4_postgis2.0_deprecated || true +db_go diff --git a/debian/postgresql-8.4-postgis-2.0-scripts.postinst b/debian/postgresql-8.4-postgis-2.0-scripts.postinst new file mode 100644 index 0000000..a486666 --- /dev/null +++ b/debian/postgresql-8.4-postgis-2.0-scripts.postinst @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +. /usr/share/debconf/confmodule +db_stop + +#DEBHELPER# diff --git a/debian/postgresql-8.4-postgis-2.0-scripts.templates b/debian/postgresql-8.4-postgis-2.0-scripts.templates new file mode 100644 index 0000000..0854ccd --- /dev/null +++ b/debian/postgresql-8.4-postgis-2.0-scripts.templates @@ -0,0 +1,16 @@ +Template: postgis/pg8.4_postgis2.0_deprecated +Type: note +Description: PostGIS 2.0 has been deprecated - please migrate your databases + The package postgresql-8.4-postgis-2.0-scripts is installed on this + system, which means you likely use the PostGIS extension in some + databases. + . + Debian is now shipping PostGIS version 2.1 and dropped support for + 2.0, meaning bug or security fixes will no longer be provided for the + older one. Thus it is strongly recommended to migrate all databases + to PostGIS 2.1 (and some newer PostgreSQL version) as soon as possible. + . + Databases that are already using PostGIS 2.0 will continue to + work. Note, however, that with this upgrade it's no longer possible + to create the extension PostGIS 2.0. + diff --git a/debian/postgresql-9.0-postgis-2.0-scripts.config b/debian/postgresql-9.0-postgis-2.0-scripts.config new file mode 100644 index 0000000..10e4951 --- /dev/null +++ b/debian/postgresql-9.0-postgis-2.0-scripts.config @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +# Should first check for installed extensions. +db_input critical postgis/pg9.0_postgis2.0_deprecated || true +db_go diff --git a/debian/postgresql-9.0-postgis-2.0-scripts.postinst b/debian/postgresql-9.0-postgis-2.0-scripts.postinst new file mode 100644 index 0000000..a486666 --- /dev/null +++ b/debian/postgresql-9.0-postgis-2.0-scripts.postinst @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +. /usr/share/debconf/confmodule +db_stop + +#DEBHELPER# diff --git a/debian/postgresql-9.0-postgis-2.0-scripts.templates b/debian/postgresql-9.0-postgis-2.0-scripts.templates new file mode 100644 index 0000000..4976c0e --- /dev/null +++ b/debian/postgresql-9.0-postgis-2.0-scripts.templates @@ -0,0 +1,16 @@ +Template: postgis/pg9.0_postgis2.0_deprecated +Type: note +Description: PostGIS 2.0 has been deprecated - please migrate your databases + The package postgresql-9.0-postgis-2.0-scripts is installed on this + system, which means you likely use the PostGIS extension in some + databases. + . + Debian is now shipping PostGIS version 2.1 and dropped support for + 2.0, meaning bug or security fixes will no longer be provided for the + older one. Thus it is strongly recommended to migrate all databases + to PostGIS 2.1 as soon as possible. + . + Databases that are already using PostGIS 2.0 will continue to + work. Note, however, that with this upgrade it's no longer possible + to create the extension PostGIS 2.0. + diff --git a/debian/postgresql-9.1-postgis-2.0-scripts.config b/debian/postgresql-9.1-postgis-2.0-scripts.config new file mode 100644 index 0000000..4ef0062 --- /dev/null +++ b/debian/postgresql-9.1-postgis-2.0-scripts.config @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +# Should first check for installed extensions. +db_input critical postgis/pg9.1_postgis2.0_deprecated || true +db_go diff --git a/debian/postgresql-9.1-postgis-2.0-scripts.postinst b/debian/postgresql-9.1-postgis-2.0-scripts.postinst new file mode 100644 index 0000000..a486666 --- /dev/null +++ b/debian/postgresql-9.1-postgis-2.0-scripts.postinst @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +. /usr/share/debconf/confmodule +db_stop + +#DEBHELPER# diff --git a/debian/postgresql-9.1-postgis-2.0-scripts.templates b/debian/postgresql-9.1-postgis-2.0-scripts.templates new file mode 100644 index 0000000..f233d0a --- /dev/null +++ b/debian/postgresql-9.1-postgis-2.0-scripts.templates @@ -0,0 +1,16 @@ +Template: postgis/pg9.1_postgis2.0_deprecated +Type: note +Description: PostGIS 2.0 has been deprecated - please migrate your databases + The package postgresql-9.1-postgis-2.0-scripts is installed on this + system, which means you likely use the PostGIS extension in some + databases. + . + Debian is now shipping PostGIS version 2.1 and dropped support for + 2.0, meaning bug or security fixes will no longer be provided for the + older one. Thus it is strongly recommended to migrate all databases + to PostGIS 2.1 as soon as possible. + . + Databases that are already using PostGIS 2.0 will continue to + work. Note, however, that with this upgrade it's no longer possible + to create the extension PostGIS 2.0. + diff --git a/debian/postgresql-9.2-postgis-2.0-scripts.config b/debian/postgresql-9.2-postgis-2.0-scripts.config new file mode 100644 index 0000000..08b66b5 --- /dev/null +++ b/debian/postgresql-9.2-postgis-2.0-scripts.config @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +# Should first check for installed extensions. +db_input critical postgis/pg9.2_postgis2.0_deprecated || true +db_go diff --git a/debian/postgresql-9.2-postgis-2.0-scripts.postinst b/debian/postgresql-9.2-postgis-2.0-scripts.postinst new file mode 100644 index 0000000..a486666 --- /dev/null +++ b/debian/postgresql-9.2-postgis-2.0-scripts.postinst @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +. /usr/share/debconf/confmodule +db_stop + +#DEBHELPER# diff --git a/debian/postgresql-9.2-postgis-2.0-scripts.templates b/debian/postgresql-9.2-postgis-2.0-scripts.templates new file mode 100644 index 0000000..8988114 --- /dev/null +++ b/debian/postgresql-9.2-postgis-2.0-scripts.templates @@ -0,0 +1,16 @@ +Template: postgis/pg9.2_postgis2.0_deprecated +Type: note +Description: PostGIS 2.0 has been deprecated - please migrate your databases + The package postgresql-9.1-postgis-2.0-scripts is installed on this + system, which means you likely use the PostGIS extension in some + databases. + . + Debian is now shipping PostGIS version 2.1 and dropped support for + 2.0, meaning bug or security fixes will no longer be provided for the + older one. Thus it is strongly recommended to migrate all databases + to PostGIS 2.1 as soon as possible. + . + Databases that are already using PostGIS 2.0 will continue to + work. Note, however, that with this upgrade it's no longer possible + to create the extension PostGIS 2.0. + diff --git a/debian/rules b/debian/rules index 28c06d1..65ca336 100755 --- a/debian/rules +++ b/debian/rules @@ -182,8 +182,8 @@ clean: debian/control rm -rf $(CURDIR)/java/jdbc/target # Cleanup after the Makefile - rm -f $(CURDIR)/debian/*.postinst $(CURDIR)/debian/*.postrm - rm -f postgis/postgis_upgrade_20_minor.sql.in raster/rt_pg/rtpostgis_drop.sql \ + rm -f postgis/postgis_upgrade_20_minor.sql.in \ + raster/rt_pg/rtpostgis_drop.sql \ raster/rt_pg/rtpostgis_upgrade_cleanup.sql rm -f $(CURDIR)/debian/postgresql-*-postgis-2.1.install rm -f $(CURDIR)/debian/postgresql-*-postgis-2.1-scripts.install @@ -292,6 +292,7 @@ binary-common: dh_testdir dh_testroot dh_installchangelogs ChangeLog + dh_installdebconf dh_installdocs dh_installexamples dh_installman -- 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