From d1449f66bb265d3fcc891862b2afc90118a4f4f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 19 Sep 2020 17:46:16 +0200 Subject: New d/p/0170-return_empty_list_when_local_devices_requested.patch; fir typos --- debian/changelog | 9 +++++ debian/patches/0100-source_spelling.patch | 2 +- debian/patches/0140-avahi.patch | 2 +- debian/patches/0145-avahi.patch | 2 +- debian/patches/0150-i386-test.patch | 2 +- .../0165-respect_local_only_parameter.patch | 2 +- ...n_empty_list_when_local_devices_requested.patch | 43 ++++++++++++++++++++++ debian/patches/0600-scanimage_manpage.patch | 2 +- debian/patches/0700-mk_reproducible_results.patch | 2 +- debian/patches/series | 1 + 10 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 debian/patches/0170-return_empty_list_when_local_devices_requested.patch diff --git a/debian/changelog b/debian/changelog index 3917c26..49cc640 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +sane-backends (1.0.31-2) UNRELEASED; urgency=medium + + * Upload into unstable. + * New patch: + - debian/patches/0170-return_empty_list_when_local_devices_requested.patch. + * Fix typos in the Forwarded tag in the patch headers. + + -- Jörg Frings-Fürst Sat, 19 Sep 2020 16:53:17 +0200 + sane-backends (1.0.31-1~experimental1) experimental; urgency=medium * New upstream release (Closes: #968949, #962539). diff --git a/debian/patches/0100-source_spelling.patch b/debian/patches/0100-source_spelling.patch index 493c3ae..17bde04 100644 --- a/debian/patches/0100-source_spelling.patch +++ b/debian/patches/0100-source_spelling.patch @@ -1,6 +1,6 @@ Description: Correct source typos Author: Jörg Frings-Fürst -Forwarded: not needed +Forwarded: not-needed Last-Update: 2019-04-28 ---- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ diff --git a/debian/patches/0140-avahi.patch b/debian/patches/0140-avahi.patch index 9c993b0..c424323 100644 --- a/debian/patches/0140-avahi.patch +++ b/debian/patches/0140-avahi.patch @@ -1,7 +1,7 @@ Description: Avoid assertion failure when net_avahi_init failed Author: Andreas Henriksson Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=861112 -Forwarded: not needed +Forwarded: not-needed Last-Update: 2017-06-20 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ diff --git a/debian/patches/0145-avahi.patch b/debian/patches/0145-avahi.patch index 67c874b..d358a41 100644 --- a/debian/patches/0145-avahi.patch +++ b/debian/patches/0145-avahi.patch @@ -1,7 +1,7 @@ Description: scanimage assert failure: *** Error in `scanimage': double free or corruption (top) Author: Laurent Vivier Laurent@vivier.eu Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/sane-backends/+bug/1208091 -Forwarded: not needed +Forwarded: not-needed Last-Update: 2017-06-20 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ diff --git a/debian/patches/0150-i386-test.patch b/debian/patches/0150-i386-test.patch index 864d32a..4c064c5 100644 --- a/debian/patches/0150-i386-test.patch +++ b/debian/patches/0150-i386-test.patch @@ -1,6 +1,6 @@ Description: Disable some tests that fail on i386 Author: Jörg Frings-Fürst -Forwarded: not needed +Forwarded: not-needed Last-Update: 2020-04-01 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ diff --git a/debian/patches/0165-respect_local_only_parameter.patch b/debian/patches/0165-respect_local_only_parameter.patch index 24fd39c..f73a731 100644 --- a/debian/patches/0165-respect_local_only_parameter.patch +++ b/debian/patches/0165-respect_local_only_parameter.patch @@ -2,7 +2,7 @@ Description: respect 'local_only' parameter of sane_get_devices() Author: Barnabás Pőcze Origin: backport, https://gitlab.com/sane-project/backends/-/commit/245564dffe96ddf0fd1c703c48973cd35fddd268 Bug: https://gitlab.com/sane-project/backends/-/merge_requests/502/ -Forwarded: no +Forwarded: no-needed Last-Update: 2020-09-05 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ diff --git a/debian/patches/0170-return_empty_list_when_local_devices_requested.patch b/debian/patches/0170-return_empty_list_when_local_devices_requested.patch new file mode 100644 index 0000000..5d0ba04 --- /dev/null +++ b/debian/patches/0170-return_empty_list_when_local_devices_requested.patch @@ -0,0 +1,43 @@ +Description: eturn_empty_list_when_local_devices_requested +Author: Barnabás Pőcze +Origin: backport, https://gitlab.com/sane-project/backends/-/commit/c946aa5a84297f33b30cddb0c89fcf375ed65d10 +Bug: https://gitlab.com/sane-project/backends/-/merge_requests/506 +Forwarded: not-needed +Last-Update: 2020-09-19 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/backend/dell1600n_net.c +=================================================================== +--- trunk.orig/backend/dell1600n_net.c ++++ trunk/backend/dell1600n_net.c +@@ -233,6 +233,9 @@ static void JpegDecompTermSource (j_deco + /* Results of last call to sane_get_devices */ + static struct DeviceRecord *gKnownDevices[MAX_SCANNERS]; + ++/* Empty list for when network devices are not wanted */ ++static const SANE_Device *gEmptyDeviceList[1]; ++ + /* Array of open scanner device states. + :NOTE: (int)SANE_Handle is an offset into this array */ + static struct ScannerState *gOpenScanners[MAX_SCANNERS]; +@@ -306,15 +309,17 @@ sane_get_devices (const SANE_Device *** + const char *pVal; + int valLen; + ++ if (local_only) { ++ *device_list = gEmptyDeviceList; ++ return SANE_STATUS_GOOD; ++ } ++ + /* init variables */ + ret = SANE_STATUS_GOOD; + sock = 0; + pDevice = NULL; + optYes = 1; + +- if (local_only) +- return ret; +- + InitComBuf (&queryPacket); + + /* clear previous results */ diff --git a/debian/patches/0600-scanimage_manpage.patch b/debian/patches/0600-scanimage_manpage.patch index e163e9c..ddf125f 100644 --- a/debian/patches/0600-scanimage_manpage.patch +++ b/debian/patches/0600-scanimage_manpage.patch @@ -1,7 +1,7 @@ Description: Add remark to options. Author: Jörg Frings-Fürst Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=418630 -Forwarded: not needed +Forwarded: not-needed Last-Update: 2015-01-18 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ diff --git a/debian/patches/0700-mk_reproducible_results.patch b/debian/patches/0700-mk_reproducible_results.patch index 78f9e5b..ac110f8 100644 --- a/debian/patches/0700-mk_reproducible_results.patch +++ b/debian/patches/0700-mk_reproducible_results.patch @@ -1,6 +1,6 @@ Description: Make build reproducible. Author: Jörg Frings-Fürst -Forwarded: not needed +Forwarded: not-needed Last-Update: 2019-08-11 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ diff --git a/debian/patches/series b/debian/patches/series index d79cdd7..8426d8a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,3 +17,4 @@ 0055-Fix_build_error.patch 0060-cross.patch 0165-respect_local_only_parameter.patch +0170-return_empty_list_when_local_devices_requested.patch -- cgit v1.2.3 From d86953610d5eb3e74c39255d8c7bd614bdbed109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 19 Sep 2020 18:18:51 +0200 Subject: Remove not longer needed patches from debian/patches --- debian/changelog | 4 + debian/control | 2 +- debian/patches/0160-big_endian.patch | 16 --- debian/patches/0700-mk_reproducible_results.patch | 155 ---------------------- debian/patches/0715-20-sane.hwdb_multi-arch.patch | 46 ------- debian/patches/series | 3 - 6 files changed, 5 insertions(+), 221 deletions(-) delete mode 100644 debian/patches/0160-big_endian.patch delete mode 100644 debian/patches/0700-mk_reproducible_results.patch delete mode 100644 debian/patches/0715-20-sane.hwdb_multi-arch.patch diff --git a/debian/changelog b/debian/changelog index 49cc640..a30f5f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ sane-backends (1.0.31-2) UNRELEASED; urgency=medium * Upload into unstable. * New patch: - debian/patches/0170-return_empty_list_when_local_devices_requested.patch. + * Remove not longer needed patches from debian/patches: + - 0160-big_endian.patch + - 0700-mk_reproducible_results.patch + - 0715-20-sane.hwdb_multi-arch.patch * Fix typos in the Forwarded tag in the patch headers. -- Jörg Frings-Fürst Sat, 19 Sep 2020 16:53:17 +0200 diff --git a/debian/control b/debian/control index b5e3f42..fb8b9f8 100644 --- a/debian/control +++ b/debian/control @@ -96,7 +96,7 @@ Depends: udev [linux-any], ${misc:Depends}, ${shlibs:Depends} -Recommends: +Recommends: sane-utils (>= ${binary:Version}), ipp-usb Suggests: avahi-daemon, hplip diff --git a/debian/patches/0160-big_endian.patch b/debian/patches/0160-big_endian.patch deleted file mode 100644 index 234088d..0000000 --- a/debian/patches/0160-big_endian.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Use depth from session -Author: Jörg Frings-Fürst -Last-Update: 2020-04-01 -Index: trunk/backend/genesys/low.cpp -=================================================================== ---- trunk.orig/backend/genesys/low.cpp -+++ trunk/backend/genesys/low.cpp -@@ -539,7 +539,7 @@ Image read_unshuffled_image_from_scanner - } - - #ifdef WORDS_BIGENDIAN -- if (depth == 16) { -+ if (session.params.depth == 16) { - dev->pipeline.push_node(); - } - #endif diff --git a/debian/patches/0700-mk_reproducible_results.patch b/debian/patches/0700-mk_reproducible_results.patch deleted file mode 100644 index ac110f8..0000000 --- a/debian/patches/0700-mk_reproducible_results.patch +++ /dev/null @@ -1,155 +0,0 @@ -Description: Make build reproducible. -Author: Jörg Frings-Fürst -Forwarded: not-needed -Last-Update: 2019-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 -@@ -2816,8 +2816,10 @@ html_print_footer (void) - "
\n" - "Contact\n" "
\n" "\n"); -- printf ("This page was last updated on %s by sane-desc %s from %s\n", -- asctime (localtime (¤t_time)), SANE_DESC_VERSION, PACKAGE_STRING); -+/* printf ("This page was last updated on %s by sane-desc %s from %s\n", -+ asctime (localtime (¤t_time)), SANE_DESC_VERSION, PACKAGE_STRING); */ -+ printf ("This page was last updated by sane-desc %s from %s\n", -+ SANE_DESC_VERSION, PACKAGE_STRING); - printf ("\n"); - printf (" \n"); - } -@@ -3463,8 +3465,8 @@ print_udev_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" -@@ -3656,8 +3658,8 @@ print_udevhwdb_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/html-backends-split.ref -=================================================================== ---- trunk.orig/testsuite/tools/data/html-backends-split.ref -+++ trunk/testsuite/tools/data/html-backends-split.ref -@@ -16496,7 +16496,6 @@ Grandtek Scopecam - >Contact - - --This page was last updated on Wed Jul 31 07:52:48 2013 -- by sane-desc 3.5 from sane-backends 1.0.24git -+This page was last updated by sane-desc 3.5 from sane-backends 1.0.29-debian - - -Index: trunk/testsuite/tools/data/html-mfgs.ref -=================================================================== ---- trunk.orig/testsuite/tools/data/html-mfgs.ref -+++ trunk/testsuite/tools/data/html-mfgs.ref -@@ -23910,7 +23910,6 @@ qcam
(unmaintained) - >Contact - - --This page was last updated on Wed Jul 31 07:52:48 2013 -- by sane-desc 3.5 from sane-backends 1.0.24git -+This page was last updated by sane-desc 3.5 from sane-backends 1.0.29-debian - - -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.29-debian - # - # udev rules file for supported USB and SCSI 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.29-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 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.29-debian - # - # udev rules file for supported USB and SCSI devices - # -Index: trunk/doc/Makefile.am -=================================================================== ---- trunk.orig/doc/Makefile.am -+++ trunk/doc/Makefile.am -@@ -279,11 +279,11 @@ sane.ind: $(API_SPEC_INPUTS) - - sane.dvi: $(API_SPEC_INPUTS) $(API_SPEC_EPS_FIGS) sane.ind - @echo Generating $@ from $<... -- @$(am_TEXINPUTS) $(LATEX) $< /dev/null -+ @$(am_TEXINPUTS) $(LATEX) --output-comment="" $< /dev/null - - sane.ps: sane.dvi - @echo Generating $@ from $<... -- @$(am_TEXINPUTS) $(DVIPS) -q $< -o $@ -+ @$(am_TEXINPUTS) $(DVIPS) -q -N $< -o $@ - - .fig.pdf: - @test -d $(@D) || $(MKDIR_P) $(@D) -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.29-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/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.29-debian - # - # hwdb file for supported USB 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.29-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/0715-20-sane.hwdb_multi-arch.patch b/debian/patches/0715-20-sane.hwdb_multi-arch.patch deleted file mode 100644 index e590649..0000000 --- a/debian/patches/0715-20-sane.hwdb_multi-arch.patch +++ /dev/null @@ -1,46 +0,0 @@ -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-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 -@@ -3328,10 +3328,10 @@ print_usermap_header (void) - - printf - ("# This file was automatically created based on description files (*.desc)\n" -- "# by sane-desc %s from %s on %s" -+ "# by sane-desc %s from %s\n" - "#\n" - , -- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time))); -+ SANE_DESC_VERSION, PACKAGE_STRING); - - printf - ("# The entries below are used to detect a USB device and change owner\n" -@@ -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" -- "# 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" - "# The entries below are used to detect a USB device when it's plugged in\n" -@@ -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" -- "# 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" diff --git a/debian/patches/series b/debian/patches/series index 8426d8a..f7b7531 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,13 +5,10 @@ 0140-avahi.patch 0145-avahi.patch 0600-scanimage_manpage.patch -#0700-mk_reproducible_results.patch 0705-kfreebsd.patch -#0715-20-sane.hwdb_multi-arch.patch 0725-fix_link_60-libsane_rule.patch 0150-i386-test.patch 0155-hurd_PATH_MAX.patch -#0160-big_endian.patch 0045-disable_lock_test_at_build_time.patch 0050-Use-python3-shebang.patch 0055-Fix_build_error.patch -- cgit v1.2.3 From 3b6a319674ced4ee3d588eb41244e7a6bb1df876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 20 Sep 2020 10:06:15 +0200 Subject: d/u/metadata: Change to gitlab --- debian/changelog | 2 ++ debian/upstream/metadata | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index a30f5f8..e2cdf80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ sane-backends (1.0.31-2) UNRELEASED; urgency=medium - 0700-mk_reproducible_results.patch - 0715-20-sane.hwdb_multi-arch.patch * Fix typos in the Forwarded tag in the patch headers. + * debian/upstream/metadata: + - Change to gitlab. -- Jörg Frings-Fürst Sat, 19 Sep 2020 16:53:17 +0200 diff --git a/debian/upstream/metadata b/debian/upstream/metadata index 7d5095f..3fd33d0 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -1,6 +1,6 @@ -Bug-Database: https://alioth.debian.org/tracker/?atid=410366&group_id=30186&func=browse -Bug-Submit: https://alioth.debian.org/tracker/?func=add&group_id=30186&atid=410366 +Bug-Database: https://gitlab.com/sane-project/backends/-/issues +Bug-Submit: https://gitlab.com/sane-project/backends/-/issues/new?issue%5Bassignee_id%5D=&issue%5Bmilestone_id%5D= Contact: http://sane-project.org/mailing-lists.html Name: sane-backends -Repository: git://git.debian.org/sane/sane-backends.git -Repository-Browse: http://git.debian.org/?p=sane/sane-backends.git +Repository: https://gitlab.com/sane-project/backends.git +Repository-Browse: https://gitlab.com/sane-project/backends/-/tree/master -- cgit v1.2.3 From bee56be23c98b5324b7897612a9fa9742fae82de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 20 Sep 2020 10:46:40 +0200 Subject: d/changelog: Change distribution to unstable, Change date and time; close bug --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e2cdf80..f178c47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -sane-backends (1.0.31-2) UNRELEASED; urgency=medium +sane-backends (1.0.31-2) unstable; urgency=medium - * Upload into unstable. + * Upload into unstable (Closes: #969592). * New patch: - debian/patches/0170-return_empty_list_when_local_devices_requested.patch. * Remove not longer needed patches from debian/patches: @@ -11,7 +11,7 @@ sane-backends (1.0.31-2) UNRELEASED; urgency=medium * debian/upstream/metadata: - Change to gitlab. - -- Jörg Frings-Fürst Sat, 19 Sep 2020 16:53:17 +0200 + -- Jörg Frings-Fürst Sun, 20 Sep 2020 10:45:16 +0200 sane-backends (1.0.31-1~experimental1) experimental; urgency=medium -- cgit v1.2.3 From c8ad32f887472f2e0be3fd24a9e94be82f11a5c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 27 Sep 2020 12:48:48 +0200 Subject: Fix some trailing whitespaces / blank lines --- debian/TROUBLESHOOTING.Debian | 12 ++++++------ debian/copyright | 28 ++++++++++++++-------------- debian/po/fi.po | 1 - debian/po/ja.po | 2 +- debian/sane-utils.postrm | 4 ++-- 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/debian/TROUBLESHOOTING.Debian b/debian/TROUBLESHOOTING.Debian index 423d9e8..f96469f 100644 --- a/debian/TROUBLESHOOTING.Debian +++ b/debian/TROUBLESHOOTING.Debian @@ -9,21 +9,21 @@ If you get this error meessage you can try echo -e "\nblacklist usblp" >> /etc/modprobe.d/blacklist.conf -and reboot. After that your scanner can used. +and reboot. After that your scanner can used. -REMARK: Sometimes usblp is used to access your printer. +REMARK: Sometimes usblp is used to access your printer. 2.) ACL: device file system does not support ACLs From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=789593 -The file /etc/udev/rules.d/99-libsane1.rules uses the command "/bin/setfacl -m g:scanner:rw +The file /etc/udev/rules.d/99-libsane1.rules uses the command "/bin/setfacl -m g:scanner:rw $env{DEVNAME}" to add the "scanner" group with rw access to the device permissions. -In my case, with /dev on an ext4 filesystem with no ACL support enabled in the kernel, setfacl -returns "Operation not supported". I assume this is because it's trying to add a group, which is not +In my case, with /dev on an ext4 filesystem with no ACL support enabled in the kernel, setfacl +returns "Operation not supported". I assume this is because it's trying to add a group, which is not possible in its fallback mode of traditional Unix-style file permissions. -As a workaround, I have substituted "/bin/chown root:scanner $env{DEVNAME}" as the command at the +As a workaround, I have substituted "/bin/chown root:scanner $env{DEVNAME}" as the command at the end of 99-libsane1.rules (an alternative would be to use a UDEV rule element to change the ownership). diff --git a/debian/copyright b/debian/copyright index 9d9458a..6d5dc77 100644 --- a/debian/copyright +++ b/debian/copyright @@ -70,7 +70,7 @@ Copyright: 1997 BYTEC GmbH Germany License: GPL-2+ with sane exception Files: backend/canon630u.c -Copyright: 2002 Nathan Rutman +Copyright: 2002 Nathan Rutman 2001 Marcio Luis Teixeira 1996-1997 Andreas Beck 2000-2001 Michael Herder @@ -232,7 +232,7 @@ License: GPL-2+ with sane exception Files: backend/gt68xx_generic.h backend/gt68xx_gt6801.h backend/gt68xx_gt6816.h - backend/gt68xx_mid.h + backend/gt68xx_mid.h backend/gt68xx_shm_channel.* Copyright: 2002 Sergey Vlasov License: GPL-2+ with sane exception @@ -289,7 +289,7 @@ License: GPL-2+ Files: backend/kvs1025.c backend/kvs20xx*.* - backend/kvs40xx.c + backend/kvs40xx.c backend/kvs40xx_*.c Copyright: 2008 Panasonic Russia Ltd. 2010-2011 m. allan noah @@ -302,7 +302,7 @@ Copyright: 2008 Panasonic Russia Ltd. License: GPL-2+ Files: backend/leo.* - backend/matsushita.* + backend/matsushita.* backend/sceptre.* backend/teco1.* backend/teco3.* @@ -478,7 +478,7 @@ Files: backend/plustek-pp_dac.c backend/plustek-usbhw.c backend/plustek-usbimg.c backend/plustek-usbio.c - backend/plustek-usbmap.c + backend/plustek-usbmap.c backend/plustek-usbscan.c backend/plustek-usbshading.c Copyright: 1998 Plustek Inc. @@ -560,7 +560,7 @@ License: GPL-2+ with sane exception Files: backend/snapscan-options.c Copyright: 1997-2013 Franck Schnefra 1997-2013 Michel Roelofs - 1997-2013 Emmanuel Blot + 1997-2013 Emmanuel Blot 1997-2013 Mikko Tyolajarvi 1997-2013 David Mosberger-Tang 1997-2013 Wolfgang Goeller @@ -576,7 +576,7 @@ License: GPL-2+ with sane exception Files: backend/snapscan-scsi.c Copyright: 1997-2013 Franck Schnefra 1997-2013 Michel Roelofs - 1997-2013 Emmanuel Blot + 1997-2013 Emmanuel Blot 1997-2013 Mikko Tyolajarvi 1997-2013 David Mosberger-Tang 1997-2013 Wolfgang Goeller @@ -593,7 +593,7 @@ License: GPL-2+ with sane exception Files: backend/snapscan-sources.c Copyright: 1997-2013 Franck Schnefra 1997-2013 Michel Roelofs - 1997-2013 Emmanuel Blot + 1997-2013 Emmanuel Blot 1997-2013 Mikko Tyolajarvi 1997-2013 David Mosberger-Tang 1997-2013 Wolfgang Goeller @@ -608,13 +608,13 @@ License: GPL-2+ with sane exception Files: backend/snapscan-sources.h backend/snapscan-usb.* -Copyright: 2000 Henrik Johansson +Copyright: 2000 Henrik Johansson License: GPL-2+ with sane exception Files: backend/snapscan.c Copyright: 1997-2013 Franck Schnefra 1997-2013 Michel Roelofs - 1997-2013 Emmanuel Blot + 1997-2013 Emmanuel Blot 1997-2013 Mikko Tyolajarvi 1997-2013 David Mosberger-Tang 1997-2013 Wolfgang Goeller @@ -632,7 +632,7 @@ License: GPL-2+ with sane exception Files: backend/snapscan.h Copyright: 1997-2013 Franck Schnefra 1997-2013 Michel Roelofs - 1997-2013 Emmanuel Blot + 1997-2013 Emmanuel Blot 1997-2013 Mikko Tyolajarvi 1997-2013 David Mosberger-Tang 1997-2013 Wolfgang Goeller @@ -866,7 +866,7 @@ Files: sanei/sanei_usb.c Copyright: 2001-2005 Henning Meier-Geinitz 2001 Frank Zago 2003 Rene Rebe - 2005 Paul Smedley + 2005 Paul Smedley 2008 m. allan noah 2009 Julien BLACHE 2011 Reinhold Kainhofer @@ -903,8 +903,8 @@ License: GPL-2+ Files: tools/sane-desc.c Copyright: 2002-2006 Henning Meier-Geinitz - 2004 Jose Gato - 2006 Mattias Ellert + 2004 Jose Gato + 2006 Mattias Ellert 2009 Dr. Ing. Dieter Jurzitza 2013 Tom Gundersen License: GPL-2+ diff --git a/debian/po/fi.po b/debian/po/fi.po index 00109fa..023d88d 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -112,4 +112,3 @@ msgstr "" "Valitse tämä vaihtoehto, jos kaikki kuvanlukijat halutaan asettaa " "käytettäväksi " "verkon yli ilman rajoituksia." - diff --git a/debian/po/ja.po b/debian/po/ja.po index 137be61..a6784fc 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -1,5 +1,5 @@ # Copyright (C) 2008-2009 Julien BLACHE -# as sane-backends Debian package's copyright holder. +# as sane-backends Debian package's copyright holder. # This file is distributed under the same license as the sane-backends package. # Hideki Yamane (Debian-JP) , 2008-2010. # diff --git a/debian/sane-utils.postrm b/debian/sane-utils.postrm index 047cd06..288b511 100644 --- a/debian/sane-utils.postrm +++ b/debian/sane-utils.postrm @@ -2,7 +2,7 @@ set -e # -# set -e are disabled because pathfind update-inetd +# set -e are disabled because pathfind update-inetd # gives an piuparts error. # @@ -49,4 +49,4 @@ fi #DEBHELPER# -exit 0 \ No newline at end of file +exit 0 -- cgit v1.2.3 From 3fdbe97ab211b182bb90291b8e8a2493509b6361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 27 Sep 2020 12:55:33 +0200 Subject: Fix some trailing whitespaces / blank lines part 2 --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f178c47..1fca52f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,9 @@ sane-backends (1.0.31-2) unstable; urgency=medium * Fix typos in the Forwarded tag in the patch headers. * debian/upstream/metadata: - Change to gitlab. + * Fix some trailing whitespaces / blank lines. - -- Jörg Frings-Fürst Sun, 20 Sep 2020 10:45:16 +0200 + -- Jörg Frings-Fürst Sun, 27 Sep 2020 12:48:58 +0200 sane-backends (1.0.31-1~experimental1) experimental; urgency=medium -- cgit v1.2.3 From 73658865650dbe56bcc105bc07c5a39957dfa58c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 27 Sep 2020 13:39:14 +0200 Subject: Fix some trailing whitespaces / blank lines part 3 --- debian/TROUBLESHOOTING.Debian | 2 +- debian/changelog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/TROUBLESHOOTING.Debian b/debian/TROUBLESHOOTING.Debian index f96469f..85b7868 100644 --- a/debian/TROUBLESHOOTING.Debian +++ b/debian/TROUBLESHOOTING.Debian @@ -7,7 +7,7 @@ If you get this error meessage you can try - echo -e "\nblacklist usblp" >> /etc/modprobe.d/blacklist.conf + echo -e "\nblacklist usblp" >> /etc/modprobe.d/blacklist.conf and reboot. After that your scanner can used. diff --git a/debian/changelog b/debian/changelog index 1fca52f..32b0aa4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,7 @@ sane-backends (1.0.31-2) unstable; urgency=medium - Change to gitlab. * Fix some trailing whitespaces / blank lines. - -- Jörg Frings-Fürst Sun, 27 Sep 2020 12:48:58 +0200 + -- Jörg Frings-Fürst Sun, 27 Sep 2020 13:38:48 +0200 sane-backends (1.0.31-1~experimental1) experimental; urgency=medium -- cgit v1.2.3