diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2023-07-14 10:01:42 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2023-07-14 10:01:42 +0200 |
| commit | 7aeb1d1dbf24bf9d6ed695a1e5ff73effd804c6d (patch) | |
| tree | f3b13d4fb2f31b9ea186de14029c1446e5380d28 | |
| parent | d3d015128552b36c0921c895ac8c2c0d3cfbfcb9 (diff) | |
| parent | ff4016c4d67a9170ddb52698fbc3f33a84c9320a (diff) | |
Merge branch 'release/debian/1.2.1-4'debian/1.2.1-4
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | debian/rules | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 69bf9a9..e71a6c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +sane-backends (1.2.1-4) unstable; urgency=medium + + * Fix FTBFS on hurd-i386 (Closes: #1040123): + - debian/rules: Remove --enable-parport-directio. + Thanks to Pino Toscano <pino@debian.org>. + + -- Jörg Frings-Fürst <debian@jff.email> Sun, 09 Jul 2023 19:16:00 +0200 + sane-backends (1.2.1-3) unstable; urgency=medium * debian/control: diff --git a/debian/rules b/debian/rules index c98440b..a6650b9 100755 --- a/debian/rules +++ b/debian/rules @@ -14,13 +14,6 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) STRIP = "" endif -ifeq (,$(filter hurd-i386,$(DEB_HOST_ARCH))) - INS_CONF = "" -else - INS_CONF = --enable-parport-directio -endif - - %: dh $@ @@ -56,8 +49,7 @@ endif --enable-pnm-backend \ --with-usb \ --without-v4l \ - --disable-locking \ - $(INS_CONF) + --disable-locking override_dh_autoreconf: dh_autoreconf -Xlibtool.m4 |