Merge lp:~ari-tczew/sane-backends/lp-693578 into lp:~ubuntu-desktop/sane-backends/ubuntu

[Artur Rona]

[lp:~ari-tczew/sane-backends/lp-693578]

5. By Artur Rona on 2010-12-23

bzr add

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-08 02:38:10 +0000
+++ debian/changelog	2010-12-23 00:20:39 +0000
@@ -1,3 +1,118 @@
+sane-backends (1.0.21-9ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes: (LP: #693578)
+    - debian/control:
+      + Add Vcs-Bzr link related to Ubuntu Desktop Team.
+      + Demote libsane-extras from Depends to Suggests, as long as
+        this package is in universe.
+      + Demote sane-utils and avahi-daemon from Recommends to Suggests.
+        We do not want to have an init script for saned laying around,
+        which is disabled by default anyway.
+    - debian/libsane.postinst: Don't create a scanner group.
+    - debian/libsane.preinst:
+      + Remove the old file if unmodified.
+      + Remove the old blacklist-scanner modprobe file.
+    - debian/patches/disable_v4l.patch: Disable v4l backend.
+    - debian/patches/no_translations.patch:
+      + Add missing translation files.
+    - debian/patches/ubuntu_udev_noperm.patch:
+      + Do not change device permissions (already covered
+        by udev-extra's 70-acl.rules).
+      + Do not cover SCSI scanners (already covered by udev-extra's
+        70-acl.rules).
+      + Simplify description and structure.
+    - debian/rules:
+      - Link using -Bsymbolic-functions (startup time optimization).
+      - Saned init script does not need to be started before gdm
+        and does not need to be called on shutdown.
+    - debian/sane-utils.*: No longer have scanner group.
+    - debian/sane-utils.saned.init: Saned init script does not need to
+      be started before gdm and does not need to be called on shutdown.
+    - debian/watch: Added to grab original tarball by uscan.
+  * debian/patches/use_libsane_matched_for_scsi.patch: Removed.
+    This change is useless due to ubuntu_udev_noperm.patch.
+  * Note that tarballs md5sums are different in Debian and Ubuntu.
+
+ -- Artur Rona <[e-mail]>  Wed, 22 Dec 2010 20:55:59 +0100
+
+sane-backends (1.0.21-9) unstable; urgency=low
+
+  * debian/patches/fix_epson2_cancel.patch:
+    + Added; fix handling of scanner errors by sending a cancel command
+      (closes: #597922).
+
+ -- Julien BLACHE <[e-mail]>  Sun, 12 Dec 2010 16:31:25 +0100
+
+sane-backends (1.0.21-8) unstable; urgency=low
+
+  * debian/patches/fix_epson2_commands.patch:
+    + Added; fix list of supported commands for levels D1 and D2
+      (closes: #582066).
+
+ -- Julien BLACHE <[e-mail]>  Mon, 29 Nov 2010 18:12:16 +0100
+
+sane-backends (1.0.21-7) unstable; urgency=low
+
+  * debian/patches/genesys_disable_raw_data_log.patch:
+    + Added; disable raw data logging. Raw data logging was enabled
+      upstream at some point before 1.0.21 most probably as an oversight
+      when committing new code. When enabled, a raw.pnm file is left
+      behind in the cwd when using the genesys backend (closes: 602995).
+
+  * debconf translations:
+    + Properly install vi.po, mistakenly put in po/ instead of
+      debian/po in 1.0.21-6.
+
+ -- Julien BLACHE <[e-mail]>  Mon, 15 Nov 2010 19:00:34 +0100
+
+sane-backends (1.0.21-6) unstable; urgency=low
+
+  * debian/patches/saned_exit_avahi_process.patch:
+    + Added; exit Avahi process on error/loop termination.
+  * debian/patches/xerox_mfp_new_ids.patch:
+    + Added; add USB IDs for supported machines in xerox_mfp (closes: #601748).
+  * debian/patches/scsi_perfection_2450.patch:
+    + Added; add SCSI IDs for the Perfection 2450 via FireWire
+      (closes: #601810).
+  * debian/patches/scsi_scanjet_4c.patch:
+    + Added; add SCSI IDs for the ScanJet 4c (closes: #601656).
+
+  * debconf translations:
+    + vi.po: courtesy of Clytie Siddall (closes: #601530).
+
+ -- Julien BLACHE <[e-mail]>  Sat, 06 Nov 2010 11:21:40 +0100
+
+sane-backends (1.0.21-5) unstable; urgency=low
+
+  * debconf translations:
+    + cs.po: courtesy of Miroslav Kure (closes: #598338).
+    + zh_CN.po: courtesy of YunQiang Su (closes: #599590, #599591).
+    + da.po: courtesy of Joe Dalton (closes: #599642).
+    + eu.po: courtesy of Iñaki Larrañaga Murgoitio (closes: #599810).
+    + es.po: courtesy of Camaleón (closes: #600342).
+    + fi.po: courtesy of Esko Arajärvi (closes: #600514).
+
+ -- Julien BLACHE <[e-mail]>  Mon, 18 Oct 2010 10:08:12 +0200
+
+sane-backends (1.0.21-4) unstable; urgency=low
+
+  * debconf translations:
+    + it.po: courtesy of Luca Monducci (closes: #593722).
+
+ -- Julien BLACHE <[e-mail]>  Sun, 05 Sep 2010 09:44:28 +0200
+
+sane-backends (1.0.21-3) unstable; urgency=low
+
+  * debian/control:
+    + Bump Standards-Version to 3.9.0 (no changes).
+
+  * debian/patches/use_libsane_matched_for_scsi.patch:
+    + Added; use libsane_matched for SCSI scanners rules too.
+  * debian/patches/allow_dll.d_symlinks.patch:
+    + Added; allow symlinks under /etc/sane.d/dll.d (closes: #588392).
+
+ -- Julien BLACHE <[e-mail]>  Fri, 09 Jul 2010 18:21:58 +0200
+
 sane-backends (1.0.21-2ubuntu2) maverick; urgency=low
 
   * debian/libsane.install.in:
@@ -87,6 +202,56 @@
 
  -- Julien BLACHE <[e-mail]>  Sat, 13 Feb 2010 10:03:12 +0100
 
+sane-backends (1.0.20-13ubuntu2) lucid; urgency=low
+
+  * debian/patches/50_disable_v4l.dpatch:
+    - Disable v4l backends (LP: #87312)
+
+ -- Robert Ancell <[e-mail]>  Wed, 14 Apr 2010 22:24:08 +0800
+
+sane-backends (1.0.20-13ubuntu1) lucid; urgency=low
+
+  * Merge from Debian testing, remaining changes:
+    - Add 42_add_epson_cx_6000.dpatch: Add Epson CX6000. (LP: #314485)
+    - Add 43_scanadf_error_check.dpatch: Backport from Debian's
+      sane-backends git repo adding additional error checking.
+      (LP: #469540)
+    - Add 44_add_epson_mfp_devs.dpatch: Add additional device id.
+      (LP: #469540)
+    - Don't apply 11_udev_147, because ubuntu_udev_noperm.dpatch is
+      more appropriate for Ubuntu:
+      + Do not change device permissions (already covered by udev-extra's
+        70-acl.rules)
+      + Do not cover SCSI scanners (already covered by udev-extra's
+        70-acl.rules)
+      + Simplify description and structure.
+    - debian/control:
+      + Demote libsane-extras from Depends: to Suggests:, as long as
+        this package is in universe.
+      + Demote sane-utils and avahi-daemon from Recommends to Suggests.
+        We do not want to have an init script for saned laying around,
+        which is disabled by default anyway.
+    - debian/libsane.dirs.linux: remove
+    - debian/{libsane.install.in,libsane-dev.install,rules}: Install
+      documentation into libsane-dev instead of libsane to save CD space.
+    - debian/rules:
+      + Link using -Bsymbolic-functions (startup time optimization).
+      + /etc/modprobe.d/libsane blacklists two modules that don't exist
+        anymore, dropped creation of this file
+    - debian{rules,sane-utils.saned.init}: saned init script does not need
+      to be started before gdm, and does not need to be called on shutdown.
+    - debian/libsane.postinst: Do not create the scanner group.
+    - debian/{sane-utils.config,sane-utils.postinst,sane-utils.templates}:
+      Drop the support for saned in the scanner group, since we don't have
+      a scanner group anymore!
+    - debian/libsane.preinst:
+      + Remove the old blacklist-scanner modprobe file.  LP: #340873.
+      + Remove the old file if unmodified
+    - debian/rules: Install udev rules again, since we now don't rely on
+      hal any more and thus we need the ENV{libsane_matched}=="yes" flag.
+
+ -- Daniel T Chen <[e-mail]>  Mon, 08 Feb 2010 13:26:48 -0500
+
 sane-backends (1.0.20-13) unstable; urgency=low
 
   * debian/patches/34_genesys_gl841_cal_fix.dpatch:
@@ -201,6 +366,60 @@
 
  -- Julien BLACHE <[e-mail]>  Fri, 26 Jun 2009 14:39:41 +0200
 
+sane-backends (1.0.20-4ubuntu3) karmic; urgency=low
+
+  * debian/sane-utils.saned.init: be quiet if not enabled
+    (LP: #440852)
+
+ -- Tormod Volden <[e-mail]>  Wed, 14 Oct 2009 11:15:59 +0200
+
+sane-backends (1.0.20-4ubuntu2) karmic; urgency=low
+
+  * debian/control: Fix libsane-extras Recommends → Suggests again.
+  * ubuntu_udev_noperm.dpatch: Use ENV{DEVTYPE} instead of SUBSYSTEM, to avoid
+    processing all the rules twice.
+
+ -- Martin Pitt <[e-mail]>  Thu, 04 Jun 2009 12:05:07 +0200
+
+sane-backends (1.0.20-4ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add 42_add_epson_cx_6000.dpatch: Add Epson CX6000. (LP: #314485)
+    - debian/control:
+      + Set Ubuntu maintainer address.
+      + Demote libsane-extras from Depends: to Suggests:, as long as
+        this package is in universe.
+      + Demote sane-utils and avahi-daemon from Recommends to Suggests.
+        We do not want to have an init script for saned laying around,
+        which is disabled by default anyway.
+    - debian/libsane.dirs.linux: remove
+    - debian/{libsane.install.in,libsane-dev.install,rules}: Install
+      documentation into libsane-dev instead of libsane to save CD space.
+    - debian/rules:
+      + Link using -Bsymbolic-functions (startup time optimization).
+      + /etc/modprobe.d/libsane blacklists two modules that don't exist
+        anymore, dropped creation of this file
+    - debian{rules,sane-utils.saned.init}: saned init script does not need
+      to be started before gdm, and does not need to be called on shutdown.
+    - debian/libsane.postinst: Do not create the scanner group.
+    - debian/{sane-utils.config,sane-utils.postinst,sane-utils.templates}:
+      Drop the support for saned in the scanner group, since we don't have
+      a scanner group anymore!
+    - debian/libsane.preinst:
+      + Remove the old blacklist-scanner modprobe file.  LP: #340873.
+      + Remove the old file if unmodified
+  * Add ubuntu_udev_noperm.dpatch: Change udev rules to be suitable for
+    Ubuntu:
+    - Do not change device permissions (already covered by udev-extra's
+      70-acl.rules)
+    - Do not cover SCSI scanners (already covered by udev-extra's
+      70-acl.rules)
+    - Simplify description and structure.
+   * debian/rules: Install udev rules again, since we now don't rely on
+     hal any more and thus we need the ENV{libsane_matched}=="yes" flag.
+
+ -- Martin Pitt <[e-mail]>  Thu, 04 Jun 2009 10:06:14 +0200
+
 sane-backends (1.0.20-4) unstable; urgency=low
 
   * debian/rules:
@@ -218,6 +437,38 @@
 
  -- Julien BLACHE <[e-mail]>  Thu, 14 May 2009 12:06:47 +0200
 
+sane-backends (1.0.20-3ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #373168), remaining changes:
+    - Add 42_add_epson_cx_6000.dpatch: Add Epson CX6000. (LP: #314485)
+    - debian/control:
+      + Set Ubuntu maintainer address.
+      + Demote libsane-extras from Depends: to Suggests:, as long as
+        this package is in universe.
+      + Demote sane-utils and avahi-daemon from Recommends to Suggests.
+        We do not want to have an init script for saned laying around,
+        which is disabled by default anyway.
+    - debian/libsane.dirs.linux: remove
+    - debian/{libsane.install.in,libsane-dev.install,rules}: Install
+      documentation into libsane-dev instead of libsane to save CD space.
+    - debian/rules:
+      + Link using -Bsymbolic-functions (startup time optimization).
+      + Do not install the udev rules, since hal now provides dynamic ACLs on
+        device nodes. (See hardy-hardware-detection spec.)
+      + /etc/modprobe.d/libsane blacklists two modules that don't exist
+        anymore, dropped creation of this file
+    - debian{rules,sane-utils.saned.init}: saned init script does not need
+      to be started before gdm, and does not need to be called on shutdown.
+    - debian/libsane.postinst: Do not create the scanner group.
+    - debian/{sane-utils.config,sane-utils.postinst,sane-utils.templates}:
+      Drop the support for saned in the scanner group, since we don't have
+      a scanner group anymore!
+    - debian/libsane.preinst:
+      + Remove the old blacklist-scanner modprobe file.  LP: #340873.
+      + Remove the old file if unmodified
+
+ -- Артём Попов <[e-mail]>  Mon, 11 May 2009 00:24:39 +0700
+
 sane-backends (1.0.20-3) unstable; urgency=low
 
   * debian/patches/06_cap_always_settable.dpatch:

=== modified file 'debian/control'
--- debian/control	2010-06-17 08:24:44 +0000
+++ debian/control	2010-12-23 00:20:39 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Core Developers <[e-mail]>
 XSBC-Original-Maintainer: Julien BLACHE <[e-mail]>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Build-Depends: debhelper (>= 5.0.0), po-debconf, libv4l-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libgphoto2-2-dev, libltdl3-dev, libjpeg-dev, libtiff4-dev, libusb-dev (>= 2:0.1.10a-9) [!hurd-i386], libieee1284-3-dev (>= 0.2.10-5) [!hurd-i386], libcam-dev [kfreebsd-i386 kfreebsd-amd64], libavahi-client-dev (>= 0.6.4), gettext, texlive, texlive-latex-extra, autotools-dev, pkg-config, chrpath, xutils-dev
 Homepage: http://www.sane-project.org
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/sane-backends/ubuntu

=== added file 'debian/patches/allow_dll.d_symlinks.patch'
--- debian/patches/allow_dll.d_symlinks.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/allow_dll.d_symlinks.patch	2010-12-23 00:20:39 +0000
@@ -0,0 +1,27 @@
+Description: Allow symlinks under /etc/sane.d/dll.d
+ Symlinks were not allowed due to the use of lstat(), switch to using stat()
+ instead.
+Author: Julien BLACHE <[e-mail]>
+
+Index: sane-backends-1.0.21/backend/dll.c
+===================================================================
+--- sane-backends-1.0.21.orig/backend/dll.c	2010-07-09 18:17:45.464558452 +0200
++++ sane-backends-1.0.21/backend/dll.c	2010-07-09 18:18:27.567557502 +0200
+@@ -779,7 +779,7 @@
+   DBG (5, "sane_init/read_dlld: processing %s ...\n",
+        STRINGIFY(PATH_SANE_CONFIG_DIR) "/dll.d");
+ 
+-  /* Debian specific: read files under $sysconfdir/sane.d/dll.d */
++  /* Read files under $sysconfdir/sane.d/dll.d */
+   dlld = opendir (STRINGIFY(PATH_SANE_CONFIG_DIR) "/dll.d");
+ 
+   if (dlld == NULL)
+@@ -809,7 +809,7 @@
+ 
+       DBG (5, "sane_init/read_dlld: considering %s\n", conffile);
+ 
+-      if (lstat (conffile, &st) != 0)
++      if (stat (conffile, &st) != 0)
+         continue;
+ 
+       if (!S_ISREG (st.st_mode))

=== modified file 'debian/patches/disable_v4l.patch'
--- debian/patches/disable_v4l.patch	2010-06-17 08:24:44 +0000
+++ debian/patches/disable_v4l.patch	2010-12-23 00:20:39 +0000
@@ -1,5 +1,6 @@
-Description: Disable V4L backend
-Bug: https://bugs.launchpad.net/ubuntu/+source/sane-backends/+bug/87312
+From: Robert Ancell <[e-mail]>
+Description: Disable V4L backend.
+Bug-Ubuntu: https://launchpad.net/bugs/87312
 
 diff -urNad sane-backends-1.0.20~/backend/v4l.conf.in sane-backends-1.0.20/backend/v4l.conf.in
 --- sane-backends-1.0.20~/backend/v4l.conf.in	2006-01-06 00:27:10.000000000 +0800

=== added file 'debian/patches/fix_epson2_cancel.patch'
--- debian/patches/fix_epson2_cancel.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_epson2_cancel.patch	2010-12-23 00:20:39 +0000
@@ -0,0 +1,18 @@
+commit 9a89932ab4624925794532ab5e5610e3b0190d53
+Author: Olaf Meeuwissen <[e-mail]>
+Date:   Sun Dec 12 16:25:17 2010 +0100
+
+    	epson2: fixed issue when a scan is cancelled
+
+Index: sane-backends-1.0.21/backend/epson2-ops.c
+===================================================================
+--- sane-backends-1.0.21.orig/backend/epson2-ops.c	2010-11-29 18:12:09.682154520 +0100
++++ sane-backends-1.0.21/backend/epson2-ops.c	2010-12-12 16:34:42.911151001 +0100
+@@ -1721,6 +1721,7 @@
+ 
+ 		if (s->buf[buf_len] & FSG_STATUS_CANCEL_REQ) {
+ 			DBG(0, "%s: cancel request received\n", __func__);
++			e2_cancel(s);
+ 			return SANE_STATUS_CANCELLED;
+ 		}
+ 

=== added file 'debian/patches/fix_epson2_commands.patch'
--- debian/patches/fix_epson2_commands.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_epson2_commands.patch	2010-12-23 00:20:39 +0000
@@ -0,0 +1,21 @@
+commit a0980a91aebc5a8dd43be5136b3cb5e7f2beb458
+Author: Olaf Meeuwissen <[e-mail]>
+Date:   Mon Nov 29 18:03:55 2010 +0100
+
+    Fix list of supported commands for levels D1 and D2
+
+diff --git a/backend/epson2-ops.c b/backend/epson2-ops.c
+index 0d2db5d..7db3001 100644
+--- a/backend/epson2-ops.c
++++ b/backend/epson2-ops.c
+@@ -86,8 +86,8 @@ static struct EpsonCmd epson_cmd[] = {
+   {"B8",'I', 0 ,'F','S','C','G','D','R','H','A','L',{-4, 3, 0},'Z','B','M','@','g','d','K','z','Q','b','m','f','e','\f', 0x19,'!','s','N', 0 , 0 ,'t','p','q','I','F'},
+ /* XXX 'f' probably not supported on F5 */
+   {"F5",'I', 0 ,'F','S','C','G','D','R','H','A','L',{-3, 3, 0},'Z', 0 ,'M','@','g','d','K','z','Q', 0 ,'m','f','e','\f', 0   , 0 , 0 ,'N','T','P', 0 , 0 , 0 , 0 , 0 },
+-  {"D1",'I','i','F', 0 ,'C','G','D','R', 0 ,'A', 0 ,{ 0, 0, 0},'Z', 0 , 0 ,'@','g','d', 0 ,'z', 0 , 0 ,'m','f', 0 ,  0 , 0   ,'!', 0 , 0 , 0 , 0 ,'t', 0 , 0 , 0 , 0 },
+-  {"D2",'I','i','F', 0 ,'C','G','D','R', 0 ,'A', 0 ,{ 0, 0, 0},'Z', 0 , 0 ,'@','g','d', 0 ,'z', 0 , 0 ,'m','f','e',  0 , 0   ,'!', 0 ,'N', 0 , 0 ,'t', 0 , 0 , 0 , 0 },
++  {"D1",'I','i','F', 0 ,'C','G','D','R', 0 ,'A', 0 ,{ 0, 0, 0},'Z', 0 , 0 ,'@','g','d', 0 ,'z', 0 , 0 , 0 ,'f', 0 ,  0 , 0   ,'!', 0 , 0 , 0 , 0 ,'t', 0 , 0 , 0 , 0 },
++  {"D2",'I','i','F', 0 ,'C','G','D','R', 0 ,'A', 0 ,{ 0, 0, 0},'Z', 0 , 0 ,'@','g','d', 0 ,'z', 0 , 0 , 0 ,'f','e',  0 , 0   ,'!', 0 ,'N', 0 , 0 ,'t', 0 , 0 , 0 , 0 },
+   {"D7",'I','i','F', 0 ,'C','G','D','R', 0 ,'A', 0 ,{ 0, 0, 0},'Z', 0 , 0 ,'@','g','d', 0 ,'z', 0 , 0 , 0 ,'f','e','\f', 0   ,'!', 0 ,'N', 0 , 0 ,'t', 0 , 0 , 0 , 0 },
+   {"D8",'I','i','F', 0 ,'C','G','D','R', 0 ,'A', 0 ,{ 0, 0, 0},'Z', 0 , 0 ,'@','g','d', 0 ,'z', 0 , 0 , 0 ,'f','e','\f', 0   ,'!', 0 ,'N', 0 , 0 ,'t', 0 , 0 , 0 , 0 },
+ };

=== added file 'debian/patches/genesys_disable_raw_data_log.patch'
--- debian/patches/genesys_disable_raw_data_log.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/genesys_disable_raw_data_log.patch	2010-12-23 00:20:39 +0000
@@ -0,0 +1,20 @@
+Description: disable raw data logging
+ Raw data logging was mistakenly enabled upstream at some point before
+ 1.0.21; disable it as it leaves a raw.pnm file behind in the current
+ working directory.
+Author: Julien BLACHE <[e-mail]>
+
+Index: sane-backends-1.0.21/backend/genesys.c
+===================================================================
+--- sane-backends-1.0.21.orig/backend/genesys.c	2010-11-15 18:58:14.105512277 +0100
++++ sane-backends-1.0.21/backend/genesys.c	2010-11-15 18:58:26.268343863 +0100
+@@ -4617,8 +4617,7 @@
+ 
+ #include "genesys_conv.c"
+ 
+-/*#undef SANE_DEBUG_LOG_RAW_DATA*/
+-#define SANE_DEBUG_LOG_RAW_DATA 1
++#undef SANE_DEBUG_LOG_RAW_DATA
+ 
+ #ifdef SANE_DEBUG_LOG_RAW_DATA
+ static FILE *rawfile = NULL;

=== modified file 'debian/patches/no_translations.patch'
--- debian/patches/no_translations.patch	2010-07-08 02:38:10 +0000
+++ debian/patches/no_translations.patch	2010-12-23 00:20:39 +0000
@@ -1,5 +1,7 @@
-Description: Add missing translation files
-Origin: http://git.debian.org/?p=sane/sane-backends.git;a=commit;h=3adab142b180d6c24859c9b403be72f4214c232f 
+From: Robert Ancell <[e-mail]>
+Description: Add missing translation files.
+Origin: http://git.debian.org/?p=sane/sane-backends.git;a=commit;h=3adab142b180d6c24859c9b403be72f4214c232f
+Author: m. allan noah <[e-mail]>
 
 Index: sane-backends-1.0.21/po/LINGUAS
 ===================================================================

=== added file 'debian/patches/saned_exit_avahi_process.patch'
--- debian/patches/saned_exit_avahi_process.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/saned_exit_avahi_process.patch	2010-12-23 00:20:39 +0000
@@ -0,0 +1,40 @@
+commit f7ee3845695613d913c40a894b33255c9f41ff0d
+Author: Julien BLACHE <[e-mail]>
+Date:   Thu Sep 16 18:23:12 2010 +0200
+
+    Exit the Avahi process on error and when the poll loop terminates
+
+Index: sane-backends-1.0.21/frontend/saned.c
+===================================================================
+--- sane-backends-1.0.21.orig/frontend/saned.c	2010-04-05 15:18:05.000000000 +0200
++++ sane-backends-1.0.21/frontend/saned.c	2010-11-06 11:14:05.449396253 +0100
+@@ -2410,6 +2410,11 @@
+ 
+   avahi_simple_poll_loop (avahi_poll);
+ 
++  DBG (DBG_INFO, "saned_avahi: poll loop exited\n");
++
++  exit(EXIT_SUCCESS);
++
++  /* NOT REACHED */
+   return;
+ 
+  fail:
+@@ -2420,6 +2425,8 @@
+     avahi_simple_poll_free (avahi_poll);
+ 
+   avahi_free (avahi_svc_name);
++
++  exit(EXIT_FAILURE);
+ }
+ 
+ static void
+@@ -3077,6 +3084,8 @@
+ #ifdef WITH_AVAHI
+   DBG (DBG_INFO, "run_standalone: spawning Avahi process\n");
+   saned_avahi (fds, nfds);
++
++  /* NOT REACHED (Avahi process) */
+ #endif /* WITH_AVAHI */
+ 
+   DBG (DBG_MSG, "run_standalone: waiting for control connection\n");

=== added file 'debian/patches/scsi_perfection_2450.patch'
--- debian/patches/scsi_perfection_2450.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/scsi_perfection_2450.patch	2010-12-23 00:20:39 +0000
@@ -0,0 +1,33 @@
+commit 126c70d6168ab795ff42005642bd56714570e6b1
+Author: Julien BLACHE <[e-mail]>
+Date:   Thu Jul 15 18:22:34 2010 +0200
+
+    Add :scsi keyword for the Perfection 2450 connected via FireWire
+
+Index: sane-backends-1.0.21/doc/descriptions/epson.desc
+===================================================================
+--- sane-backends-1.0.21.orig/doc/descriptions/epson.desc	2010-04-05 15:18:05.000000000 +0200
++++ sane-backends-1.0.21/doc/descriptions/epson.desc	2010-11-06 11:20:00.275222825 +0100
+@@ -146,6 +146,7 @@
+ :model "Perfection 2450"
+ :interface "USB IEEE-1394"
+ :usbid "0x04b8" "0x0112"
++:scsi "EPSON" "GT-9700" "processor"
+ :status :complete
+ 
+ :model "Perfection 3200"
+Index: sane-backends-1.0.21/doc/descriptions/epson2.desc
+===================================================================
+--- sane-backends-1.0.21.orig/doc/descriptions/epson2.desc	2010-04-05 15:18:05.000000000 +0200
++++ sane-backends-1.0.21/doc/descriptions/epson2.desc	2010-11-06 11:20:00.275222825 +0100
+@@ -1078,8 +1078,9 @@
+ :model      "Perfection 2450 PHOTO"	; command spec
+ :interface  "USB"
+ :usbid      "0x04b8" "0x0112"
++:scsi       "EPSON" "GT-9700" "processor"
+ :status     :complete
+-:comment    "IEEE1394 untested<br>overseas version of the GT-9700F"
++:comment    "overseas version of the GT-9700F"
+ 
+ :model      "Perfection 2480 PHOTO"
+ :interface  "USB"

=== added file 'debian/patches/scsi_scanjet_4c.patch'
--- debian/patches/scsi_scanjet_4c.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/scsi_scanjet_4c.patch	2010-12-23 00:20:39 +0000
@@ -0,0 +1,18 @@
+commit 9b229f06b9fdca1098d7fb5181731b030fbdfccc
+Author: Julien BLACHE <[e-mail]>
+Date:   Sun Oct 31 10:20:53 2010 +0100
+
+    Add SCSI IDs for ScanJet 4c
+
+Index: sane-backends-1.0.21/doc/descriptions/hp.desc
+===================================================================
+--- sane-backends-1.0.21.orig/doc/descriptions/hp.desc	2010-04-05 15:18:05.000000000 +0200
++++ sane-backends-1.0.21/doc/descriptions/hp.desc	2010-11-06 11:21:35.913950615 +0100
+@@ -52,6 +52,7 @@
+ :model "ScanJet 4c"
+ :interface "SCSI"
+ :status :complete
++:scsi "HP" "C2520A" "processor"
+ 
+ :model "ScanJet 4p"
+ :interface "SCSI"

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-07-08 02:38:10 +0000
+++ debian/patches/series	2010-12-23 00:20:39 +0000
@@ -11,3 +11,12 @@
 
 # Fixes below this line
 fix_xerox_mfp_color_mode.patch
+allow_dll.d_symlinks.patch
+saned_exit_avahi_process.patch
+xerox_mfp_new_ids.patch
+scsi_perfection_2450.patch
+scsi_scanjet_4c.patch
+genesys_disable_raw_data_log.patch
+fix_epson2_commands.patch
+fix_epson2_cancel.patch
+

=== modified file 'debian/patches/ubuntu_udev_noperm.patch'
--- debian/patches/ubuntu_udev_noperm.patch	2010-06-17 08:24:44 +0000
+++ debian/patches/ubuntu_udev_noperm.patch	2010-12-23 00:20:39 +0000
@@ -1,10 +1,8 @@
 Description: Change udev rules to be suitable for Ubuntu:
- Do not change device permissions (already covered by udev-extra's 70-acl.rules)
- Do not cover SCSI scanners (already covered by udev-extra's 70-acl.rules)
- Simplify description and structure
+ Do not change device permissions (already covered by udev-extra's 70-acl.rules).
+ Do not cover SCSI scanners (already covered by udev-extra's 70-acl.rules).
 Author: Martin Pitt <[e-mail]>
 
-@DPATCH@
 Index: sane-backends-1.0.21/tools/sane-desc.c
 ===================================================================
 --- sane-backends-1.0.21.orig/tools/sane-desc.c	2010-06-17 17:55:12.000000000 +1000

=== added file 'debian/patches/xerox_mfp_new_ids.patch'
--- debian/patches/xerox_mfp_new_ids.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/xerox_mfp_new_ids.patch	2010-12-23 00:20:39 +0000
@@ -0,0 +1,105 @@
+Description: Add new IDs to xerox_mfp
+ New USB IDs for supported machines in xerox_mfp.
+
+Index: sane-backends-1.0.21/backend/xerox_mfp.conf.in
+===================================================================
+--- sane-backends-1.0.21.orig/backend/xerox_mfp.conf.in	2010-11-06 11:16:03.638017213 +0100
++++ sane-backends-1.0.21/backend/xerox_mfp.conf.in	2010-11-06 11:16:55.669008643 +0100
+@@ -1,5 +1,8 @@
+ #xerox_mfp.conf
+ 
++#Xerox Phaser 3200MFP
++usb 0x0924 0x3da4
++
+ #Dell MFP Laser Printer 1815dn
+ usb 0x413c 0x5124
+ 
+@@ -21,9 +24,29 @@
+ # Samsung SCX-4500W
+ usb 0x04e8 0x342b
+ 
++# Samsung SCX-4824
++usb 0x04e8 0x342c
++
+ # Samsung SCX-4300
+ usb 0x04e8 0x342e
+ 
++# Samsung SCX-4600
++usb 0x04e8 0x3433
++
+ #Xerox WorkCentre 3119 Series
+ usb 0x0924 0x4265
+ 
++#Samsung SCX-4623
++usb 0x04e8 0x3434
++
++# Samsung SCX-4825FN
++usb 0x04e8 0x343c
++
++#Xerox WorkCentre 4118 Series
++usb 0x0924 0x420c
++
++#Xerox WorkCentre 3210
++usb 0x0924 0x4293
++
++#Xerox WorkCentre 3220
++usb 0x0924 0x4294
+Index: sane-backends-1.0.21/doc/descriptions/xerox_mfp.desc
+===================================================================
+--- sane-backends-1.0.21.orig/doc/descriptions/xerox_mfp.desc	2010-11-06 11:16:03.078071115 +0100
++++ sane-backends-1.0.21/doc/descriptions/xerox_mfp.desc	2010-11-06 11:17:08.875737433 +0100
+@@ -22,6 +22,21 @@
+ :usbid "0x0924" "0x4265"
+ :status :good
+ 
++:model "WorkCentre 4118 Series"
++:interface "USB"
++:usbid "0x0924" "0x420c"
++:status :good
++
++:model "WorkCentre 3210"
++:interface "USB"
++:usbid "0x0924" "0x4293"
++:status :good
++
++:model "WorkCentre 3220"
++:interface "USB"
++:usbid "0x0924" "0x4294"
++:status :good
++
+ :mfg "Dell"
+ :url "http://www.dell.com/"
+ 
+@@ -58,7 +73,32 @@
+ :usbid "0x04e8" "0x342a"
+ :status :good
+ 
++:model "SCX-4824"
++:interface "USB"
++:usbid "0x04e8" "0x342c"
++:status :good
++
+ :model "SCX-4300"
+ :interface "USB"
+ :usbid "0x04e8" "0x342e"
+ :status :good
++
++:model "SCX-4600"
++:interface "USB"
++:usbid "0x04e8" "0x3433"
++:status :good
++
++:model "SCX-4623"
++:interface "USB"
++:usbid "0x04e8" "0x3434"
++:status :good
++
++:model "SCX-4825FN"
++:interface "USB"
++:usbid "0x04e8" "0x343c"
++:status :good
++
++:model "SCX-4500W"
++:interface "USB"
++:usbid "0x04e8" "0x342b"
++:status :basic