Please unblock sane-backends 1.0.18-4
Hi,
sane-backends 1.0.18-4 (just ACCEPTED) fixes an issue for owners of
Epson Stylus CX5xxx scanners.
A bogus check in the backend caused the identification of these models
to fail (confirmed by Olaf Meeuwissen, author of the epkowa backend
released by Epson).
debdiff attached, there's a control update, README fix and code for
backports added in rules along with the new dpatch which fixes the
aforementioned issue.
Urgency set to medium as I want to have it unstable for a couple of
days just in case.
Thanks,
JB.
--
Julien BLACHE - Debian & GNU/Linux Developer - <jblache@debian.org>
Public key available on <http://www.jblache.org> - KeyID: F5D6 5169
GPG Fingerprint : 935A 79F1 C8B3 3521 FD62 7CC7 CD61 4FD7 F5D6 5169
diff -u sane-backends-1.0.18/debian/patches/00list sane-backends-1.0.18/debian/patches/00list
--- sane-backends-1.0.18/debian/patches/00list
+++ sane-backends-1.0.18/debian/patches/00list
@@ -9,2 +9,3 @@
30_udev_long_comment_lines
+31_epson_remove_check
diff -u sane-backends-1.0.18/debian/changelog sane-backends-1.0.18/debian/changelog
--- sane-backends-1.0.18/debian/changelog
+++ sane-backends-1.0.18/debian/changelog
@@ -1,3 +1,18 @@
+sane-backends (1.0.18-4) unstable; urgency=medium
+
+ * debian/patches/31_epson_remove_check.dpatch:
+ + Added; Remove bogus check in epson backend get_identity2_information()
+ affecting Stylus CX5xxx models (closes: #399119, #402444).
+ * debian/sane-utils.README.Debian:
+ + Fix typo, the manpage for saned is in section 8 not 1.
+ * debian/control:
+ + libsane-dbg is Priority: extra.
+ + Remove Uploaders.
+
+ Thank you Aurélien JARNO for your help during these years.
+
+ -- Julien BLACHE <jblache@debian.org> Sat, 6 Jan 2007 18:46:43 +0100
+
sane-backends (1.0.18-3) unstable; urgency=low
* debian/patches/30_udev_long_comment_lines.dpatch:
diff -u sane-backends-1.0.18/debian/sane-utils.README.Debian sane-backends-1.0.18/debian/sane-utils.README.Debian
--- sane-backends-1.0.18/debian/sane-utils.README.Debian
+++ sane-backends-1.0.18/debian/sane-utils.README.Debian
@@ -7,7 +7,7 @@
This package added a saned user and a saned group to your system ; it is highly
recommended to run saned as user and group saned and NEVER EVER as root.
-To run saned as user and group saned, see man 1 saned.
+To run saned as user and group saned, see man 8 saned.
To operate in this setup, saned must be able to access to your scanner ;
@@ -37 +37 @@
--- Julien BLACHE <jblache@debian.org>, Wed, 28 Sep 2005 22:18:39 +0200
+-- Julien BLACHE <jblache@debian.org>, Wed, 13 Dec 2006 21:32:18 +0100
diff -u sane-backends-1.0.18/debian/rules sane-backends-1.0.18/debian/rules
--- sane-backends-1.0.18/debian/rules
+++ sane-backends-1.0.18/debian/rules
@@ -5,6 +5,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+DH_COMPAT=$(shell cat $(CURDIR)/debian/compat)
+
# Include dpatch rules
include /usr/share/dpatch/dpatch.make
@@ -177,7 +179,15 @@
# dh_undocumented
dh_installchangelogs ChangeLog
dh_link
+# Emulate debhelper v5 behaviour for Sarge backports with debhelper v4
+ifeq ($(DH_COMPAT),4)
+ dh_strip --keep-debug
+ mkdir -p $(CURDIR)/debian/libsane-dbg/usr/lib/debug
+ tar cf - -C $(CURDIR)/debian/libsane/usr/lib/debug . | tar xf - -C $(CURDIR)/debian/libsane-dbg/usr/lib/debug \
+ && rm -rf $(CURDIR)/debian/libsane/usr/lib/debug;
+else
dh_strip -plibsane --dbg-package=libsane-dbg
+endif
dh_strip
dh_compress
dh_fixperms
diff -u sane-backends-1.0.18/debian/control sane-backends-1.0.18/debian/control
--- sane-backends-1.0.18/debian/control
+++ sane-backends-1.0.18/debian/control
@@ -2,7 +2,6 @@
Section: graphics
Priority: optional
Maintainer: Julien BLACHE <jblache@debian.org>
-Uploaders: Aurelien Jarno <aurel32@debian.org>
Standards-Version: 3.7.2
Build-Depends: debhelper (>= 5.0.0), dpatch, libgphoto2-2-dev, libltdl3-dev, libjpeg62-dev, libtiff4-dev, libusb-dev (>= 2:0.1.10a-9), libieee1284-3-dev (>= 0.2.3-1) [!kfreebsd-amd64], libcam-dev [kfreebsd-i386 kfreebsd-amd64], gettext, tetex-bin, tetex-extra, autotools-dev, pkg-config, chrpath, xutils
@@ -74,6 +73,7 @@
Package: libsane-dbg
Section: libdevel
+Priority: extra
Architecture: any
Depends: libsane (= ${Source-Version})
Suggests: libsane-extras-dbg (>= 1.0.18.1)
only in patch2:
unchanged:
--- sane-backends-1.0.18.orig/debian/patches/31_epson_remove_check.dpatch
+++ sane-backends-1.0.18/debian/patches/31_epson_remove_check.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 31_epson_remove_check.dpatch by <jblache@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove bogus check in get_indentity2_information() in the epson backend.
+## DP: The check caused the identification of various Stylus CX5xxx models to
+## DP: fail. Olaf Meeuwissen hinted the check was bogus and should be removed.
+## DP: Confirmed working by affected users.
+
+@DPATCH@
+diff -urNad sane-backends-1.0.18~/backend/epson.c sane-backends-1.0.18/backend/epson.c
+--- sane-backends-1.0.18~/backend/epson.c 2006-06-11 22:32:30.000000000 +0200
++++ sane-backends-1.0.18/backend/epson.c 2007-01-06 18:46:11.968393491 +0100
+@@ -6143,12 +6143,6 @@
+
+ receive (s, buf, len, &status); /* reveive actual status data */
+
+- if (buf[0] & 0x80)
+- {
+- close_scanner (s);
+- return SANE_STATUS_INVAL;
+- }
+-
+ /* the first two bytes of the buffer contain the optical resolution */
+ s->hw->optical_res = buf[1] << 8 | buf[0];
+
Reply to: