[Git][debian-gis-team/postgis][experimental] 4 commits: Drop preloading liblwgeom in test target.
Bas Couwenberg
gitlab at salsa.debian.org
Mon May 27 16:05:28 BST 2019
Bas Couwenberg pushed to branch experimental at Debian GIS Project / postgis
Commits:
0852aa1a by Bas Couwenberg at 2019-05-27T14:18:12Z
Drop preloading liblwgeom in test target.
- - - - -
7d0b43ff by Bas Couwenberg at 2019-05-27T14:23:34Z
Drop postgis minor version from package name to match extension name.
- - - - -
015de00d by Bas Couwenberg at 2019-05-27T14:23:34Z
Update Conflicts for 2.5 packages.
- - - - -
cba0eed0 by Bas Couwenberg at 2019-05-27T14:24:29Z
Set distribution to experimental.
- - - - -
4 changed files:
- debian/changelog
- debian/control
- debian/control.in
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-postgis (3.0.0~alpha1+dfsg-1~exp2) UNRELEASED; urgency=medium
+postgis (3.0.0~alpha1+dfsg-1~exp2) experimental; urgency=medium
* Update dh_install -a override to use --list-missing.
* Move binaries to postgis binary package.
@@ -6,8 +6,11 @@ postgis (3.0.0~alpha1+dfsg-1~exp2) UNRELEASED; urgency=medium
* Bump GEOS build dependency to 3.6.
* Bump pgversions to 9.5+.
* Require at least libsfcgal-dev 1.3.1.
+ * Drop preloading liblwgeom in test target.
+ * Drop postgis minor version from package name to match extension name.
+ * Update Conflicts for 2.5 packages.
- -- Bas Couwenberg <sebastic at debian.org> Sun, 26 May 2019 18:22:12 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 27 May 2019 16:24:15 +0200
postgis (3.0.0~alpha1+dfsg-1~exp1) experimental; urgency=medium
=====================================
debian/control
=====================================
@@ -44,7 +44,7 @@ Package: postgis
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Recommends: postgresql-11-postgis-3.0,
+Recommends: postgresql-11-postgis-3,
postgis-doc
Suggests: postgis-gui
Description: Geographic objects support for PostgreSQL
@@ -62,7 +62,7 @@ Package: postgis-gui
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Recommends: postgresql-11-postgis-3.0,
+Recommends: postgresql-11-postgis-3,
postgis-doc
Suggests: postgis
Breaks: postgis (<< 2.2.2+dfsg-2~)
@@ -94,12 +94,12 @@ Description: Geographic objects support for PostgreSQL -- documentation
.
This package contains the PostGIS documentation.
-Package: postgresql-11-postgis-3.0
+Package: postgresql-11-postgis-3
Architecture: any
Depends: postgresql-11,
${shlibs:Depends},
${misc:Depends}
-Recommends: postgresql-11-postgis-3.0-scripts
+Recommends: postgresql-11-postgis-3-scripts
Suggests: postgis
Breaks: postgis (<< 1.2.1)
Provides: postgresql-11-postgis,
@@ -113,18 +113,19 @@ Description: Geographic objects support for PostgreSQL 11
"Simple Features Specification for SQL".
.
To create the PostGIS extensions in a PostgreSQL 11 database, the
- postgresql-11-postgis-3.0-scripts package must be installed as well.
+ postgresql-11-postgis-3-scripts package must be installed as well.
-Package: postgresql-11-postgis-3.0-scripts
+Package: postgresql-11-postgis-3-scripts
Architecture: all
Multi-Arch: foreign
Depends: ${perl:Depends},
${misc:Depends}
-Recommends: postgresql-11-postgis-3.0
+Recommends: postgresql-11-postgis-3
Breaks: postgresql-11-postgis-scripts (<< 2.2.2+dfsg-3~)
Conflicts: postgresql-11-postgis-2.2-scripts,
postgresql-11-postgis-2.3-scripts,
- postgresql-11-postgis-2.4-scripts
+ postgresql-11-postgis-2.4-scripts,
+ postgresql-11-postgis-2.5-scripts
Provides: postgresql-11-postgis-scripts,
postgresql-postgis-scripts
Replaces: postgresql-11-postgis-scripts (<< 2.2.2+dfsg-3~)
=====================================
debian/control.in
=====================================
@@ -44,7 +44,7 @@ Package: postgis
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Recommends: postgresql-NEWEST_PGVERSION-postgis-3.0,
+Recommends: postgresql-NEWEST_PGVERSION-postgis-3,
postgis-doc
Suggests: postgis-gui
Description: Geographic objects support for PostgreSQL
@@ -62,7 +62,7 @@ Package: postgis-gui
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Recommends: postgresql-NEWEST_PGVERSION-postgis-3.0,
+Recommends: postgresql-NEWEST_PGVERSION-postgis-3,
postgis-doc
Suggests: postgis
Breaks: postgis (<< 2.2.2+dfsg-2~)
@@ -94,12 +94,12 @@ Description: Geographic objects support for PostgreSQL -- documentation
.
This package contains the PostGIS documentation.
-Package: postgresql-PGVERSION-postgis-3.0
+Package: postgresql-PGVERSION-postgis-3
Architecture: any
Depends: postgresql-PGVERSION,
${shlibs:Depends},
${misc:Depends}
-Recommends: postgresql-PGVERSION-postgis-3.0-scripts
+Recommends: postgresql-PGVERSION-postgis-3-scripts
Suggests: postgis
Breaks: postgis (<< 1.2.1)
Provides: postgresql-PGVERSION-postgis,
@@ -113,18 +113,19 @@ Description: Geographic objects support for PostgreSQL PGVERSION
"Simple Features Specification for SQL".
.
To create the PostGIS extensions in a PostgreSQL PGVERSION database, the
- postgresql-PGVERSION-postgis-3.0-scripts package must be installed as well.
+ postgresql-PGVERSION-postgis-3-scripts package must be installed as well.
-Package: postgresql-PGVERSION-postgis-3.0-scripts
+Package: postgresql-PGVERSION-postgis-3-scripts
Architecture: all
Multi-Arch: foreign
Depends: ${perl:Depends},
${misc:Depends}
-Recommends: postgresql-PGVERSION-postgis-3.0
+Recommends: postgresql-PGVERSION-postgis-3
Breaks: postgresql-PGVERSION-postgis-scripts (<< 2.2.2+dfsg-3~)
Conflicts: postgresql-PGVERSION-postgis-2.2-scripts,
postgresql-PGVERSION-postgis-2.3-scripts,
- postgresql-PGVERSION-postgis-2.4-scripts
+ postgresql-PGVERSION-postgis-2.4-scripts,
+ postgresql-PGVERSION-postgis-2.5-scripts
Provides: postgresql-PGVERSION-postgis-scripts,
postgresql-postgis-scripts
Replaces: postgresql-PGVERSION-postgis-scripts (<< 2.2.2+dfsg-3~)
=====================================
debian/rules
=====================================
@@ -59,14 +59,6 @@ ifeq ($(POSTGIS_VERSION),..)
$(error Cannot detect Postgis version, fix debian/rules)
endif
-LIBLWGEOM_CURRENT = $(shell grep ^LIBLWGEOM_IFACE_CUR Version.config | cut -d= -f2)
-LIBLWGEOM_REVISION = $(shell grep ^LIBLWGEOM_IFACE_REV Version.config | cut -d= -f2)
-LIBLWGEOM_AGE = $(shell grep ^LIBLWGEOM_IFACE_AGE Version.config | cut -d= -f2)
-LIBLWGEOM_SOVERSION = $(shell expr $(LIBLWGEOM_CURRENT) - $(LIBLWGEOM_AGE))
-ifeq ($(LIBLWGEOM_SOVERSION),)
-$(error Cannot detect liblwgeom SOVERSION, fix debian/rules)
-endif
-
# For the Postgres APT repository, we want to support multiple
# Postgres versions. However, docs and the JDBC jar only need to be
# built once - in the main directory.
@@ -194,8 +186,6 @@ override_dh_auto_test-indep:
override_dh_auto_test-arch:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# Run unit tests (against the newest Postgres version, first)
- echo "LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-$(MAJOR_VERSION).$(MINOR_VERSION).so.$(LIBLWGEOM_SOVERSION)'" \
- > $(CURDIR)/postgis-check-env.tmp
echo " ### testing $(NEWEST_POSTGRES_VERSION) ###"
pg_virtualenv -v $(NEWEST_POSTGRES_VERSION) \
-c '--environment $(CURDIR)/postgis-check-env.tmp' \
@@ -205,8 +195,6 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
set -e; \
for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
echo " ### testing $$PGVER ###"; \
- echo "LD_PRELOAD = '$(CURDIR)/debian/build-$$PGVER/liblwgeom/.libs/liblwgeom-$(MAJOR_VERSION).$(MINOR_VERSION).so.$(LIBLWGEOM_SOVERSION)'" \
- > $(CURDIR)/postgis-check-env.tmp; \
pg_virtualenv -v $$PGVER \
-c '--environment $(CURDIR)/postgis-check-env.tmp' \
make -C $(CURDIR)/debian/build-$$PGVER check RUNTESTFLAGS="-v" || $(CHECK_FAIL); \
@@ -272,10 +260,10 @@ override_dh_auto_install-arch:
for PGVER in $(OTHER_POSTGRES_VERSIONS) $(NEWEST_POSTGRES_VERSION); do \
cat $(CURDIR)/debian/postgresql-generic-postgis.install.in \
| sed -e "s/@PGVERSION@/$$PGVER/" \
- > $(CURDIR)/debian/postgresql-$$PGVER-postgis-$(MAJOR_VERSION).$(MINOR_VERSION).install; \
+ > $(CURDIR)/debian/postgresql-$$PGVER-postgis-$(MAJOR_VERSION).install; \
cat $(CURDIR)/debian/postgresql-generic-postgis-scripts.install.in \
| sed -e "s/@PGVERSION@/$$PGVER/" \
- > $(CURDIR)/debian/postgresql-$$PGVER-postgis-$(MAJOR_VERSION).$(MINOR_VERSION)-scripts.install; \
+ > $(CURDIR)/debian/postgresql-$$PGVER-postgis-$(MAJOR_VERSION)-scripts.install; \
done)
# Move binaries from the NEWEST_POSTGRES_VERSION build to the
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/77819a6440b5315050e5640825be2073b69619ab...cba0eed05a02fcbf8f2af7d441fb043dfb66d011
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/77819a6440b5315050e5640825be2073b69619ab...cba0eed05a02fcbf8f2af7d441fb043dfb66d011
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190527/57b44f29/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list