summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-12-18 07:24:02 +0100
committerJörg Frings-Fürst <debian@jff.email>2023-12-18 07:24:02 +0100
commit52c7d661296d9efb9a51b52c38dda22516cf981a (patch)
tree84c1e3e8e86d1bf9318614d36efef80d9696b86b
parent68ddaed33f40c7af96bb962ba70854340685219e (diff)
parent3939a91b97fb3cae53eb27beda5a37440158ac76 (diff)
Merge branch 'release/debian/1.2.1-7'HEADdebian/1.2.1-7master
-rw-r--r--debian/changelog8
-rwxr-xr-xdebian/rules2
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 7ab0425..8f3a75a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sane-backends (1.2.1-7) unstable; urgency=medium
+
+ * debian/rules:
+ - Fix FTCBFS: confuses build/host compiler flags (Closes: #1057649).
+ Thanks to Emanuele Rocca <ema@debian.org>.
+
+ -- Jörg Frings-Fürst <debian@jff.email> Sun, 17 Dec 2023 13:05:00 +0100
+
sane-backends (1.2.1-6) unstable; urgency=medium
* libsane1: move udev files to /usr, with protective diversion
diff --git a/debian/rules b/debian/rules
index d4168f2..0d45f6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ endif
override_dh_auto_configure:
autoconf
ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
- dpkg-architecture -f "-a$(DEB_BUILD_ARCH)" -c dh_auto_configure
+ dpkg-architecture -f "-a$(DEB_BUILD_ARCH)" -c dh_auto_configure --reload-all-buildenv-variables
$(MAKE) -C $(CURDIR)/lib liblib.la
$(MAKE) -C $(CURDIR)/sanei libsanei.la
$(MAKE) -C $(CURDIR)/tools sane-desc