diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/0725-fix_link_60-libsane_rule.patch | 20 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 2 |
4 files changed, 27 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 1361039..be5ac09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,14 @@ -sane-backends (1.0.27-4) UNRELEASED; urgency=medium +sane-backends (1.0.27-4~experimental1) UNRELEASED; urgency=medium * debian/rules: - Add --exclude=/sane/ to override_dh_makeshlibs-arch to generate only public symbols (Closes: #911597). - - Don't install the hal fdi file. - * Merge release 1.0.27.3.2 into source tree. + - Don't install obsolete hal fdi file (Closes: #913282). + * Merge release 1.0.27-3.2 into source tree. - I disagree the changes from 1.0.27-3.1. - Thanks to John Paul Adrian Glaubitz for the bug fix. + * New debian/patches/0725-fix_link_60-libsane_rule.patch: + - Fix directory for 20-sane.hwdb (Closes: #916239). -- Jörg Frings-Fürst <debian@jff.email> Wed, 07 Nov 2018 13:21:48 +0100 diff --git a/debian/patches/0725-fix_link_60-libsane_rule.patch b/debian/patches/0725-fix_link_60-libsane_rule.patch new file mode 100644 index 0000000..76a65a9 --- /dev/null +++ b/debian/patches/0725-fix_link_60-libsane_rule.patch @@ -0,0 +1,20 @@ +Description: Fix directory for 20-sane.hwdb +Author: Jörg Frings-Fürst <debian@jff.email> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916239 +Forwarded: not-needed +Last-Update: 2019-04-27 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/tools/sane-desc.c +=================================================================== +--- trunk.orig/tools/sane-desc.c ++++ trunk/tools/sane-desc.c +@@ -3663,7 +3663,7 @@ print_udevhwdb_header (void) + ("#\n" + "# udev rules file for supported USB and SCSI devices\n" + "#\n" +- "# For the list of supported USB devices see /usr/lib/udev/hwdb.d/20-sane.hwdb\n" ++ "# For the list of supported USB devices see /lib/udev/hwdb.d/20-sane.hwdb\n" + "#\n" + "# The SCSI device support is very basic and includes only\n" + "# scanners that mark themselves as type \"scanner\" or\n" diff --git a/debian/patches/series b/debian/patches/series index 464af6b..9da26a2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,3 +25,4 @@ #0130-usb-timeout.patch 0715-20-sane.hwdb_multi-arch.patch 0720-mustek_usb2-Avoid-stack-smashing.patch +0725-fix_link_60-libsane_rule.patch diff --git a/debian/rules b/debian/rules index 8c7ff55..1b57478 100755 --- a/debian/rules +++ b/debian/rules @@ -132,4 +132,4 @@ override_dh_installsystemd-arch: dh_installsystemd -psane-utils --no-enable --name=saned@ override_dh_makeshlibs-arch: - dh_makeshlibs -- -v$(DEB_VERSION_UPSTREAM) -Pdebian/libsane -plibsane + dh_makeshlibs --exclude=/sane/ -- -v$(DEB_VERSION_UPSTREAM) -Pdebian/libsane -plibsane |