diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2023-11-27 08:06:25 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2023-11-27 08:06:25 +0100 |
| commit | 68ddaed33f40c7af96bb962ba70854340685219e (patch) | |
| tree | ed98819837864b81ca28ea88fd966b87ec41989e /debian/patches | |
| parent | 957b126ad9ebe2fcd142f8d930a85a84f560c037 (diff) | |
| parent | df5b35d76db5acfc0a82a75c54acfc5d1579e17b (diff) | |
Merge branch 'release/debian/1.2.1-6'debian/1.2.1-6
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0725-fix_link_60-libsane_rule.patch | 33 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 34 deletions
diff --git a/debian/patches/0725-fix_link_60-libsane_rule.patch b/debian/patches/0725-fix_link_60-libsane_rule.patch deleted file mode 100644 index 0b424e2..0000000 --- a/debian/patches/0725-fix_link_60-libsane_rule.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 -@@ -3649,7 +3649,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" -Index: trunk/testsuite/tools/data/udev+hwdb.ref -=================================================================== ---- trunk.orig/testsuite/tools/data/udev+hwdb.ref -+++ trunk/testsuite/tools/data/udev+hwdb.ref -@@ -3,7 +3,7 @@ - # - # udev rules file for supported USB and SCSI devices - # --# For the list of supported USB devices see /usr/lib/udev/hwdb.d/20-sane.hwdb -+# For the list of supported USB devices see /lib/udev/hwdb.d/20-sane.hwdb - # - # The SCSI device support is very basic and includes only - # scanners that mark themselves as type "scanner" or diff --git a/debian/patches/series b/debian/patches/series index 81eddad..ac4a4b6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,7 +5,6 @@ 0140-avahi.patch 0145-avahi.patch 0705-kfreebsd.patch -0725-fix_link_60-libsane_rule.patch 0150-i386-test.patch 0155-hurd_PATH_MAX.patch 0050-Use-python3-shebang.patch |