[Git][debian-gis-team/postgis][experimental] 2 commits: rules: Drop duplicated VENDOR_DERIVES_FROM_UBUNTU definition
Christoph Berg
gitlab at salsa.debian.org
Sun Jul 15 21:42:59 BST 2018
Christoph Berg pushed to branch experimental at Debian GIS Project / postgis
Commits:
ad2fa395 by Christoph Berg at 2018-07-15T22:40:12+02:00
rules: Drop duplicated VENDOR_DERIVES_FROM_UBUNTU definition
- - - - -
e0f41abe by Christoph Berg at 2018-07-15T22:42:33+02:00
debian/rules: Use filter to disable tests on specific architectures
debian/rules: Use filter instead of findstring to disable tests on specific
architectures. The old version erroneously disabled the tests on "i386" because
it is a substring of "kfreebsd-i386".
- - - - -
2 changed files:
- debian/changelog
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ postgis (2.5.0~beta1+dfsg-1~exp2) UNRELEASED; urgency=medium
[ Christoph Berg ]
* debian/pgversions: Bump to 9.4+, 9.3 is no longer supported.
+ * debian/rules: Use filter instead of findstring to disable tests on
+ specific architectures. The old version erroneously disabled the tests on
+ "i386" because it is a substring of "kfreebsd-i386".
-- Bas Couwenberg <sebastic at debian.org> Thu, 05 Jul 2018 10:52:41 +0200
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -47,15 +47,13 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo yes)
-
CHECK = check
ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
CHECK =
endif
# Skip tests on problematic architectures
-ifneq (,$(findstring $(DEB_BUILD_ARCH),"arm64 armel armhf mips mips64el mipsel ppc64el s390x alpha hppa hurd-i386 kfreebsd-i386 powerpc ppc64 sparc64"))
+ifneq (,$(filter $(DEB_BUILD_ARCH),"arm64 armel armhf mips mips64el mipsel ppc64el s390x alpha hppa hurd-i386 kfreebsd-i386 powerpc ppc64 sparc64"))
CHECK =
endif
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/018c28ccc395f6741b36ed54ff633c41b72030b7...e0f41abea1d73c0003806fb13b1cffbcdcd46136
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/018c28ccc395f6741b36ed54ff633c41b72030b7...e0f41abea1d73c0003806fb13b1cffbcdcd46136
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/20180715/b69ddf6f/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list