[med-svn] [Git][med-team/gwyddion][master] 3 commits: Build-Depends: architecture-is-64-bit, architecture-is-little-endian

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / gwyddion


Commits:
bbf692d2 by Andreas Tille at 2026-05-06T19:15:51+02:00
Build-Depends: architecture-is-64-bit, architecture-is-little-endian

- - - - -
288f7125 by Andreas Tille at 2026-05-06T19:59:52+02:00
Exclude some test for different architectures

- - - - -
e53581e4 by Andreas Tille at 2026-05-06T20:12:15+02:00
Upload to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+gwyddion (3.10-2) unstable; urgency=medium
+
+  * Build-Depends: architecture-is-64-bit, architecture-is-little-endian
+  * Exclude some test for different architectures
+
+ -- Andreas Tille <tille at debian.org>  Wed, 06 May 2026 20:09:34 +0200
+
 gwyddion (3.10-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/control
=====================================
@@ -6,6 +6,8 @@ Uploaders:
  Étienne Mollier <emollier at debian.org>,
 Section: science
 Build-Depends:
+ architecture-is-64-bit,
+ architecture-is-little-endian,
  dpkg-dev (>= 1.22.5),
  debhelper-compat (= 13),
  gtk-doc-tools,


=====================================
debian/rules
=====================================
@@ -2,18 +2,36 @@
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+include /usr/share/dpkg/architecture.mk
+
 %:
 	dh $@
 
-# FIXME: broken configure.ac results in autoreconf output:
-#
-#	configure.ac: warning: AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION or AM_GNU_GETTEXT_REQUIRE_VERSION
-#	libgwyapp/Makefile.am:130: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL
-#	libgwyddion/Makefile.am:159: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL
-#	libgwyui/Makefile.am:140: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL
-#	autoreconf: error: automake failed with exit status: 1
 override_dh_autoreconf:
 	@echo 'W: skipping dh_autoreconf due to broken configure.ac.'
 
 execute_after_dh_install:
 	find debian -name "*.la" -delete
+
+override_dh_auto_test-arch:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter $(DEB_HOST_ARCH),loong64 ppc64el))
+	set -x ; \
+	sed -i '/field.*extend.*undefined/d' tests/test-list.txt ; \
+	set +x
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH),ppc64))
+	set -x ; \
+	sed -i -e '/serialization.*less-trivial.*native/d' \
+	       -e '/serialization.*less-trivial.*64bit/d' \
+	       -e '/serialization.*less-trivial.*32bit/d' \
+	       -e '/serialization.*extra-item/d' tests/test-list.txt ; \
+	set +x
+endif
+	dh_auto_test
+endif
+
+override_dh_auto_test-indep:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	echo "Skip test in architecture all builds"
+endif



View it on GitLab: https://salsa.debian.org/med-team/gwyddion/-/compare/57289ddd5fbc071bfb4dd34a36a6c6bb61d26da2...e53581e42a997232244db7d7a5d4323c082874f5

-- 
View it on GitLab: https://salsa.debian.org/med-team/gwyddion/-/compare/57289ddd5fbc071bfb4dd34a36a6c6bb61d26da2...e53581e42a997232244db7d7a5d4323c082874f5
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260506/08e4957d/attachment-0001.htm>