From 351cd0bd06151066630dc6938bcf8610936dbdbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 4 Feb 2022 21:08:28 +0100 Subject: Work on new release --- debian/changelog | 4 +- debian/libsane1.lintian-overrides | 6 +- debian/patches/0040-remove_git.patch | 2 +- debian/patches/0100-source_spelling.patch | 91 ++++------------------------ debian/patches/0175-fix_tests.patch | 16 ++--- debian/patches/0605-fix_groff-warnings.patch | 48 --------------- debian/patches/series | 4 +- 7 files changed, 29 insertions(+), 142 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8409fab..1f257eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,9 @@ sane-backends (1.1.1-1) UNRELEASED; urgency=medium * New upstream release. - Remove not longer needed patches: + 0180-gt68xx_fix_use-after-free_two_memleaks.patch - + 0605-fix_groff-warnings.patch - - Refresh patches: + 0600-scanimage_manpage.patch + - Refresh patches: + + 0605-fix_groff-warnings.patch * Add home dir for user/group saned. -- Jörg Frings-Fürst Tue, 05 Oct 2021 11:56:18 +0200 diff --git a/debian/libsane1.lintian-overrides b/debian/libsane1.lintian-overrides index 39bacce..e97ea9a 100644 --- a/debian/libsane1.lintian-overrides +++ b/debian/libsane1.lintian-overrides @@ -1,7 +1,7 @@ # # doc/gt68xx/gt68xx.CHANGES:442:- Added "afe" option for gt68xx.conf for selecting default afe values. # -libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-artec_eplus48u.so.1.0.32 afe safe -libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-canon_dr.so.1.0.32 afe safe -libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-gt68xx.so.1.0.32 afe safe +libsane1: spelling-error-in-binary usr/lib/*/sane/libsane-artec_eplus48u.so.1.1.1 afe safe +libsane1: spelling-error-in-binary usr/lib/*/sane/libsane-canon_dr.so.1.1.1 afe safe +libsane1: spelling-error-in-binary usr/lib/*/sane/libsane-gt68xx.so.1.1.1 afe safe diff --git a/debian/patches/0040-remove_git.patch b/debian/patches/0040-remove_git.patch index 2be7a6e..6cbe5f7 100644 --- a/debian/patches/0040-remove_git.patch +++ b/debian/patches/0040-remove_git.patch @@ -9,4 +9,4 @@ Index: trunk/.tarball-version --- /dev/null +++ trunk/.tarball-version @@ -0,0 +1 @@ -+1.0.32-debian ++1.1.1-debian diff --git a/debian/patches/0100-source_spelling.patch b/debian/patches/0100-source_spelling.patch index 17bde04..eec6798 100644 --- a/debian/patches/0100-source_spelling.patch +++ b/debian/patches/0100-source_spelling.patch @@ -1,84 +1,19 @@ Description: Correct source typos -Author: Jörg Frings-Fürst +Author: Jörg Frings-Fürst Forwarded: not-needed -Last-Update: 2019-04-28 +Last-Update: 2022-02-04 ---- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/doc/sane-epjitsu.man +Index: trunk/backend/epsonds-jpeg.c =================================================================== ---- trunk.orig/doc/sane-epjitsu.man -+++ trunk/doc/sane-epjitsu.man -@@ -42,7 +42,7 @@ Scanners can be specified in the configu - .PP - "usb 0x04c5 0x10c7" (or other vendor/product ids) - .RS --Requests backend to search all usb busses in the system for a device which uses that vendor and product id. The device will then be queried to determine if it is a supported scanner. -+Requests backend to search all usb buses in the system for a device which uses that vendor and product id. The device will then be queried to determine if it is a supported scanner. - .RE - .PP - "usb /dev/usb/scanner0" (or other device file) -Index: trunk/backend/apple.c -=================================================================== ---- trunk.orig/backend/apple.c -+++ trunk/backend/apple.c -@@ -1546,7 +1546,7 @@ init_options (Apple_Scanner * s) - /* Use volt_ref */ - s->opt[OPT_VOLT_REF].name = "volt-ref"; - s->opt[OPT_VOLT_REF].title = "Volt Reference"; -- s->opt[OPT_VOLT_REF].desc ="It's brightness equivalant."; -+ s->opt[OPT_VOLT_REF].desc ="It's brightness equivalent."; - s->opt[OPT_VOLT_REF].type = SANE_TYPE_BOOL; - if (s->hw->ScannerModel!=COLORONESCANNER) - s->opt[OPT_VOLT_REF].cap |= SANE_CAP_INACTIVE; -Index: trunk/tools/umax_pp.c -=================================================================== ---- trunk.orig/tools/umax_pp.c -+++ trunk/tools/umax_pp.c -@@ -374,10 +374,10 @@ main (int argc, char **argv) - if (sanei_umax_pp_initPort (port, name) != 1) - { - if (port) -- fprintf (stderr, "failed to gain direct acces to port 0x%X!\n", -+ fprintf (stderr, "failed to gain direct access to port 0x%X!\n", - port); - else -- fprintf (stderr, "failed to gain acces to device %s!\n", name); -+ fprintf (stderr, "failed to gain access to device %s!\n", name); - return 0; - } - } -Index: trunk/doc/saned.man -=================================================================== ---- trunk.orig/doc/saned.man -+++ trunk/doc/saned.man -@@ -254,7 +254,7 @@ to the systemd journal. The systemd supp - requires compilation with the systemd-devel package - installed on the system. this is the preferred option. +--- trunk.orig/backend/epsonds-jpeg.c ++++ trunk/backend/epsonds-jpeg.c +@@ -194,7 +194,7 @@ void eds_decode_jpeg(epsonds_scanner*s, + } + } + } +- DBG(10,"decodded lines = %d\n", sum); ++ DBG(10,"decoded lines = %d\n", sum); --Saned can be used wih systemd without the systemd integration -+Saned can be used with systemd without the systemd integration - compiled in, but then logging of debug information is not supported. - - The systemd configuration is different for the 2 options, so -Index: trunk/doc/sane-pixma.man -=================================================================== ---- trunk.orig/doc/sane-pixma.man -+++ trunk/doc/sane-pixma.man -@@ -328,7 +328,7 @@ This will cause all further statements i - .IP - - A line that contains - .B auto_detection=no --will cause auto-detection to be skipped. Explicitely defined network scanners will still be probed. -+will cause auto-detection to be skipped. Explicitly defined network scanners will still be probed. - .SH USB SUPPORT - USB scanners will be auto-detected and require no configuration. - .SH NETWORKING SUPPORT -@@ -358,7 +358,7 @@ common subnet for scanning. - .PP - Scanner detection is slightly more complicated. The pixma backend sends - a broadcast on all direct connected subnets it can find (provided your OS --allows for enumeration of all netowrk interfaces). The broadcast is sent FROM -+allows for enumeration of all network interfaces). The broadcast is sent FROM - port 8612 TO port 8610 or 8612 on the broadcast address of each interface. - The outgoing packets will be allowed by the rule described above. - .PP + // abandon unncessary data + if ((JDIMENSION)sum < jpeg_cinfo.output_height) diff --git a/debian/patches/0175-fix_tests.patch b/debian/patches/0175-fix_tests.patch index 77f5e03..612d851 100644 --- a/debian/patches/0175-fix_tests.patch +++ b/debian/patches/0175-fix_tests.patch @@ -11,7 +11,7 @@ Index: 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 ++# by sane-desc 3.6 from sane-backends 1.1.1-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 @@ -24,7 +24,7 @@ Index: trunk/testsuite/tools/data/html-backends-split.ref -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 ++This page was created by sane-desc 3.6 from sane-backends 1.1.1-debian Index: trunk/testsuite/tools/data/html-mfgs.ref @@ -36,7 +36,7 @@ Index: trunk/testsuite/tools/data/html-mfgs.ref -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 ++This page was created by sane-desc 3.6 from sane-backends 1.1.1-debian Index: trunk/testsuite/tools/data/hwdb.ref @@ -46,7 +46,7 @@ Index: 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 ++# by sane-desc 3.6 from sane-backends 1.1.1-debian # # hwdb file for supported USB devices # @@ -57,7 +57,7 @@ Index: 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 ++# by sane-desc 3.6 from sane-backends 1.1.1-debian # # udev rules file for supported USB and SCSI devices # @@ -68,7 +68,7 @@ Index: 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 ++# by sane-desc 3.6 from sane-backends 1.1.1-debian # # udev rules file for supported USB and SCSI devices # @@ -79,7 +79,7 @@ Index: 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 ++# by sane-desc 3.6 from sane-backends 1.1.1-debian # # udev rules file for supported USB and SCSI devices # @@ -90,7 +90,7 @@ Index: 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 ++# by sane-desc 3.6 from sane-backends 1.1.1-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/0605-fix_groff-warnings.patch b/debian/patches/0605-fix_groff-warnings.patch index 9e8ecde..1e0ac17 100644 --- a/debian/patches/0605-fix_groff-warnings.patch +++ b/debian/patches/0605-fix_groff-warnings.patch @@ -4,54 +4,6 @@ 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 diff --git a/debian/patches/series b/debian/patches/series index f167481..8cdd39e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,6 @@ 0035-trim-libraries-in-sane-backends.pc.in.patch 0040-remove_git.patch -#0100-source_spelling.patch +0100-source_spelling.patch #0125-multiarch_dll_search_path.patch 0175-fix_tests.patch 0140-avahi.patch @@ -16,5 +16,5 @@ 0060-cross.patch #0165-respect_local_only_parameter.patch #0170-return_empty_list_when_local_devices_requested.patch -#0605-fix_groff-warnings.patch +0605-fix_groff-warnings.patch #0180-gt68xx_fix_use-after-free_two_memleaks.patch -- cgit v1.2.3