diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/debian.diff | 34 | ||||
| -rw-r--r-- | debian/libsane1.dirs | 1 | ||||
| -rw-r--r-- | debian/libsane1.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 |
6 files changed, 45 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 8c0b96d..7fc4cf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sane-backends (1.3.0-2) UNRELEASED; urgency=medium + + * Fix FTBFS on hurd-i386 & hurd-amd64 (Closes: #1081122). + - Thanks to Pino Toscano <pino@debian.org>. + + -- Jörg Frings-Fürst <debian@jff.email> Sat, 06 Jul 2024 18:16:41 +0200 + sane-backends (1.3.0-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 44c2738..6a6b782 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: libcups2-dev, libcurl4-gnutls-dev, libgphoto2-dev, - libieee1284-3-dev [!hurd-i386], + libieee1284-3-dev [!hurd-any], libjpeg-dev, libltdl-dev, libpng-dev, diff --git a/debian/debian.diff b/debian/debian.diff new file mode 100644 index 0000000..729cce9 --- /dev/null +++ b/debian/debian.diff @@ -0,0 +1,34 @@ +--- a/debian/control ++++ b/debian/control +@@ -14,7 +14,7 @@ Build-Depends: + libcups2-dev, + libcurl4-gnutls-dev, + libgphoto2-dev, +- libieee1284-3-dev [!hurd-i386], ++ libieee1284-3-dev [!hurd-any], + libjpeg-dev, + libltdl-dev, + libpng-dev, +--- a/debian/libsane1.dirs ++++ b/debian/libsane1.dirs +@@ -1 +1,2 @@ + /usr/lib/udev/hwdb.d/ ++/usr/lib/udev/rules.d/ +--- a/debian/libsane1.install ++++ b/debian/libsane1.install +@@ -1,4 +1,2 @@ + usr/lib/*/*.so.* + usr/lib/*/sane/*.so.* +-debian/60-libsane1.rules /usr/lib/udev/rules.d/ +-debian/99-libsane1.rules /usr/lib/udev/rules.d/ +--- a/debian/rules ++++ b/debian/rules +@@ -92,6 +92,8 @@ ifeq (linux,$(DEB_HOST_ARCH_OS)) + $(SANE_DESC) -s $(CURDIR)/doc/descriptions -m hwdb > $(CURDIR)/debian/20-sane.hwdb + + cp $(CURDIR)/debian/20-sane.hwdb $(CURDIR)/debian/libsane1/usr/lib/udev/hwdb.d/ ++ cp $(CURDIR)/debian/60-libsane1.rules $(CURDIR)/debian/libsane1/usr/lib/udev/rules.d/ ++ cp $(CURDIR)/debian/99-libsane1.rules $(CURDIR)/debian/libsane1/usr/lib/udev/rules.d/ + endif + + dh_install diff --git a/debian/libsane1.dirs b/debian/libsane1.dirs index a2b7938..ced1768 100644 --- a/debian/libsane1.dirs +++ b/debian/libsane1.dirs @@ -1 +1,2 @@ /usr/lib/udev/hwdb.d/ +/usr/lib/udev/rules.d/ diff --git a/debian/libsane1.install b/debian/libsane1.install index bd940fe..b38912c 100644 --- a/debian/libsane1.install +++ b/debian/libsane1.install @@ -1,4 +1,2 @@ usr/lib/*/*.so.* usr/lib/*/sane/*.so.* -debian/60-libsane1.rules /usr/lib/udev/rules.d/ -debian/99-libsane1.rules /usr/lib/udev/rules.d/ diff --git a/debian/rules b/debian/rules index 0d45f6b..d44c8ce 100755 --- a/debian/rules +++ b/debian/rules @@ -92,6 +92,8 @@ ifeq (linux,$(DEB_HOST_ARCH_OS)) $(SANE_DESC) -s $(CURDIR)/doc/descriptions -m hwdb > $(CURDIR)/debian/20-sane.hwdb cp $(CURDIR)/debian/20-sane.hwdb $(CURDIR)/debian/libsane1/usr/lib/udev/hwdb.d/ + cp $(CURDIR)/debian/60-libsane1.rules $(CURDIR)/debian/libsane1/usr/lib/udev/rules.d/ + cp $(CURDIR)/debian/99-libsane1.rules $(CURDIR)/debian/libsane1/usr/lib/udev/rules.d/ endif dh_install |