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 bf3826fed7f2bb97bd0a28b4eb75e53be8e2e544
Author: Markus Wanner <mar...@bluegap.ch>
Date: Sun Feb 2 12:29:31 2014 +0100
Deduplicate .sql files in *-postgis-scripts using rdfind.
---
debian/changelog | 1 +
debian/control | 2 +-
debian/control.in | 2 +-
debian/rules | 8 ++++++++
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1379039..539e658 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ postgis (2.1.1-6) UNRELEASED; urgency=low
* Update README.Debian, as hinted in #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.
-- Markus Wanner <mar...@bluegap.ch> Tue, 28 Jan 2014 22:32:14 +0100
diff --git a/debian/control b/debian/control
index f88eb90..28242fb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian GIS Project
<pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Stephen Frost <sfr...@debian.org>, Francesco Paolo
Lovergine <fran...@debian.org>, Markus Wanner <mar...@bluegap.ch>
Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
- flex, bison, libgeos-dev (>= 3.3), libjson0-dev (>= 0.9~),
+ flex, bison, rdfind, libgeos-dev (>= 3.3), libjson0-dev (>= 0.9~),
libproj-dev (>= 4.6.0), libssl-dev, xsltproc, docbook, docbook-xsl,
imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
libgtk2.0-dev, libgdal-dev (>= 1.9.0~) | libgdal1-dev (>= 1.9.0~),
diff --git a/debian/control.in b/debian/control.in
index f761670..b768015 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Debian GIS Project
<pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Stephen Frost <sfr...@debian.org>, Francesco Paolo
Lovergine <fran...@debian.org>, Markus Wanner <mar...@bluegap.ch>
Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
- flex, bison, libgeos-dev (>= 3.3), libjson0-dev (>= 0.9~),
+ flex, bison, rdfind, libgeos-dev (>= 3.3), libjson0-dev (>= 0.9~),
libproj-dev (>= 4.6.0), libssl-dev, xsltproc, docbook, docbook-xsl,
imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
libgtk2.0-dev, libgdal-dev (>= 1.9.0~) | libgdal1-dev (>= 1.9.0~),
diff --git a/debian/rules b/debian/rules
index 57ac7f2..027ac77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -245,6 +245,14 @@ install-indep: build-indep
ln -sf postgis-jdbc-$(POSTGIS_VERSION).jar \
$(CURDIR)/debian/libpostgis-java/usr/share/java/postgis.jar
+# De-duplicate upgrade scripts - using hard-links for exactly one
+# directory (so we don't generate cross-directory hard ones).
+ (set -e; \
+ for PGVER in $(OTHER_POSTGRES_VERSIONS) $(NEWEST_POSTGRES_VERSION); do \
+ rdfind -makeresultsfile false -makehardlinks true \
+
$(CURDIR)/debian/postgresql-$$PGVER-postgis-scripts/usr/share/postgresql/$$PGVER/extension;
\
+ done)
+
install-arch: build-arch
dh_testdir
dh_testroot
--
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
