%s

\n", title); - printf ("

\n" "

\n"); - printf ("%s\n", intro); @@ -3463,8 +3463,8 @@ print_udev_header (void) { time_t current_time = time (0); diff --git a/debian/patches/0715-20-sane.hwdb_multi-arch.patch b/debian/patches/0715-20-sane.hwdb_multi-arch.patch index 350c911..e590649 100644 --- a/debian/patches/0715-20-sane.hwdb_multi-arch.patch +++ b/debian/patches/0715-20-sane.hwdb_multi-arch.patch @@ -2,14 +2,14 @@ Description: Make 20-sane.hwdb Multi-Arch ready Author: Jörg Frings-Fürst Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=880391 Forwarded: not-needed -Last-Update: 2018-04-02 +Last-Update: 2018-08-11 --- 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 -@@ -3326,10 +3326,10 @@ print_usermap_header (void) +@@ -3328,10 +3328,10 @@ print_usermap_header (void) printf ("# This file was automatically created based on description files (*.desc)\n" @@ -22,7 +22,7 @@ Index: trunk/tools/sane-desc.c printf ("# The entries below are used to detect a USB device and change owner\n" -@@ -3398,8 +3398,8 @@ print_db_header (void) +@@ -3400,8 +3400,8 @@ print_db_header (void) { time_t current_time = time (0); printf ("# This file was automatically created based on description files (*.desc)\n" @@ -33,7 +33,7 @@ Index: trunk/tools/sane-desc.c printf ("#\n" "# The entries below are used to detect a USB device when it's plugged in\n" -@@ -3656,8 +3656,8 @@ print_udevhwdb_header (void) +@@ -3768,8 +3768,8 @@ print_hwdb_header (void) { time_t current_time = time (0); printf ("# This file was automatically created based on description files (*.desc)\n" @@ -44,80 +44,3 @@ Index: trunk/tools/sane-desc.c printf ("#\n" -@@ -3766,8 +3766,8 @@ print_hwdb_header (void) - { - time_t current_time = time (0); - printf ("# This file was automatically created based on description files (*.desc)\n" -- "# by sane-desc %s from %s on %s", -- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time))); -+ "# by sane-desc %s from %s\n", -+ SANE_DESC_VERSION, PACKAGE_STRING); - - printf - ("#\n" -Index: trunk/testsuite/tools/data/db.ref -=================================================================== ---- trunk.orig/testsuite/tools/data/db.ref -+++ trunk/testsuite/tools/data/db.ref -@@ -1,5 +1,5 @@ - # This file was automatically created based on description files (*.desc) --# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013 -+# by sane-desc 3.5 from sane-backends 1.0.24git - # - # The entries below are used to detect a USB device when it's plugged in - # and then run a script to change the ownership and -Index: trunk/testsuite/tools/data/hwdb.ref -=================================================================== ---- trunk.orig/testsuite/tools/data/hwdb.ref -+++ trunk/testsuite/tools/data/hwdb.ref -@@ -1,5 +1,5 @@ - # This file was automatically created based on description files (*.desc) --# by sane-desc 3.5 from sane-backends 1.0.25git on Tue Dec 3 15:24:46 2013 -+# by sane-desc 3.5 from sane-backends 1.0.25git - # - # hwdb file for supported USB devices - # -Index: trunk/testsuite/tools/data/udev+acl.ref -=================================================================== ---- trunk.orig/testsuite/tools/data/udev+acl.ref -+++ trunk/testsuite/tools/data/udev+acl.ref -@@ -1,5 +1,5 @@ - # This file was automatically created based on description files (*.desc) --# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:49 2013 -+# by sane-desc 3.5 from sane-backends 1.0.24git - # - # udev rules file for supported USB and SCSI devices - # -Index: trunk/testsuite/tools/data/udev+hwdb.ref -=================================================================== ---- trunk.orig/testsuite/tools/data/udev+hwdb.ref -+++ trunk/testsuite/tools/data/udev+hwdb.ref -@@ -1,5 +1,5 @@ - # This file was automatically created based on description files (*.desc) --# by sane-desc 3.5 from sane-backends 1.0.24git on Thu Aug 1 18:50:15 2013 -+# by sane-desc 3.5 from sane-backends 1.0.24git - # - # udev rules file for supported USB and SCSI devices - # -Index: trunk/testsuite/tools/data/udev.ref -=================================================================== ---- trunk.orig/testsuite/tools/data/udev.ref -+++ trunk/testsuite/tools/data/udev.ref -@@ -1,5 +1,5 @@ - # This file was automatically created based on description files (*.desc) --# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013 -+# by sane-desc 3.5 from sane-backends 1.0.24git - # - # udev rules file for supported USB and SCSI devices - # -Index: trunk/testsuite/tools/data/usermap.ref -=================================================================== ---- trunk.orig/testsuite/tools/data/usermap.ref -+++ trunk/testsuite/tools/data/usermap.ref -@@ -1,5 +1,5 @@ - # This file was automatically created based on description files (*.desc) --# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013 -+# by sane-desc 3.5 from sane-backends 1.0.24git - # - # The entries below are used to detect a USB device and change owner - # and permissions on the "device node" used by libusb. diff --git a/debian/patches/0725-fix_link_60-libsane_rule.patch b/debian/patches/0725-fix_link_60-libsane_rule.patch index dc99d2c..018e796 100644 --- a/debian/patches/0725-fix_link_60-libsane_rule.patch +++ b/debian/patches/0725-fix_link_60-libsane_rule.patch @@ -9,7 +9,7 @@ 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) +@@ -3665,7 +3665,7 @@ print_udevhwdb_header (void) ("#\n" "# udev rules file for supported USB and SCSI devices\n" "#\n" diff --git a/debian/patches/series b/debian/patches/series index 717fd31..cb9993e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,6 +4,7 @@ ##0020-nousbtest.patch ##0025-multiarch_manpages_libdir.patch #0030-ppc64el.patch +0040-remove_git.patch 0035-trim-libraries-in-sane-backends.pc.in.patch #0100-source_spelling.patch #0105-hp3900.patch @@ -12,7 +13,7 @@ #0120-typo.patch 0600-scanimage_manpage.patch #0605-man_typo.patch -#0700-mk_reproducible_results.patch +0700-mk_reproducible_results.patch 0705-kfreebsd.patch ##0710-sane-desc.c_debian_mods.patch ##0125-multiarch_dll_search_path.patch -- cgit v1.2.3