diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0040-remove_git.patch | 23 | ||||
| -rw-r--r-- | debian/patches/0045-disable_lock_test_at_build_time.patch | 2 | ||||
| -rw-r--r-- | debian/patches/0060-cross.patch | 4 | ||||
| -rw-r--r-- | debian/patches/0140-avahi.patch | 12 | ||||
| -rw-r--r-- | debian/patches/0145-avahi.patch | 4 | ||||
| -rw-r--r-- | debian/patches/0150-i386-test.patch | 4 | ||||
| -rw-r--r-- | debian/patches/0155-hurd_PATH_MAX.patch | 44 | ||||
| -rw-r--r-- | debian/patches/0175-fix_tests.patch | 96 | ||||
| -rw-r--r-- | debian/patches/0600-scanimage_manpage.patch | 4 | ||||
| -rw-r--r-- | debian/patches/0605-fix_groff-warnings.patch | 68 | ||||
| -rw-r--r-- | debian/patches/0705-kfreebsd.patch | 2 | ||||
| -rw-r--r-- | debian/patches/0725-fix_link_60-libsane_rule.patch | 2 | ||||
| -rw-r--r-- | debian/patches/series | 12 |
13 files changed, 218 insertions, 59 deletions
diff --git a/debian/patches/0040-remove_git.patch b/debian/patches/0040-remove_git.patch index d3df568..2be7a6e 100644 --- a/debian/patches/0040-remove_git.patch +++ b/debian/patches/0040-remove_git.patch @@ -1,19 +1,12 @@ -Description: Remove git from buildsystem +Description: fix missing .tarball-version if git isn't used Author: Jörg Frings-Fürst <debian@jff.email> -Forwarded: not-needed -Last-Update: 2019-08-11 +Bug: https://gitlab.com/sane-project/backends/-/issues/440 +Last-Update: 2021-02-17 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/configure.ac +Index: trunk/.tarball-version =================================================================== ---- trunk.orig/configure.ac -+++ trunk/configure.ac -@@ -5,7 +5,7 @@ dnl Set up autoconf and automake - dnl When preparing a release, modify the numeric version components - dnl and remove the git suffix. - dnl ****************************************************************** --AC_INIT([sane-backends],m4_esyscmd_s([git describe --dirty]), -+AC_INIT([sane-backends],[1.0.31-debian], - [sane-devel@alioth-lists.debian.net]) - AC_PREREQ([2.69]) dnl minimum autoconf version required - AC_CONFIG_MACRO_DIR([m4]) +--- /dev/null ++++ trunk/.tarball-version +@@ -0,0 +1 @@ ++1.0.32-debian diff --git a/debian/patches/0045-disable_lock_test_at_build_time.patch b/debian/patches/0045-disable_lock_test_at_build_time.patch index e5f82f3..8aeccf8 100644 --- a/debian/patches/0045-disable_lock_test_at_build_time.patch +++ b/debian/patches/0045-disable_lock_test_at_build_time.patch @@ -8,7 +8,7 @@ Index: trunk/acinclude.m4 =================================================================== --- trunk.orig/acinclude.m4 +++ trunk/acinclude.m4 -@@ -359,11 +359,11 @@ AC_DEFUN([SANE_CHECK_LOCKING], +@@ -356,11 +356,11 @@ AC_DEFUN([SANE_CHECK_LOCKING], touch sanetest.file chgrp $LOCKPATH_GROUP sanetest.file 2>/dev/null || lasterror=$? rm -f sanetest.file diff --git a/debian/patches/0060-cross.patch b/debian/patches/0060-cross.patch index 4087882..a810929 100644 --- a/debian/patches/0060-cross.patch +++ b/debian/patches/0060-cross.patch @@ -9,7 +9,7 @@ Index: trunk/acinclude.m4 =================================================================== --- trunk.orig/acinclude.m4 +++ trunk/acinclude.m4 -@@ -439,15 +439,19 @@ AC_DEFUN([SANE_CHECK_GPHOTO2], +@@ -436,15 +436,19 @@ AC_DEFUN([SANE_CHECK_GPHOTO2], # a program. And, if that works, then add the -l flags to # GPHOTO2_LIBS and any other flags to GPHOTO2_LDFLAGS to pass to # sane-config. @@ -36,7 +36,7 @@ Index: trunk/acinclude.m4 saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${GPHOTO2_CPPFLAGS}" saved_LIBS="${LIBS}" -@@ -467,13 +471,13 @@ AC_DEFUN([SANE_CHECK_GPHOTO2], +@@ -464,13 +468,13 @@ AC_DEFUN([SANE_CHECK_GPHOTO2], GPHOTO2_LIBS="" else SANE_EXTRACT_LDFLAGS(GPHOTO2_LIBS, GPHOTO2_LDFLAGS) diff --git a/debian/patches/0140-avahi.patch b/debian/patches/0140-avahi.patch index c424323..b666bff 100644 --- a/debian/patches/0140-avahi.patch +++ b/debian/patches/0140-avahi.patch @@ -9,7 +9,7 @@ Index: trunk/backend/net.c =================================================================== --- trunk.orig/backend/net.c +++ trunk/backend/net.c -@@ -771,7 +771,7 @@ net_avahi_browse_callback (AvahiServiceB +@@ -769,7 +769,7 @@ net_avahi_browse_callback (AvahiServiceB { case AVAHI_BROWSER_FAILURE: DBG (1, "net_avahi_browse_callback: %s\n", avahi_strerror (avahi_client_errno (avahi_service_browser_get_client (b)))); @@ -18,7 +18,7 @@ Index: trunk/backend/net.c return; case AVAHI_BROWSER_NEW: -@@ -836,7 +836,7 @@ net_avahi_callback (AvahiClient *c, Avah +@@ -834,7 +834,7 @@ net_avahi_callback (AvahiClient *c, Avah if (avahi_browser == NULL) { DBG (1, "net_avahi_callback: could not create service browser: %s\n", avahi_strerror (avahi_client_errno (c))); @@ -27,7 +27,7 @@ Index: trunk/backend/net.c } break; -@@ -859,14 +859,14 @@ net_avahi_callback (AvahiClient *c, Avah +@@ -857,14 +857,14 @@ net_avahi_callback (AvahiClient *c, Avah if (avahi_client == NULL) { DBG (1, "net_avahi_init: could not create Avahi client: %s\n", avahi_strerror (error)); @@ -44,7 +44,7 @@ Index: trunk/backend/net.c } break; } -@@ -1045,12 +1041,12 @@ sane_init (SANE_Int * version_code, SANE +@@ -1043,12 +1043,12 @@ sane_init (SANE_Int * version_code, SANE continue; } #if WITH_AVAHI @@ -59,7 +59,7 @@ Index: trunk/backend/net.c #endif /* WITH_AVAHI */ } -@@ -1096,12 +1092,12 @@ sane_init (SANE_Int * version_code, SANE +@@ -1094,12 +1094,12 @@ sane_init (SANE_Int * version_code, SANE continue; #endif /* ENABLE_IPV6 */ #if WITH_AVAHI @@ -74,7 +74,7 @@ Index: trunk/backend/net.c #endif /* WITH_AVAHI */ } free (copy); -@@ -1519,11 +1520,11 @@ sane_open (SANE_String_Const full_name, +@@ -1517,11 +1517,11 @@ sane_open (SANE_String_Const full_name, "sane_open: device %s not found, trying to register it anyway\n", nd_name); #if WITH_AVAHI diff --git a/debian/patches/0145-avahi.patch b/debian/patches/0145-avahi.patch index d358a41..a5d98ef 100644 --- a/debian/patches/0145-avahi.patch +++ b/debian/patches/0145-avahi.patch @@ -9,7 +9,7 @@ Index: trunk/backend/net.c =================================================================== --- trunk.orig/backend/net.c +++ trunk/backend/net.c -@@ -964,10 +964,6 @@ sane_init (SANE_Int * version_code, SANE +@@ -962,10 +962,6 @@ sane_init (SANE_Int * version_code, SANE first_device = NULL; first_handle = NULL; @@ -20,7 +20,7 @@ Index: trunk/backend/net.c auth_callback = authorize; /* Return the version number of the sane-backends package to allow -@@ -1119,6 +1115,11 @@ sane_init (SANE_Int * version_code, SANE +@@ -1117,6 +1113,11 @@ sane_init (SANE_Int * version_code, SANE DBG (2, "sane_init: connect timeout set to %d seconds from env\n", connect_timeout); } diff --git a/debian/patches/0150-i386-test.patch b/debian/patches/0150-i386-test.patch index 4c064c5..70681dd 100644 --- a/debian/patches/0150-i386-test.patch +++ b/debian/patches/0150-i386-test.patch @@ -8,7 +8,7 @@ Index: trunk/testsuite/backend/genesys/tests_image.cpp =================================================================== --- trunk.orig/testsuite/backend/genesys/tests_image.cpp +++ trunk/testsuite/backend/genesys/tests_image.cpp -@@ -124,14 +124,14 @@ void test_set_pixel_to_row() +@@ -122,14 +122,14 @@ void test_set_pixel_to_row() pixel = Pixel(0x1200, 0x1200, 0x1200); set_pixel_to_row(data.data(), 0, pixel, PixelFormat::I8); @@ -27,7 +27,7 @@ Index: trunk/testsuite/backend/genesys/tests_image.cpp reset(); pixel = Pixel(0x1200, 0x3400, 0x5600); -@@ -160,14 +160,14 @@ void test_set_pixel_to_row() +@@ -158,14 +158,14 @@ void test_set_pixel_to_row() pixel = Pixel(0x1234, 0x1234, 0x1234); set_pixel_to_row(data.data(), 0, pixel, PixelFormat::I16); diff --git a/debian/patches/0155-hurd_PATH_MAX.patch b/debian/patches/0155-hurd_PATH_MAX.patch index 41952c6..71d4c68 100644 --- a/debian/patches/0155-hurd_PATH_MAX.patch +++ b/debian/patches/0155-hurd_PATH_MAX.patch @@ -5,7 +5,7 @@ Index: trunk/backend/escl/escl_capabilities.c =================================================================== --- trunk.orig/backend/escl/escl_capabilities.c +++ trunk/backend/escl/escl_capabilities.c -@@ -35,6 +35,10 @@ +@@ -34,6 +34,10 @@ #include "../include/sane/saneopts.h" @@ -20,7 +20,7 @@ Index: trunk/backend/escl/escl.h =================================================================== --- trunk.orig/backend/escl/escl.h +++ trunk/backend/escl/escl.h -@@ -62,6 +62,10 @@ +@@ -67,6 +67,10 @@ # define DBGDUMP(level, buf, size) #endif @@ -35,7 +35,7 @@ Index: trunk/backend/canon630u.c =================================================================== --- trunk.orig/backend/canon630u.c +++ trunk/backend/canon630u.c -@@ -67,6 +67,10 @@ +@@ -65,6 +65,10 @@ #include "canon630u-common.c" @@ -50,7 +50,7 @@ Index: trunk/backend/canon_pp.c =================================================================== --- trunk.orig/backend/canon_pp.c +++ trunk/backend/canon_pp.c -@@ -85,6 +85,11 @@ +@@ -77,6 +77,11 @@ #include "../include/sane/sanei_backend.h" /* #include "../include/sane/sanei_debug.h" */ @@ -66,7 +66,7 @@ Index: trunk/backend/gt68xx.h =================================================================== --- trunk.orig/backend/gt68xx.h +++ trunk/backend/gt68xx.h -@@ -53,4 +53,8 @@ +@@ -51,4 +51,8 @@ #define GT68XX_CONFIG_FILE "gt68xx.conf" @@ -79,7 +79,7 @@ Index: trunk/backend/hp3900_sane.c =================================================================== --- trunk.orig/backend/hp3900_sane.c +++ trunk/backend/hp3900_sane.c -@@ -54,6 +54,11 @@ +@@ -53,6 +53,11 @@ #include "hp3900_rts8822.c" @@ -95,7 +95,7 @@ Index: trunk/backend/hp4200.h =================================================================== --- trunk.orig/backend/hp4200.h +++ trunk/backend/hp4200.h -@@ -27,6 +27,10 @@ +@@ -26,6 +26,10 @@ #define min(a, b) (((a) < (b)) ? (a) : (b)) #define max(a, b) (((a) > (b)) ? (a) : (b)) @@ -110,7 +110,7 @@ Index: trunk/backend/hp5400_sane.c =================================================================== --- trunk.orig/backend/hp5400_sane.c +++ trunk/backend/hp5400_sane.c -@@ -88,6 +88,9 @@ +@@ -87,6 +87,9 @@ #define NUM_GAMMA_ENTRIES 65536 @@ -124,7 +124,7 @@ Index: trunk/backend/hpsj5s.c =================================================================== --- trunk.orig/backend/hpsj5s.c +++ trunk/backend/hpsj5s.c -@@ -58,6 +58,9 @@ +@@ -56,6 +56,9 @@ #include <stdio.h> #include <unistd.h> @@ -138,7 +138,7 @@ Index: trunk/backend/leo.c =================================================================== --- trunk.orig/backend/leo.c +++ trunk/backend/leo.c -@@ -78,6 +78,10 @@ +@@ -75,6 +75,10 @@ #include "leo.h" @@ -153,7 +153,7 @@ Index: trunk/backend/lexmark.c =================================================================== --- trunk.orig/backend/lexmark.c +++ trunk/backend/lexmark.c -@@ -47,6 +47,10 @@ +@@ -45,6 +45,10 @@ #include "lexmark.h" @@ -168,7 +168,7 @@ Index: trunk/backend/matsushita.c =================================================================== --- trunk.orig/backend/matsushita.c +++ trunk/backend/matsushita.c -@@ -82,6 +82,10 @@ +@@ -79,6 +79,10 @@ #include "matsushita.h" @@ -196,7 +196,7 @@ Index: trunk/backend/pie.c =================================================================== --- trunk.orig/backend/pie.c +++ trunk/backend/pie.c -@@ -134,8 +134,11 @@ +@@ -132,8 +132,11 @@ #define min(a,b) (((a)<(b))?(a):(b))
#define max(a,b) (((a)>(b))?(a):(b))
@@ -214,7 +214,7 @@ Index: trunk/backend/pieusb.c =================================================================== --- trunk.orig/backend/pieusb.c +++ trunk/backend/pieusb.c -@@ -109,6 +109,10 @@ extern void write_tiff_rgbi_header (FILE +@@ -107,6 +107,10 @@ extern void write_tiff_rgbi_header (FILE #define DBG_info_scan 11 /* information scanner commands */ #define DBG_info_usb 13 /* information usb level functions */ @@ -229,7 +229,7 @@ Index: trunk/backend/plustek-usb.c =================================================================== --- trunk.orig/backend/plustek-usb.c +++ trunk/backend/plustek-usb.c -@@ -119,6 +119,10 @@ static TabDef usbVendors[] = { +@@ -117,6 +117,10 @@ static TabDef usbVendors[] = { /** we use at least 8 megs for scanning... */ #define _SCANBUF_SIZE (8 * 1024 * 1024) @@ -244,7 +244,7 @@ Index: trunk/backend/sceptre.c =================================================================== --- trunk.orig/backend/sceptre.c +++ trunk/backend/sceptre.c -@@ -80,6 +80,10 @@ +@@ -77,6 +77,10 @@ #include "sceptre.h" @@ -259,7 +259,7 @@ Index: trunk/backend/sp15c.c =================================================================== --- trunk.orig/backend/sp15c.c +++ trunk/backend/sp15c.c -@@ -228,6 +228,10 @@ +@@ -225,6 +225,10 @@ #include "sp15c-scsi.h" #include "sp15c.h" @@ -274,7 +274,7 @@ Index: trunk/backend/stv680.c =================================================================== --- trunk.orig/backend/stv680.c +++ trunk/backend/stv680.c -@@ -101,6 +101,10 @@ +@@ -98,6 +98,10 @@ #define TIMEOUT 1000 @@ -289,7 +289,7 @@ Index: trunk/backend/teco1.c =================================================================== --- trunk.orig/backend/teco1.c +++ trunk/backend/teco1.c -@@ -86,6 +86,10 @@ +@@ -83,6 +83,10 @@ #define sanei_scsi_close(a) SANE_STATUS_GOOD #endif @@ -304,7 +304,7 @@ Index: trunk/backend/teco2.c =================================================================== --- trunk.orig/backend/teco2.c +++ trunk/backend/teco2.c -@@ -106,6 +106,10 @@ +@@ -103,6 +103,10 @@ #define sanei_scsi_close(a) SANE_STATUS_GOOD #endif @@ -319,7 +319,7 @@ Index: trunk/backend/teco3.c =================================================================== --- trunk.orig/backend/teco3.c +++ trunk/backend/teco3.c -@@ -78,6 +78,10 @@ +@@ -75,6 +75,10 @@ #include "teco3.h" @@ -334,7 +334,7 @@ Index: trunk/backend/test.c =================================================================== --- trunk.orig/backend/test.c +++ trunk/backend/test.c -@@ -76,6 +76,10 @@ +@@ -74,6 +74,10 @@ #define TEST_CONFIG_FILE "test.conf" diff --git a/debian/patches/0175-fix_tests.patch b/debian/patches/0175-fix_tests.patch new file mode 100644 index 0000000..77f5e03 --- /dev/null +++ b/debian/patches/0175-fix_tests.patch @@ -0,0 +1,96 @@ +Description: Fix test +Author: Jörg Frings-Fürst <debian@jff.email> +Bug: https://gitlab.com/sane-project/backends/-/issues/443 +Last-Update: 2021-02-17 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +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 generated from description files (*.desc) +-# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab ++# by sane-desc 3.6 from sane-backends 1.0.32-debian + # + # 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/html-backends-split.ref +=================================================================== +--- trunk.orig/testsuite/tools/data/html-backends-split.ref ++++ trunk/testsuite/tools/data/html-backends-split.ref +@@ -16496,6 +16496,6 @@ Grandtek Scopecam + >Contact</a> + </address> + <font size=-1> +-This page was created by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab ++This page was created by sane-desc 3.6 from sane-backends 1.0.32-debian + </font> + </body> </html> +Index: trunk/testsuite/tools/data/html-mfgs.ref +=================================================================== +--- trunk.orig/testsuite/tools/data/html-mfgs.ref ++++ trunk/testsuite/tools/data/html-mfgs.ref +@@ -23910,6 +23910,6 @@ qcam<br>(unmaintained) + >Contact</a> + </address> + <font size=-1> +-This page was created by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab ++This page was created by sane-desc 3.6 from sane-backends 1.0.32-debian + </font> + </body> </html> +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 generated from description files (*.desc) +-# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab ++# by sane-desc 3.6 from sane-backends 1.0.32-debian + # + # 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 generated from description files (*.desc) +-# by sane-desc 3.6 from sane-backends 1.0.31-118-g5d3ce7806 ++# by sane-desc 3.6 from sane-backends 1.0.32-debian + # + # 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 generated from description files (*.desc) +-# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab ++# by sane-desc 3.6 from sane-backends 1.0.32-debian + # + # 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 generated from description files (*.desc) +-# by sane-desc 3.6 from sane-backends 1.0.31-118-g5d3ce7806 ++# by sane-desc 3.6 from sane-backends 1.0.32-debian + # + # 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 generated from description files (*.desc) +-# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab ++# by sane-desc 3.6 from sane-backends 1.0.32-debian + # + # 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/0600-scanimage_manpage.patch b/debian/patches/0600-scanimage_manpage.patch index ddf125f..6e8cc23 100644 --- a/debian/patches/0600-scanimage_manpage.patch +++ b/debian/patches/0600-scanimage_manpage.patch @@ -17,5 +17,5 @@ Index: trunk/doc/scanimage.man +Please read the backend documentation first. + Parameters are separated by a blank from single-character options (e.g. - \-d epson) and by a "=" from multi-character options (e.g. \-\-device\-name=epson). - + .BR "\-d epson" ) + and by a "=" from multi-character options (e.g. diff --git a/debian/patches/0605-fix_groff-warnings.patch b/debian/patches/0605-fix_groff-warnings.patch new file mode 100644 index 0000000..9e8ecde --- /dev/null +++ b/debian/patches/0605-fix_groff-warnings.patch @@ -0,0 +1,68 @@ +Description: Fix some groff warnings +Author: Jörg Frings-Fürst <debian@jff.email> +Bug: https://gitlab.com/sane-project/backends/-/issues/433 +Last-Update: 2021-02-17 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/doc/sane-canon_dr.man +=================================================================== +--- trunk.orig/doc/sane-canon_dr.man ++++ trunk/doc/sane-canon_dr.man +@@ -161,7 +161,7 @@ Some scanners pad the upper edge of one + .RE + .PP + .BR NOTE : +-'option' lines may appear multiple times in the configuration file. ++"option" lines may appear multiple times in the configuration file. + They only apply to scanners discovered by the next 'scsi/usb' line. + .PP + +Index: trunk/doc/sane-pixma.man +=================================================================== +--- trunk.orig/doc/sane-pixma.man ++++ trunk/doc/sane-pixma.man +@@ -184,7 +184,7 @@ an up-to-date status at the project home + Users feedback is essential to help improve features and performances. + .SH OPTIONS + Besides "well-known" options (e.g. resolution, mode etc.) +-.Bsane\-pixma ++.B sane\-pixma + backend also + provides the following options, i.e. the options might change in the future. + .br +Index: trunk/doc/sane-scsi.man +=================================================================== +--- trunk.orig/doc/sane-scsi.man ++++ trunk/doc/sane-scsi.man +@@ -122,7 +122,7 @@ $ chmod 660 /dev/sg0 + .RE + .PP + When your system uses the device filesystem (devfs), you have to edit +-.BIR /etc/devfs/perms. ++.BI /etc/devfs/perms. + There you should search the line + .PP + .RS +@@ -172,7 +172,7 @@ If there are no + devices, just do a + .I sh MAKEDEV uk0 + in the +-.i /dev ++.I /dev + directory. The scanner should then be accessible as + .I /dev/uk0 + if it was probed during boot. +Index: trunk/doc/sane-artec_eplus48u.man +=================================================================== +--- trunk.orig/doc/sane-artec_eplus48u.man ++++ trunk/doc/sane-artec_eplus48u.man +@@ -44,8 +44,7 @@ or + You can find it on the installation CD that was provided by the manufacturer, + normally in the directory Win98, WinMe or similar. + If the Windows-driver is installed on your computer, then you can also +-find the firmware file under +-.IR c:\\windows\\system32\\drivers . ++find the firmware file under c:\\windows\\system32\\drivers. + + .SH CONFIGURATION + The contents of the diff --git a/debian/patches/0705-kfreebsd.patch b/debian/patches/0705-kfreebsd.patch index 86f7650..34a510b 100644 --- a/debian/patches/0705-kfreebsd.patch +++ b/debian/patches/0705-kfreebsd.patch @@ -4,7 +4,7 @@ Index: trunk/backend/umax_pp_low.c =================================================================== --- trunk.orig/backend/umax_pp_low.c +++ trunk/backend/umax_pp_low.c -@@ -74,8 +74,10 @@ +@@ -72,8 +72,10 @@ #endif #ifdef HAVE_MACHINE_CPUFUNC_H diff --git a/debian/patches/0725-fix_link_60-libsane_rule.patch b/debian/patches/0725-fix_link_60-libsane_rule.patch index ec851cf..0b424e2 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 -@@ -3651,7 +3651,7 @@ print_udevhwdb_header (void) +@@ -3649,7 +3649,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 f7b7531..8d90078 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,8 @@ 0035-trim-libraries-in-sane-backends.pc.in.patch 0040-remove_git.patch -0100-source_spelling.patch -0125-multiarch_dll_search_path.patch +#0100-source_spelling.patch +#0125-multiarch_dll_search_path.patch +0175-fix_tests.patch 0140-avahi.patch 0145-avahi.patch 0600-scanimage_manpage.patch @@ -11,7 +12,8 @@ 0155-hurd_PATH_MAX.patch 0045-disable_lock_test_at_build_time.patch 0050-Use-python3-shebang.patch -0055-Fix_build_error.patch +#0055-Fix_build_error.patch 0060-cross.patch -0165-respect_local_only_parameter.patch -0170-return_empty_list_when_local_devices_requested.patch +#0165-respect_local_only_parameter.patch +#0170-return_empty_list_when_local_devices_requested.patch +0605-fix_groff-warnings.patch |