diff options
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/copyright | 58 | ||||
| -rw-r--r-- | debian/libsane-common.lintian-overrides | 10 | ||||
| -rw-r--r-- | debian/libsane1.lintian-overrides | 6 | ||||
| -rw-r--r-- | debian/patches/0100-source_spelling.patch | 164 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
6 files changed, 46 insertions, 199 deletions
diff --git a/debian/changelog b/debian/changelog index b9bac36..e9a919c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,16 @@ sane-backends (1.0.28-1~experimental1) experimental; urgency=medium * New upstream release. - - New debian/patches/0040-remove_git.patch to remove git access at build time. + - New debian/patches/0040-remove_git.patch to remove git access at + build time. - Refresh patches: + debian/patches/0700-mk_reproducible_results.patch. + debian/patches/0710-sane-desc.c_debian_mods.patch. + debian/patches/0715-20-sane.hwdb_multi-arch.patch. + debian/patches/0725-fix_link_60-libsane_rule.patch. + + debian/patches/0100-source_spelling.patch. - Refresh symbols file. + - Refresh lintian overrides. * debian/rules: - Add --exclude=/sane/ to override_dh_makeshlibs-arch to generate only public symbols (Closes: #911597). diff --git a/debian/copyright b/debian/copyright index 02a4702..9ce5455 100644 --- a/debian/copyright +++ b/debian/copyright @@ -156,17 +156,6 @@ Copyright: 2000 Randolph Bentson 2003-2016 m. allan noah License: GPL-2+ with sane exception -Files: backend/genesys.c -Copyright: 2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de> - 2004-2005 Gerhard Jaeger <gerhard@gjaeger.de> - 2004-2013 Stéphane Voltz <stef.dev@free.fr> - 2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org> - 2006 Laurent Charpentier <laurent_pubs@yahoo.com> - 2007 Luke <iceyfor@gmail.com> - 2010 Chris Berry <s0457957@sms.ed.ac.uk> - 2010 Michael Rickmann <mrickma@gwdg.de> -License: GPL-2+ with sane exception - Files: backend/genesys.h Copyright: 2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de> 2004-2005 Gerhard Jaeger <gerhard@gjaeger.de> @@ -174,34 +163,11 @@ Copyright: 2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de> 2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org> License: GPL-2+ with sane exception -Files: backend/genesys_conv.c -Copyright: 2010-2013 Stéphane Voltz <stef.dev@free.fr> - 2005-2006 Pierre Willenbrock <pierre@pirsoft.dnsalias.org> -License: GPL-2+ with sane exception - -Files: backend/genesys_conv_hlp.c -Copyright: 2005 Pierre Willenbrock <pierre@pirsoft.dnsalias.org> -License: GPL-2+ with sane exception - -Files: backend/genesys_devices.c -Copyright: 2003 Oliver Rauch - 2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de> - 2004-2005 Gerhard Jaeger <gerhard@gjaeger.de> - 2004-2013 Stéphane Voltz <stef.dev@free.fr> - 2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org> - 2007 Luke <iceyfor@gmail.com> - 2010 Jack McGill <jmcgill85258@yahoo.com> - 2010 Andrey Loginov <avloginov@gmail.com>, - 2010 Chris Berry <s0457957@sms.ed.ac.uk> - 2010 Michael Rickmann <mrickma@gwdg.de> -License: GPL-2+ with sane exception - Files: backend/genesys_gl124.* backend/genesys_gl841.h backend/genesys_gl843.* backend/genesys_gl846.* backend/genesys_gl847.* - backend/genesys_low.c backend/rts88*.* backend/umax_pp*.* Copyright: 2010-2016 Stéphane Voltz <stef.dev@free.fr> @@ -215,16 +181,6 @@ Files: backend/genesys_error.cc Copyright: 2019 Povilas Kanapickas <povilas@radix.lt> License: GPL-2+ with sane exception -Files: backend/genesys_gl646.c -Copyright: 2003 Oliver Rauch - 2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de> - 2004 Gerhard Jaeger <gerhard@gjaeger.de> - 2004-2013 Stéphane Voltz <stef.dev@free.fr> - 2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org> - 2007 Luke <iceyfor@gmail.com> - 2011 Alexey Osipov <simba@lerlan.ru> -License: GPL-2+ with sane exception - Files: backend/genesys_gl646.h Copyright: 2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de> 2004 Gerhard Jaeger <gerhard@gjaeger.de> @@ -232,18 +188,6 @@ Copyright: 2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de> 2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org> License: GPL-2+ with sane exception -Files: backend/genesys_gl841.c -Copyright: 2003 Oliver Rauch - 2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de> - 2004 Gerhard Jaeger <gerhard@gjaeger.de> - 2004-2013 Stéphane Voltz <stef.dev@free.fr> - 2005 Philipp Schmid <philipp8288@web.de> - 2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org> - 2006 Laurent Charpentier <laurent_pubs@yahoo.com> - 2010 Chris Berry <s0457957@sms.ed.ac.uk> - 2010 Michael Rickmann <mrickma@gwdg.de> -License: GPL-2+ with sane exception - Files: backend/genesys_low.h Copyright: 2003 Oliver Rauch 2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de> @@ -753,7 +697,7 @@ License: GPL-2+ with sane exception Files: backend/xerox_mfp-tcp.c Copyright: 2010 Alexander Kuznetsov <acca@cpan.org> -License: +License: GPL-2+ with sane exception Files: backend/xerox_mfp-usb.c backend/xerox_mfp.* diff --git a/debian/libsane-common.lintian-overrides b/debian/libsane-common.lintian-overrides index 1386138..0a1a9f4 100644 --- a/debian/libsane-common.lintian-overrides +++ b/debian/libsane-common.lintian-overrides @@ -4,3 +4,13 @@ libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-gt68xx.5.gz afe safe libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-gt68xx.5.gz afe safe libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-gt68xx.5.gz afe safe + +# +# See bug #934452 +# +libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-canon_dr.5.gz busses buses +libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-canon_dr.5.gz busses buses +libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-cardscan.5.gz busses buses +libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-fujitsu.5.gz busses buses +libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-fujitsu.5.gz busses buses +libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-kodak.5.gz busses buses diff --git a/debian/libsane1.lintian-overrides b/debian/libsane1.lintian-overrides index 125b615..5805464 100644 --- a/debian/libsane1.lintian-overrides +++ b/debian/libsane1.lintian-overrides @@ -1,6 +1,6 @@ # # 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.27 afe safe -libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-canon_dr.so.1.0.27 afe safe -libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-gt68xx.so.1.0.27 afe safe +libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-artec_eplus48u.so.1.0.28 afe safe +libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-canon_dr.so.1.0.28 afe safe +libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-gt68xx.so.1.0.28 afe safe diff --git a/debian/patches/0100-source_spelling.patch b/debian/patches/0100-source_spelling.patch index 7e638f2..cc8e6b6 100644 --- a/debian/patches/0100-source_spelling.patch +++ b/debian/patches/0100-source_spelling.patch @@ -3,94 +3,6 @@ Author: Jörg Frings-Fürst <debian@jff-webhosting.net> Last-Update: 2019-04-28 ---- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/backend/pixma_bjnp.c -=================================================================== ---- trunk.orig/backend/pixma_bjnp.c -+++ trunk/backend/pixma_bjnp.c -@@ -1829,7 +1829,7 @@ static void add_scanner(SANE_Int *dev_no - - attach_bjnp (uri, makemodel, - serial, pixma_devices); -- PDBG (bjnp_dbg (LOG_NOTICE, "add_scanner: New scanner added: %s, serial %s, mac addres: %s.\n", -+ PDBG (bjnp_dbg (LOG_NOTICE, "add_scanner: New scanner added: %s, serial %s, mac address: %s.\n", - uri, serial, device[*dev_no].mac_address)); - } - break; -Index: trunk/doc/sane-pixma.man -=================================================================== ---- trunk.orig/doc/sane-pixma.man -+++ trunk/doc/sane-pixma.man -@@ -232,7 +232,7 @@ interfaces (i.e. it does not support the - to add your scanner here as well. - .RS - .PP --.I Scanners shall be listed in the configuraton file as follows: -+.I Scanners shall be listed in the configuration file as follows: - .PP - .RS - .I <method>://<host>[:port][/timeout=<value>] -@@ -253,7 +253,7 @@ bjnp-timeout parameter. The value is in - .PP - Define scanners each on a new line. - .PP --More globally applicable tinmeouts can be set using the bjnp-timeout parameter as folllows: -+More globally applicable tinmeouts can be set using the bjnp-timeout parameter as follows: - .PP - .RS - .I bjnp-timeout=<value> -@@ -263,7 +263,7 @@ A timeout defined using bjnp-timeout wil - in the file. If required the bjnp-timeout setting - can be defined multiple times, where each settng will apply only to the scanners that - follow the setting. The last setting is used for the auto discovered scanners. --If not explicitely set, the default 1000ms setting will apply. -+If not explicitly set, the default 1000ms setting will apply. - .PP - Setting timeouts should only be required in exceptional cases. - .PP -@@ -288,7 +288,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 -Index: trunk/doc/sane-canon_dr.man -=================================================================== ---- trunk.orig/doc/sane-canon_dr.man -+++ trunk/doc/sane-canon_dr.man -@@ -105,7 +105,7 @@ Scanners can be specified in the configu - .PP - "scsi CANON DR" - .RS --Requests backend to search all scsi busses in the system for a device -+Requests backend to search all scsi buses in the system for a device - which reports itself to be a scanner made by 'CANON', with a model name - starting with 'DR'. - .RE -@@ -119,7 +119,7 @@ specify one. Probably should not be used - .PP - "usb 0x04a9 0x1603" (or other vendor/product ids) - .RS --Requests backend to search all usb busses in the system for a device -+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 Canon scanner. - .RE -Index: trunk/doc/sane-cardscan.man -=================================================================== ---- trunk.orig/doc/sane-cardscan.man -+++ trunk/doc/sane-cardscan.man -@@ -37,7 +37,7 @@ Scanners can be specified in the configu - .PP - "usb 0x04c5 0x1042" (or other vendor/product ids) - .RS --Requests backend to search all usb busses in the system for a device -+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 cardscan scanner. - .RE Index: trunk/doc/sane-epjitsu.man =================================================================== --- trunk.orig/doc/sane-epjitsu.man @@ -104,54 +16,6 @@ Index: trunk/doc/sane-epjitsu.man .RE .PP "usb /dev/usb/scanner0" (or other device file) -Index: trunk/doc/sane-fujitsu.man -=================================================================== ---- trunk.orig/doc/sane-fujitsu.man -+++ trunk/doc/sane-fujitsu.man -@@ -109,7 +109,7 @@ Scanners can be specified in the configu - .PP - "scsi FUJITSU" - .RS --Requests backend to search all scsi busses in the system for a device -+Requests backend to search all scsi buses in the system for a device - which reports itself to be a scanner made by 'FUJITSU'. - .RE - .PP -@@ -122,7 +122,7 @@ specify one. Probably should not be used - .PP - "usb 0x04c5 0x1042" (or other vendor/product ids) - .RS --Requests backend to search all usb busses in the system for a device -+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 Fujitsu scanner. - .RE -Index: trunk/doc/saned.man -=================================================================== ---- trunk.orig/doc/saned.man -+++ trunk/doc/saned.man -@@ -220,7 +220,7 @@ to the systemd journal. The systemd supp - requires compilation with the systemd-devel package - installed on the system. this is the preferred option. - --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-kodak.man -=================================================================== ---- trunk.orig/doc/sane-kodak.man -+++ trunk/doc/sane-kodak.man -@@ -77,7 +77,7 @@ Scanners can be specified in the configu - .PP - "scsi KODAK" - .RS --Requests backend to search all scsi busses in the system for a device -+Requests backend to search all scsi buses in the system for a device - which reports itself to be a scanner made by 'KODAK'. - .RE - .PP Index: trunk/backend/apple.c =================================================================== --- trunk.orig/backend/apple.c @@ -169,7 +33,7 @@ Index: trunk/tools/umax_pp.c =================================================================== --- trunk.orig/tools/umax_pp.c +++ trunk/tools/umax_pp.c -@@ -370,10 +370,10 @@ main (int argc, char **argv) +@@ -374,10 +374,10 @@ main (int argc, char **argv) if (sanei_umax_pp_initPort (port, name) != 1) { if (port) @@ -182,3 +46,29 @@ Index: trunk/tools/umax_pp.c 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. + +-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 +@@ -308,7 +308,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 diff --git a/debian/patches/series b/debian/patches/series index cb9993e..e99d249 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,7 +6,7 @@ #0030-ppc64el.patch 0040-remove_git.patch 0035-trim-libraries-in-sane-backends.pc.in.patch -#0100-source_spelling.patch +0100-source_spelling.patch #0105-hp3900.patch #0110-dll_backend_conf.patch #0115-license_typo.patch |