[Git][debian-gis-team/postgis][master] 3 commits: Add graphicsmagick-imagemagick-compat to Build-Conflicts.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / postgis


Commits:
25a84858 by Bas Couwenberg at 2023-07-27T07:42:22+02:00
Add graphicsmagick-imagemagick-compat to Build-Conflicts.

- - - - -
b3cfafbc by Bas Couwenberg at 2023-07-27T07:42:35+02:00
Ignore test failure on i386.

https://trac.osgeo.org/postgis/ticket/5448

- - - - -
7c78759f by Bas Couwenberg at 2023-07-27T07:45:19+02:00
Add patch to fix FTBFS on powerpc architectures.

https://trac.osgeo.org/postgis/ticket/5450

- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/control.in
- + debian/patches/powerpc.patch
- debian/patches/series
- debian/rules
- debian/tests/test-extension-creation


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+postgis (3.3.3+dfsg-4) UNRELEASED; urgency=medium
+
+  * Add graphicsmagick-imagemagick-compat to Build-Conflicts.
+    https://trac.osgeo.org/postgis/ticket/5446
+  * Ignore test failure on i386.
+    https://trac.osgeo.org/postgis/ticket/5448
+  * Add patch to fix FTBFS on powerpc architectures.
+    https://trac.osgeo.org/postgis/ticket/5450
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 27 Jul 2023 07:39:16 +0200
+
 postgis (3.3.3+dfsg-3) unstable; urgency=medium
 
   * Add patch to fix FTBFS with GEOS 3.12.


=====================================
debian/control
=====================================
@@ -34,6 +34,7 @@ Build-Depends: bison,
                protobuf-c-compiler,
                rdfind,
                xsltproc
+Build-Conflicts: graphicsmagick-imagemagick-compat
 Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/postgis
 Vcs-Git: https://salsa.debian.org/debian-gis-team/postgis.git


=====================================
debian/control.in
=====================================
@@ -34,6 +34,7 @@ Build-Depends: bison,
                protobuf-c-compiler,
                rdfind,
                xsltproc
+Build-Conflicts: graphicsmagick-imagemagick-compat
 Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/postgis
 Vcs-Git: https://salsa.debian.org/debian-gis-team/postgis.git


=====================================
debian/patches/powerpc.patch
=====================================
@@ -0,0 +1,16 @@
+Description: Fix macro expansion recursion on powerpc architectures.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug: https://trac.osgeo.org/postgis/ticket/5450
+Applied-Upstream: https://git.osgeo.org/gitea/postgis/postgis/commit/8338aca150885c6be9ffd73a05c12ad039f1e285
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,7 +53,7 @@ dnl SQL Preprocessor
+ dnl
+ AC_PATH_PROG([CPPBIN], [cpp], [])
+ if test "x$CPPBIN" != "x"; then
+-  SQLPP="${CPPBIN} -traditional-cpp -w -P"
++  SQLPP="${CPPBIN} -traditional-cpp -w -P -Upixel -Ubool"
+ else
+   AC_PATH_PROG([GPP], [gpp_], [])
+   if test "x$GPP" != "x"; then


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ chaikin
 incorrect-path-for-interpreter.patch
 proj-9.2.patch
 geos-3.12.patch
+powerpc.patch


=====================================
debian/rules
=====================================
@@ -18,7 +18,7 @@ include /usr/share/dpkg/pkg-info.mk
 include /usr/share/postgresql-common/pgxs_debian_control.mk
 
 # Ignore testsuite failures on these architectures
-IGNORE_TEST_FAILURE_ARCHS = mips mips64el mipsel s390x alpha hppa hurd-i386 kfreebsd-i386 powerpc ppc64 sparc64
+IGNORE_TEST_FAILURE_ARCHS = i386 mips mips64el mipsel s390x alpha hppa hurd-i386 kfreebsd-i386 powerpc ppc64 sparc64
 ifneq (,$(filter $(DEB_BUILD_ARCH),$(IGNORE_TEST_FAILURE_ARCHS)))
 	TEST_FAIL_COMMAND = echo "Ignoring test failures"
 else


=====================================
debian/tests/test-extension-creation
=====================================
@@ -8,7 +8,7 @@ unset LC_ALL LANGUAGE
 ARCH="$(dpkg-architecture -qDEB_BUILD_ARCH)"
 
 case $ARCH in
-	armel|armhf|mips|mips64el|mipsel|s390x|alpha|hppa|hurd-i386|kfreebsd-i386|powerpc|ppc64|sparc64)
+	armel|armhf|i386|mips|mips64el|mipsel|s390x|alpha|hppa|hurd-i386|kfreebsd-i386|powerpc|ppc64|sparc64)
 		echo "Ignoring test failures on problematic architectures"
 		TEST_FAIL_EXITCODE=77 ;;
 	*)



View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/513a9b807be28558094986ff4dd9946ccf31c10c...7c78759fefc62ee819a15fb5379b6b7a25283ed6

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/513a9b807be28558094986ff4dd9946ccf31c10c...7c78759fefc62ee819a15fb5379b6b7a25283ed6
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/20230727/8bc20a7b/attachment-0001.htm>