[postgis] 01/02: Make sure the sql scripts are included in the -scripts package for the newest Postgres version as well. Closes: #724626.

[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 aad314ac8dc7e9597a332c491d2e537f09bf3108
Author: Markus Wanner <markus at bluegap.ch>
Date:   Wed Mar 19 08:44:32 2014 +0100

    Make sure the sql scripts are included in the -scripts package for
    the newest Postgres version as well. Closes: #724626.
---
 debian/changelog |  4 +++-
 debian/rules     | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 539e658..cbf6717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,9 @@ postgis (2.1.1-6) UNRELEASED; urgency=low
 
   * Recommend postgresql-contrib-M.N for the fuzzystrmatch
     extension, which postgis_tiger_decoder depends on.
-  * Update README.Debian, as hinted in #724626.
+  * Update README.Debian, make sure the sql scripts are included in the
+    -scripts package for the newest Postgres version as well.
+    Closes: #724626.
   * Correct java-version-fix, so the jar-version becomes 2.1.1 rather than
     some rc. Closes: #721721.
   * Deduplicate highly redundant .sql files in *-postgis-scripts.
diff --git a/debian/rules b/debian/rules
index 027ac77..9d6be84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -220,17 +220,17 @@ install-indep: build-indep
 	dh_prep -i 
 	dh_installdirs -i
 
-#	Install extensions and utils for the most recent Postgres version
-	$(MAKE) -C extensions install DESTDIR=$(CURDIR)/debian/tmp
-	$(MAKE) -C utils install DESTDIR=$(CURDIR)/debian/tmp
+#	Install the most recent Postgres version. Note that we used to
+#	install only utils and extensions. However, there are sql scripts
+#	in postgis, raster and topology as well, which need to be
+#	installed for the -scripts package(s).
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-#	Install extensions for the older Postgres versions
+#	Install all older Postgres versions.
 	(set -e; \
 	for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
 		$(MAKE) -C $(CURDIR)/debian/build-$$PGVER \
 			install DESTDIR=$(CURDIR)/debian/tmp; \
-		$(MAKE) -C $(CURDIR)/debian/build-$$PGVER/extensions \
-			install DESTDIR=$(CURDIR)/debian/tmp; \
 	done)
 
 #	Compile and install docs

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