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