From 018747de1a645fa4eb28ae0f820564df42680f58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 25 Nov 2023 19:36:01 +0100 Subject: Merge /bin to /usr/bin --- debian/patches/0725-fix_link_60-libsane_rule.patch | 33 ---------------------- debian/patches/series | 1 - 2 files changed, 34 deletions(-) delete mode 100644 debian/patches/0725-fix_link_60-libsane_rule.patch (limited to 'debian/patches') 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 -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 -- cgit v1.2.3