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 7422f3faa61e9b7e102db65a81a59c03a0dc310e
Author: Markus Wanner <mar...@bluegap.ch>
Date: Mon May 30 09:08:26 2016 +0200
Re-rename the -scripts package to include the postgis version
for easier upgrading.
---
debian/changelog | 7 ++++++-
debian/control | 12 +++++-------
debian/control.in | 13 +++++--------
debian/rules | 8 ++++----
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c435bff..8ee0398 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
postgis (2.2.2+dfsg-3) UNRELEASED; urgency=medium
+ [ Bas Couwenberg ]
* Disable tests on ppc64, fails to change owner and permissions.
- -- Bas Couwenberg <sebas...@debian.org> Mon, 23 May 2016 23:10:35 +0200
+ [ Markus Wanner ]
+ * Re-rename the -scripts package to include the postgis version
+ for easier upgrading.
+
+ -- Markus Wanner <mar...@bluegap.ch> Sun, 29 May 2016 19:07:04 +0200
postgis (2.2.2+dfsg-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 6f69f06..ce17c0f 100644
--- a/debian/control
+++ b/debian/control
@@ -102,7 +102,7 @@ Description: PostGIS "Lightweight Geometry" library -
Development files
Package: postgresql-9.5-postgis-2.2
Depends: ${shlibs:Depends}, postgresql-9.5,
- postgresql-9.5-postgis-scripts, liblwgeom-2.2-5,
+ postgresql-9.5-postgis-2.2-scripts, liblwgeom-2.2-5,
${misc:Depends}
Recommends: postgresql-contrib-9.5
Suggests: postgis
@@ -118,14 +118,12 @@ Description: Geographic objects support for PostgreSQL 9.5
.
This package supports PostgreSQL 9.5.
-Package: postgresql-9.5-postgis-scripts
+Package: postgresql-9.5-postgis-2.2-scripts
Architecture: all
Depends: ${misc:Depends}
-Recommends: postgresql-9.5-postgis-2.2
-Replaces: postgresql-9.5-postgis-2.0-scripts (<< 2.1.0~),
- postgresql-9.5-postgis-2.1-scripts (<< 2.1.0-4~)
-Breaks: postgresql-9.5-postgis-2.0-scripts (<< 2.1.0~),
- postgresql-9.5-postgis-2.1-scripts (<< 2.1.0-4~)
+Recommends: postgresql-9.5-postgis
+Replaces: postgresql-9.5-postgis-scripts,
+Breaks: postgresql-9.5-postgis-scripts
Description: Geographic objects support for PostgreSQL 9.5 -- 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 5d3af4c..d3718e2 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -102,7 +102,7 @@ Description: PostGIS "Lightweight Geometry" library -
Development files
Package: postgresql-PGVERSION-postgis-2.2
Depends: ${shlibs:Depends}, postgresql-PGVERSION,
- postgresql-PGVERSION-postgis-scripts, liblwgeom-2.2-5,
+ postgresql-PGVERSION-postgis-2.2-scripts, liblwgeom-2.2-5,
${misc:Depends}
Recommends: postgresql-contrib-PGVERSION
Suggests: postgis
@@ -118,14 +118,12 @@ Description: Geographic objects support for PostgreSQL
PGVERSION
.
This package supports PostgreSQL PGVERSION.
-Package: postgresql-PGVERSION-postgis-scripts
+Package: postgresql-PGVERSION-postgis-2.2-scripts
Architecture: all
Depends: ${misc:Depends}
-Recommends: postgresql-PGVERSION-postgis-2.2
-Replaces: postgresql-PGVERSION-postgis-2.0-scripts (<< 2.1.0~),
- postgresql-PGVERSION-postgis-2.1-scripts (<< 2.1.0-4~)
-Breaks: postgresql-PGVERSION-postgis-2.0-scripts (<< 2.1.0~),
- postgresql-PGVERSION-postgis-2.1-scripts (<< 2.1.0-4~)
+Recommends: postgresql-PGVERSION-postgis
+Replaces: postgresql-PGVERSION-postgis-scripts,
+Breaks: postgresql-PGVERSION-postgis-scripts
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"
@@ -136,4 +134,3 @@ 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.
-
diff --git a/debian/rules b/debian/rules
index 28967d1..f9416e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -129,7 +129,7 @@ clean: debian/control
# Cleanup auto-generated packaging control files
rm -f $(CURDIR)/debian/postgresql-*-postgis-2.2.install
- rm -f $(CURDIR)/debian/postgresql-*-postgis-scripts.install
+ rm -f $(CURDIR)/debian/postgresql-*-postgis-2.2-scripts.install
rm -f loader/cunit/cu_tester
rm -rf liblwgeom/cunit/.libs
@@ -262,7 +262,7 @@ install-indep: build-indep
(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;
\
+
$(CURDIR)/debian/postgresql-$$PGVER-postgis-2.2-scripts/usr/share/postgresql/$$PGVER/extension;
\
done)
install-arch: build-arch
@@ -293,9 +293,9 @@ install-arch: build-arch
cat $(CURDIR)/debian/postgresql-generic-postgis-2.2.install.in \
| sed -e "s/@PGVERSION@/$$PGVER/" \
>
$(CURDIR)/debian/postgresql-$$PGVER-postgis-2.2.install; \
- cat
$(CURDIR)/debian/postgresql-generic-postgis-scripts.install.in \
+ cat
$(CURDIR)/debian/postgresql-generic-postgis-2.2-scripts.install.in \
| sed -e "s/@PGVERSION@/$$PGVER/" \
- >
$(CURDIR)/debian/postgresql-$$PGVER-postgis-scripts.install; \
+ >
$(CURDIR)/debian/postgresql-$$PGVER-postgis-2.2-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
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
