From e8caf943d5b1cf76821c2e428e964a8030c0da98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 18 Jan 2015 18:50:32 +0100 Subject: some changes at TROUBLESHOOTING.Debian, add remark to scanimage manpage --- debian/TROUBLESHOOTING.Debian | 13 +++++++++++++ debian/changelog | 2 ++ debian/libsane.TROUBLESHOOTING.debian | 13 ------------- debian/libsane.docs | 2 +- debian/patches/001-scanimage_manpage.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + 6 files changed, 38 insertions(+), 14 deletions(-) create mode 100644 debian/TROUBLESHOOTING.Debian delete mode 100644 debian/libsane.TROUBLESHOOTING.debian create mode 100644 debian/patches/001-scanimage_manpage.patch diff --git a/debian/TROUBLESHOOTING.Debian b/debian/TROUBLESHOOTING.Debian new file mode 100644 index 0000000..917cfc6 --- /dev/null +++ b/debian/TROUBLESHOOTING.Debian @@ -0,0 +1,13 @@ + +1.) usbfs: interface 1 claimed by usblp while ‘scanimage’ sets config #1 + + +1.) usbfs: interface 1 claimed by usblp while ‘scanimage’ sets config #1 + +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. + +REMARK: Sometimes usblp is used to access your printer. diff --git a/debian/changelog b/debian/changelog index ed45dd4..d7a210b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ sane-backends (1.0.24-10) UNRELEASED; urgency=medium - Add part for "usbfs: interface 1 claimed by usblp while ‘scanimage’ sets config #1 (Closes: #726588). * Add link to TROUBLESHOOTING.debian into debian/README.debian. + * New debian/patches/001-scanimage_manpage.patch: + - Add remark for parameter to manpage (Closes: #418630). -- Jörg Frings-Fürst Sun, 18 Jan 2015 11:46:18 +0100 diff --git a/debian/libsane.TROUBLESHOOTING.debian b/debian/libsane.TROUBLESHOOTING.debian deleted file mode 100644 index 917cfc6..0000000 --- a/debian/libsane.TROUBLESHOOTING.debian +++ /dev/null @@ -1,13 +0,0 @@ - -1.) usbfs: interface 1 claimed by usblp while ‘scanimage’ sets config #1 - - -1.) usbfs: interface 1 claimed by usblp while ‘scanimage’ sets config #1 - -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. - -REMARK: Sometimes usblp is used to access your printer. diff --git a/debian/libsane.docs b/debian/libsane.docs index 4eb0108..0ea0ca5 100644 --- a/debian/libsane.docs +++ b/debian/libsane.docs @@ -1 +1 @@ -libsane.TROUBLESHOOTING.debian +debian/TROUBLESHOOTING.Debian diff --git a/debian/patches/001-scanimage_manpage.patch b/debian/patches/001-scanimage_manpage.patch new file mode 100644 index 0000000..08e5cc1 --- /dev/null +++ b/debian/patches/001-scanimage_manpage.patch @@ -0,0 +1,21 @@ +Description: Add remark to options. +Author: Jörg Frings-Fürst +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=418630 +Forwarded: +Last-Update: 2015-01-18 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/doc/scanimage.man +=================================================================== +--- trunk.orig/doc/scanimage.man ++++ trunk/doc/scanimage.man +@@ -73,6 +73,9 @@ To print all available options: + scanimage \-h + + .SH OPTIONS ++\fBRemark:\fR Parameter are defined by the backends. So are \-\-mode Gray and \-\-mode Grayscale in use. ++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). + diff --git a/debian/patches/series b/debian/patches/series index 5586d9d..fbfd015 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -22,3 +22,4 @@ hp5370c.patch out_of_bounds.patch 0500-systemd_configure.patch 0100-usb3-corrections.patch +001-scanimage_manpage.patch -- cgit v1.2.3