[SCM] postgis branch, master, updated. upstream/2.0.1-98-g1ff0917
Markus Wanner
markus at bluegap.ch
Tue Oct 1 13:34:47 UTC 2013
The following commit has been merged in the master branch:
commit 1ff09179dfda03aafadbd8e5e1733f210c3751dc
Author: Markus Wanner <markus at bluegap.ch>
Date: Mon Sep 30 15:27:31 2013 +0200
Template-ify the *-postgis-2.0-scripts transitional packages, using
current supported pg versions intersected with a hard-coded set of
postgis-2.0 supported Postgres versions.
Move the *-postgis-2.0-scripts package control sections out of
control.in. They are now found in control.postgis-2.0.in, so we
can treat them separately.
diff --git a/debian/changelog b/debian/changelog
index 1a9017a..440ce25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,11 @@ postgis (2.1.0-4) UNRELEASED; urgency=low
* Rename pg-X.Y-postgis-2.1-scripts package to exclude PostGIS version
number.
- * 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.
+ * Add transitional postgis-2.0-scripts packages for all Postgres
+ versions supported by the old *and* new PostGIS version. These
+ effectively remove scripts and the postgis.control file prior to
+ installing a newer *-postgis-scripts package, which Breaks+Replaces
+ the old one. Add appropriate notification messages on upgrade.
-- Markus Wanner <markus at bluegap.ch> Thu, 26 Sep 2013 15:55:00 +0200
diff --git a/debian/control b/debian/control
index 9f55759..ff6ef18 100644
--- a/debian/control
+++ b/debian/control
@@ -101,42 +101,6 @@ 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-scripts, liblwgeom-2.1.0,
@@ -158,8 +122,10 @@ Package: postgresql-9.3-postgis-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~)
+Replaces: postgresql-9.3-postgis-2.0-scripts (<< 2.1.0~),
+ postgresql-9.3-postgis-2.1-scripts (<< 2.1.0-4~)
+Breaks: postgresql-9.3-postgis-2.0-scripts (<< 2.1.0~),
+ postgresql-9.3-postgis-2.1-scripts (<< 2.1.0-4~)
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"
@@ -171,3 +137,13 @@ Description: Geographic objects support for PostgreSQL 9.3 -- scripts
This package contains SQL scripts to upgrade from earlier PostGIS
versions for PostgreSQL 9.3 as well as Perl utility scripts.
+Package: postgresql-9.3-postgis-2.1-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Description: PostGIS for PostgreSQL 9.3 -- scripts -- dummy package
+ This package contained SQL scripts to upgrade from earlier PostGIS
+ versions for PostgreSQL 9.3 as well as Perl utility scripts.
+ It got renamed to postgresql-9.3-postgis-scripts.
+ .
+ This is a transitional dummy package. It can safely be removed.
+
diff --git a/debian/control.in b/debian/control.in
index 7de542a..bdaf56b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -147,38 +147,3 @@ Description: PostGIS for PostgreSQL PGVERSION -- scripts -- dummy package
.
This is a transitional dummy package. It can safely be removed.
-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/control.postgis-2.0.in b/debian/control.postgis-2.0.in
new file mode 100644
index 0000000..2b9a8ee
--- /dev/null
+++ b/debian/control.postgis-2.0.in
@@ -0,0 +1,10 @@
+Package: postgresql-PGVERSION-postgis-2.0-scripts
+Architecture: all
+Depends: ${misc:Depends}
+Description: PostGIS 2.0 for PostgreSQL PGVERSION -- scripts -- dummy package
+ This package contained the scripts for PostGIS version 2.0, that's
+ now deprecated. It extended PostgreSQL PGVERSION.
+ .
+ This is a transitional dummy package. It can safely be removed
+ together with the dependent postgresql-PGVERSION-postgis package.
+
diff --git a/debian/postgresql-8.4-postgis-2.0-scripts.config b/debian/postgresql-8.4-postgis-2.0-scripts.config
deleted file mode 100644
index a67d43e..0000000
--- a/debian/postgresql-8.4-postgis-2.0-scripts.config
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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.templates b/debian/postgresql-8.4-postgis-2.0-scripts.templates
deleted file mode 100644
index f421344..0000000
--- a/debian/postgresql-8.4-postgis-2.0-scripts.templates
+++ /dev/null
@@ -1,18 +0,0 @@
-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.
- .
- Of course, 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 version 2.0 of the extension PostGIS. Instead,
- 'CREATE EXTENSION postgis;' will now give you version 2.1. Note that
- this also affects backups.
-
diff --git a/debian/postgresql-9.0-postgis-2.0-scripts.config b/debian/postgresql-9.0-postgis-2.0-scripts.config
deleted file mode 100644
index 10e4951..0000000
--- a/debian/postgresql-9.0-postgis-2.0-scripts.config
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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
deleted file mode 100644
index a486666..0000000
--- a/debian/postgresql-9.0-postgis-2.0-scripts.postinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-db_stop
-
-#DEBHELPER#
diff --git a/debian/postgresql-9.1-postgis-2.0-scripts.config b/debian/postgresql-9.1-postgis-2.0-scripts.config
deleted file mode 100644
index 4ef0062..0000000
--- a/debian/postgresql-9.1-postgis-2.0-scripts.config
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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
deleted file mode 100644
index a486666..0000000
--- a/debian/postgresql-9.1-postgis-2.0-scripts.postinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 100644
index d0ada7f..0000000
--- a/debian/postgresql-9.1-postgis-2.0-scripts.templates
+++ /dev/null
@@ -1,18 +0,0 @@
-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.
- .
- Of course, 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 version 2.0 of the extension PostGIS. Instead,
- 'CREATE EXTENSION postgis;' will now give you version 2.1. Note that
- this also affects backups.
-
diff --git a/debian/postgresql-9.2-postgis-2.0-scripts.postinst b/debian/postgresql-9.2-postgis-2.0-scripts.postinst
deleted file mode 100644
index a486666..0000000
--- a/debian/postgresql-9.2-postgis-2.0-scripts.postinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 100644
index c0d16cf..0000000
--- a/debian/postgresql-9.2-postgis-2.0-scripts.templates
+++ /dev/null
@@ -1,18 +0,0 @@
-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.
- .
- Of course, 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 version 2.0 of the extension PostGIS. Instead,
- 'CREATE EXTENSION postgis;' will now give you version 2.1. Note that
- this also affects backups.
-
diff --git a/debian/postgresql-9.2-postgis-2.0-scripts.config b/debian/postgresql-generic-postgis-2.0-scripts.config.in
similarity index 64%
rename from debian/postgresql-9.2-postgis-2.0-scripts.config
rename to debian/postgresql-generic-postgis-2.0-scripts.config.in
index 08b66b5..8e1cd81 100644
--- a/debian/postgresql-9.2-postgis-2.0-scripts.config
+++ b/debian/postgresql-generic-postgis-2.0-scripts.config.in
@@ -6,5 +6,5 @@ set -e
. /usr/share/debconf/confmodule
# Should first check for installed extensions.
-db_input critical postgis/pg9.2_postgis2.0_deprecated || true
+db_input critical postgis/pg_ at PGVERSION@_postgis_2.0_deprecated || true
db_go
diff --git a/debian/postgresql-8.4-postgis-2.0-scripts.postinst b/debian/postgresql-generic-postgis-2.0-scripts.postinst.in
similarity index 100%
rename from debian/postgresql-8.4-postgis-2.0-scripts.postinst
rename to debian/postgresql-generic-postgis-2.0-scripts.postinst.in
diff --git a/debian/postgresql-9.0-postgis-2.0-scripts.templates b/debian/postgresql-generic-postgis-2.0-scripts.templates.in
similarity index 84%
rename from debian/postgresql-9.0-postgis-2.0-scripts.templates
rename to debian/postgresql-generic-postgis-2.0-scripts.templates.in
index fd7fa2c..5f62b64 100644
--- a/debian/postgresql-9.0-postgis-2.0-scripts.templates
+++ b/debian/postgresql-generic-postgis-2.0-scripts.templates.in
@@ -1,7 +1,7 @@
-Template: postgis/pg9.0_postgis2.0_deprecated
+Template: postgis/pg_ at PGVERSION@_postgis_2.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
+ The package postgresql- at PGVERSION@-postgis-2.0-scripts is installed on this
system, which means you likely use the PostGIS extension in some
databases.
.
diff --git a/debian/rules b/debian/rules
index f7e4c8b..ac0443e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,21 +23,32 @@ ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
CHECK =
endif
+# PostgreSQL versions supported by PostGIS 2.0 - for automatic
+# generation of transitional -scripts packages.
+POSTGIS_2_0_PGVERS = 8.4 9.0 9.1 9.2
+
# Magic to automatically create a debian/control file for the (or all)
# supported versions of Postgres.
#
-# Blatantly copied from /usr/share/postgresql-common/pgxs_debian_control.mk
-# and extended to support NEWEST_VERSION.
-debian/control: debian/control.in debian/pgversions
+# Blatantly copied from
+# /usr/share/postgresql-common/pgxs_debian_control.mk and extended to
+# support NEWEST_VERSION and fiddle with postgis 2.0 transitional
+# packages.
+debian/control: debian/control.in debian/pgversions \
+ debian/control.postgis-2.0.in
(set -e; \
VERSIONS=`pg_buildext supported-versions $(CURDIR)` || exit $$?; \
NEWEST_VERSION=`pg_buildext supported-versions $(CURDIR) | tail -1` || exit $$?; \
+ POSTGIS_2_0_PGVERS="$(POSTGIS_2_0_PGVERS)" ; \
grep-dctrl -vP PGVERSION $< | \
sed -e "s:NEWEST_PGVERSION:$$NEWEST_VERSION:" > $@.pgxs_tmp; \
- for v in $$VERSIONS; \
- do \
+ for v in $$VERSIONS; do \
grep-dctrl -P PGVERSION $< \
- | sed -e "s:PGVERSION:$$v:" >> $@.pgxs_tmp; \
+ | sed -e "s:PGVERSION:$$v:" >> $@.pgxs_tmp; \
+ if test "$${POSTGIS_2_0_PGVERS#*$$v}" != "$${POSTGIS_2_0_PGVERS}" ; then \
+ grep-dctrl -P PGVERSION debian/control.postgis-2.0.in \
+ | sed -e "s:PGVERSION:$$v:" >> $@.pgxs_tmp; \
+ fi; \
done; \
mv $@.pgxs_tmp $@) || (rm -f $@.pgxs_tmp; exit 1)
@@ -185,8 +196,13 @@ clean: debian/control
rm -f postgis/postgis_upgrade_20_minor.sql.in \
raster/rt_pg/rtpostgis_drop.sql \
raster/rt_pg/rtpostgis_upgrade_cleanup.sql
+
+# Cleanup auto-generated packaging control files
rm -f $(CURDIR)/debian/postgresql-*-postgis-2.1.install
rm -f $(CURDIR)/debian/postgresql-*-postgis-scripts.install
+ rm -f $(CURDIR)/debian/postgresql-*-postgis-2.0-scripts.templates
+ rm -f $(CURDIR)/debian/postgresql-*-postgis-2.0-scripts.postinst
+ rm -f $(CURDIR)/debian/postgresql-*-postgis-2.0-scripts.config
rm -f loader/cunit/cu_tester
rm -rf liblwgeom/cunit/.libs
@@ -258,6 +274,15 @@ install-arch: build-arch
cat $(CURDIR)/debian/postgresql-generic-postgis-scripts.install.in \
| sed -e "s/@PGVERSION@/$$PGVER/" \
> $(CURDIR)/debian/postgresql-$$PGVER-postgis-scripts.install; \
+ cat $(CURDIR)/debian/postgresql-generic-postgis-2.0-scripts.postinst.in \
+ | sed -e "s/@PGVERSION@/$$PGVER/" \
+ > $(CURDIR)/debian/postgresql-$$PGVER-postgis-2.0-scripts.postinst; \
+ cat $(CURDIR)/debian/postgresql-generic-postgis-2.0-scripts.templates.in \
+ | sed -e "s/@PGVERSION@/$$PGVER/" \
+ > $(CURDIR)/debian/postgresql-$$PGVER-postgis-2.0-scripts.templates; \
+ cat $(CURDIR)/debian/postgresql-generic-postgis-2.0-scripts.config.in \
+ | sed -e "s/@PGVERSION@/$$PGVER/" \
+ > $(CURDIR)/debian/postgresql-$$PGVER-postgis-2.0-scripts.config; \
done)
# Copy binaries from the NEWEST_POSTGRES_VERSION build to the
--
PostGIS for PostgreSQL
More information about the Pkg-grass-devel
mailing list