[postgis] 01/01: Correct script package renaming, other minor but related tweaks.

[Markus Wanner]

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 374c752bcaba3fec2d56f2114149635c7278e3c7
Author: Markus Wanner <markus at bluegap.ch>
Date:   Fri Jun 24 19:59:38 2016 +0200

    Correct script package renaming, other minor but related tweaks.
    
    * Re-add postgresql-M.N-postgis-scripts as a transitional
      dummy package.
    * Remove the postgis major.minor version from the generic file
      and add the version from d/rules.
    * Update README.Debian to reflect the renaming.
---
 debian/README.Debian                                             | 4 ++--
 debian/changelog                                                 | 5 ++++-
 debian/control                                                   | 8 ++++++++
 debian/control.in                                                | 9 +++++++++
 ...tgis-2.2.install.in => postgresql-generic-postgis.install.in} | 0
 debian/rules                                                     | 8 ++++----
 6 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 92bf1c4..a5dca12 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -18,7 +18,7 @@ postgresql-N.M-postgis-X.Y
   releases or bug fixes.
 
 
-postgresql-N.M-postgis-scripts
+postgresql-N.M-postgis-X.Y-scripts
   This package provides necessary scripts for creating or upgrading
   the PostGIS extension in a given database, the extension's control
   file, and various other SQL scripts.
@@ -95,7 +95,7 @@ extension needs a bit of extra care, depending on what PostGIS version
 you are upgrading from.  Please refer to the PostGIS documentation.
 
 All of the required SQL files mentioned in the documentation should be
-provided by the postgresql-M.N-postgis-scripts package and can be
+provided by the postgresql-M.N-postgis-X.Y-scripts package and can be
 found in the following directory after its installation (replace M.N
 with the appropriate Postgres version used):
 
diff --git a/debian/changelog b/debian/changelog
index c5ada7c..88d84ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,11 @@ postgis (2.2.2+dfsg-3) UNRELEASED; urgency=medium
   [ Markus Wanner ]
   * Re-rename the -scripts package to include the postgis version
     for easier upgrading.
+  * Remove the postgis major.minor version from the generic file
+    and add the version from d/rules.
+  * Update README.Debian to reflect the renaming.
 
- -- Markus Wanner <markus at bluegap.ch>  Sun, 29 May 2016 19:07:04 +0200
+ -- Markus Wanner <markus at bluegap.ch>  Fri, 24 Jun 2016 19:55:20 +0200
 
 postgis (2.2.2+dfsg-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index e0e5ec8..86a582d 100644
--- a/debian/control
+++ b/debian/control
@@ -135,3 +135,11 @@ Description: Geographic objects support for PostgreSQL 9.5 -- scripts
  This package contains SQL scripts to upgrade from earlier PostGIS
  versions for PostgreSQL 9.5 as well as Perl utility scripts.
 
+Package: postgresql-9.5-postgis-scripts
+Architecture: all
+Depends: postgresql-9.5-postgis-2.2-scripts, ${misc:Depends}
+Priority: extra
+Section: oldlibs
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
diff --git a/debian/control.in b/debian/control.in
index c90cc76..c99212d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -134,3 +134,12 @@ 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-PGVERSION-postgis-scripts
+Architecture: all
+Depends: postgresql-PGVERSION-postgis-2.2-scripts, ${misc:Depends}
+Priority: extra
+Section: oldlibs
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
diff --git a/debian/postgresql-generic-postgis-2.2.install.in b/debian/postgresql-generic-postgis.install.in
similarity index 100%
rename from debian/postgresql-generic-postgis-2.2.install.in
rename to debian/postgresql-generic-postgis.install.in
diff --git a/debian/rules b/debian/rules
index ba8f17b..4f08f9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -294,12 +294,12 @@ install-arch: build-arch
 #	Auto-create required .install file for each Postgres major version
 	(set -e; \
 	for PGVER in $(OTHER_POSTGRES_VERSIONS) $(NEWEST_POSTGRES_VERSION); do \
-		cat $(CURDIR)/debian/postgresql-generic-postgis-2.2.install.in \
+		cat $(CURDIR)/debian/postgresql-generic-postgis.install.in \
 			| sed -e "s/@PGVERSION@/$$PGVER/" \
-			> $(CURDIR)/debian/postgresql-$$PGVER-postgis-2.2.install; \
-		cat $(CURDIR)/debian/postgresql-generic-postgis-2.2-scripts.install.in \
+			> $(CURDIR)/debian/postgresql-$$PGVER-postgis-$(MAJOR_VERSION).$(MINOR_VERSION).install; \
+		cat $(CURDIR)/debian/postgresql-generic-postgis-scripts.install.in \
 			| sed -e "s/@PGVERSION@/$$PGVER/" \
-			> $(CURDIR)/debian/postgresql-$$PGVER-postgis-2.2-scripts.install; \
+			> $(CURDIR)/debian/postgresql-$$PGVER-postgis-$(MAJOR_VERSION).$(MINOR_VERSION)-scripts.install; \
 	done)
 
 #	Copy binaries from the NEWEST_POSTGRES_VERSION build to the

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git