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@debian.org>  Thu, 05 Jul 2018 10:52:41 +0200
 

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