Merge ~paelzer/ubuntu/+source/postgis:lp-1952604-ppc-test-skip into ~paelzer/ubuntu/+source/postgis:master

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

This isn't imported in git-ubuntu (yet), but since it is a sync salsa-master == jammy-devel.
And salsa-master is what this is proposed against.

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4728/+packages
Bug: https://bugs.launchpad.net/ubuntu/+source/postgis/+bug/1952604

[Sergio Durigan Junior (sergiodj)]

Thanks, Christian.

I agree with your analysis here; this specific test is already being ignored in almost every architecture anyway, so it makes sense to include ppc64el in the list. This is a classic scenario of a broken test that needs to be fixed upstream.

LGTM, +1.

review: Approve

[Christian Ehrhardt  (paelzer)]

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading postgis_3.1.4+dfsg-3ubuntu1.dsc: done.
  Uploading postgis_3.1.4+dfsg-3ubuntu1.debian.tar.xz: done.
  Uploading postgis_3.1.4+dfsg-3ubuntu1_source.buildinfo: done.
  Uploading postgis_3.1.4+dfsg-3ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index e0ed5b6..e7539c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+postgis (3.1.4+dfsg-3ubuntu1) jammy; urgency=medium
+
+  * d/rules: ignore ppc64el test results that became unstable
+    in the autopkgtest.u.c environment in Jammy (LP: #1952604)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 01 Dec 2021 13:51:24 +0100
+
 postgis (3.1.4+dfsg-3) unstable; urgency=medium
 
   * Add upstream patch to fix test failures with GEOS 3.10.0.
diff --git a/debian/control b/debian/control
index e50093d..753a3c1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: postgis
-Maintainer: Debian GIS Project <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GIS Project <[e-mail]>
 Uploaders: Stephen Frost <[e-mail]>,
            Francesco Paolo Lovergine <[e-mail]>,
            Markus Wanner <[e-mail]>,
diff --git a/debian/control.in b/debian/control.in
index 00e8a14..28533a1 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,5 +1,6 @@
 Source: postgis
-Maintainer: Debian GIS Project <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GIS Project <[e-mail]>
 Uploaders: Stephen Frost <[e-mail]>,
            Francesco Paolo Lovergine <[e-mail]>,
            Markus Wanner <[e-mail]>,
diff --git a/debian/rules b/debian/rules
index ccb6001..8c836e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -152,7 +152,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 #   Run unit tests (against the newest Postgres version, first)
 	echo " ### testing $(NEWEST_POSTGRES_VERSION) ###"
 # Ignore test failure on problematic architectures
-ifneq (,$(filter $(DEB_BUILD_ARCH),mips mips64el mipsel s390x alpha hppa hurd-i386 kfreebsd-i386 powerpc ppc64 sparc64))
+ifneq (,$(filter $(DEB_BUILD_ARCH),mips mips64el mipsel s390x alpha hppa hurd-i386 kfreebsd-i386 powerpc ppc64 ppc64el sparc64))
 	pg_virtualenv -v $(NEWEST_POSTGRES_VERSION) \
 		make check RUNTESTFLAGS="-v" || echo "Ignoring test failures"
 else
@@ -161,7 +161,7 @@ else
 endif
 
 #	Test against all other Postgres versions
-ifneq (,$(filter $(DEB_BUILD_ARCH),mips mips64el mipsel s390x alpha hppa hurd-i386 kfreebsd-i386 powerpc ppc64 sparc64))
+ifneq (,$(filter $(DEB_BUILD_ARCH),mips mips64el mipsel s390x alpha hppa hurd-i386 kfreebsd-i386 powerpc ppc64 ppc64el sparc64))
 	set -e; \
 	for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
 		echo " ### testing $$PGVER ###"; \