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

[Artur Rona]

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-10 07:43:56 +0000
+++ debian/changelog	2014-05-25 18:16:31 +0000
@@ -1,47 +1,126 @@
-sane-backends (1.0.22-7ubuntu3) quantal; urgency=low
-
-  * debian/control, debian/rules: Switch to libusb 1.0. (LP: #918774)
-
- -- Whoopie <[e-mail]>  Mon, 10 Sep 2012 09:40:11 +0200
-
-sane-backends (1.0.22-7ubuntu2) quantal; urgency=low
-
+sane-backends (1.0.23-3ubuntu4) utopic; urgency=medium
+
+  * debian/patches/fix-gl646-setup-registers.patch:
+    - Fix crash using some HP scanners (LP: #1301161)
+
+ -- Robert Ancell <[e-mail]>  Fri, 09 May 2014 11:05:29 +1200
+
+sane-backends (1.0.23-3ubuntu3) trusty; urgency=medium
+
+  * Build against libgphoto2-dev instead of libgphoto2-6-dev. (Reverts Ubuntu
+    specific delta)
+
+ -- Martin Pitt <[e-mail]>  Mon, 10 Feb 2014 09:28:15 +0100
+
+sane-backends (1.0.23-3ubuntu2) trusty; urgency=medium
+
+  * debian/{control,rules}: Build with dh-autoreconf for new libtool.
+  * debian/patches/*.patch: Patch Makefile.am too, not just Makefile.in.
+
+ -- William Grant <[e-mail]>  Sun, 15 Dec 2013 12:10:33 +0000
+
+sane-backends (1.0.23-3ubuntu1) trusty; urgency=low
+
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - Build against libgphoto2-6 and libtiff5.
+    - Demote libsane-extras* from Recommends to Suggests, as long as this
+      package is in universe.
+    - Demote sane-utils from Recommends to Suggests. We do not want to have
+      an init script for saned laying around, which is disabled by default
+      anyway.
+    - debian/rules: Link using -Bsymbolic-functions (startup time
+      optimization).
+    - debian/rules, debian/sane-utils.saned.init: Don't call init script on
+      shutdown, it's unnecessary.
+    - disable_v4l.patch, fix_avahi_error_paths.patch,
+      fix-for-broken-tpu-scan.patch: See patch headers.
+
+ -- Martin Pitt <[e-mail]>  Wed, 06 Nov 2013 07:31:42 +0100
+
+sane-backends (1.0.23-3) unstable; urgency=low
+
+  * QA upload
+  * revert move to libtiff5-dev
+
+ -- Rene Engelhard <[e-mail]>  Sat, 06 Jul 2013 15:20:16 +0200
+
+sane-backends (1.0.23-2) unstable; urgency=low
+
+  * QA upload.
+  * Add sane-desc.c_debian_mods.patch to series file. (Closes: #714993)
+
+ -- Markus Koschany <[e-mail]>  Fri, 05 Jul 2013 11:52:37 +0200
+
+sane-backends (1.0.23-1) unstable; urgency=low
+
+  * QA upload.
+  * Upload to unstable.
+  * This package has been orphaned. Set maintainer to the Debian QA Group.
+  * Bump compat level to 9 (was 5) and require debhelper >= 9.
   * debian/control:
-    - Build-Depend on libtiff5-dev
-
- -- Michael Terry <[e-mail]>  Mon, 09 Jul 2012 17:30:38 -0400
-
-sane-backends (1.0.22-7ubuntu1) precise; urgency=low
-
-  * Merge from Debian testing, remaining changes:
-    - debian/patches/disable_v4l.patch: Disable v4l backend.
-    - debian/patches/fix_avahi_error_paths.patch: fix free order of
-      avahi_client and avahi_browser in failure path, fixing assert when
-      avahi is unavailable
-    - debian/control:
-      + Demote libsane-extras* from Recommends to Suggests, as long as
-        this package is in universe.
-      + Demote sane-utils from Recommends to Suggests.
-        We do not want to have an init script for saned laying around,
-        which is disabled by default anyway.
-      + Drop the alternative "makedev" dependency; we only support udev.
-    - debian/libsane.postinst: Don't create a scanner group.
-    - 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.
-  * Dropped changes, no longer needed:
-    - debian/libsane.preinst:
-      + Remove the old file if unmodified.
-      + Remove the old blacklist-scanner modprobe file.
-    - Dropped "acl" dependency: acl is part of the standard system and
-      the udev rules still reference setfacl, so we should keep this
-      dependency here.
-
- -- Steve Langasek <[e-mail]>  Sun, 04 Dec 2011 20:27:13 -0800
+    - sane-utils: Inherit Section: graphics from source package sane-backends.
+    - Remove versioned dependencies. They are trivially satisfied.
+  * Drop the following patches. They are merged upstream now.
+    - fix_v4l_build.patch
+    - hurd_path_max_fix.patch
+    - sane_desc_udev+acl.patch
+    - scanimage_man_batch_start.patch
+    - udev_usb_suspend.patch
+    - xerox_mfp_add_scx_4623fw.patch
+    - xerox_mfp_fix_usb_device.patch
+  * Drop disable_rpath.patch because the RPATH is already removed by chrpath
+    in debian/rules.
+  * Rebase and refresh all other patches against the new upstream relase.
+  * debian/rules:
+    - Simplify debian/rules by using dh sequencer.
+    - Build with --parallel and with autotools_dev.
+    - Enable all hardening build flags.
+    - Install umax_pp with sane-utils.install.
+  * Build-Depend on libtiff5-dev. Thanks to Michael Terry for the patch.
+    (Closes: #681079)
+  * Build-Depend on libusb-1.0-0-dev and enable libusb1.0 support in
+    debian/rules. Thanks to Martin Pitt for the report and Whoopie for the
+    patch. (Closes: #687137)
+
+ -- Markus Koschany <[e-mail]>  Thu, 04 Jul 2013 17:41:47 +0200
+
+sane-backends (1.0.23-0.1~experimental1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream version.
+
+ -- John Paul Adrian Glaubitz <[e-mail]>  Sat, 23 Feb 2013 20:12:58 +0100
+
+sane-backends (1.0.22-7.4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Compress all binaries with xz to free up some space on CD#1.
+
+ -- Cyril Brulebois <[e-mail]>  Mon, 17 Sep 2012 16:44:07 +0200
+
+sane-backends (1.0.22-7.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix build failure on kfreebsd (closes: #680234).
+
+ -- Michael Gilbert <[e-mail]>  Sun, 15 Jul 2012 17:07:15 -0400
+
+sane-backends (1.0.22-7.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Set sane-utils as 'Multi-Arch: foreign' (closes: #675797).
+
+ -- Michael Gilbert <[e-mail]>  Thu, 28 Jun 2012 16:53:15 -0400
+
+sane-backends (1.0.22-7.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix pending l10n issues. Debconf translations:
+    - Catalan; (Innocent De Marchi).  Closes: #646505
+    - Slovak (Slavko).  Closes: #639235
+    - Polish (Michał Kułach).  Closes: #658351
+
+ -- Christian Perrier <[e-mail]>  Wed, 28 Mar 2012 07:39:00 +0200
 
 sane-backends (1.0.22-7) unstable; urgency=low
 
@@ -124,42 +203,6 @@
 
  -- Julien BLACHE <[e-mail]>  Thu, 02 Jun 2011 14:57:53 +0200
 
-sane-backends (1.0.22-2ubuntu2) oneiric; urgency=low
-
-  * debian/patches/fix_avahi_error_paths.patch:
-    - Fix free order of avahi_client and avahi_browser in failure path.
-      Fixes assert when avahi is unavailable (LP: #831867)
-
- -- Christopher James Halse Rogers <[e-mail]>  Wed, 21 Sep 2011 16:39:32 +1000
-
-sane-backends (1.0.22-2ubuntu1) natty; urgency=low
-
-  * Merge from debian unstable.  Remaining changes: (LP: #739708)
-    - debian/control:
-      + Demote libsane-extras* from Recommends to Suggests, as long as
-        this package is in universe.
-      + Demote sane-utils 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/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.
-      - Drop "acl" dependency. Current udev releases already evaluate
-        the "libsane_matched" property, so we don't need the sane rules
-        to do that again. Also drop the alternative "makedev" dependency;
-        we only support udev.
-    - 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.
-
- -- Artur Rona <[e-mail]>  Wed, 23 Mar 2011 19:26:36 +0100
-
 sane-backends (1.0.22-2) unstable; urgency=low
 
   * debian/patches/udev_usb_suspend.patch:
@@ -178,40 +221,6 @@
 
  -- Julien BLACHE <[e-mail]>  Sat, 12 Mar 2011 11:32:32 +0100
 
-sane-backends (1.0.22-1ubuntu1) natty; urgency=low
-
-  [ Artur Rona ]
-  * Merge from debian unstable.  Remaining changes: (LP: #729283)
-    - debian/control:
-      + Demote libsane-extras* from Recommends to Suggests, as long as
-        this package is in universe.
-      + Demote sane-utils 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/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.
-
-  [ Martin Pitt ]
-  * Drop ubuntu_udev_noperm.patch. It's superseded by Debian's
-    sane-desc_udev+acl.patch. This also brings back the accidentally dropped
-    SCSI scanner rules. (LP: #727696)
-  * debian/rules: Drop "acl" dependency. Current udev releases already
-    evaluate the "libsane_matched" property, so we don't need the sane rules
-    to do that again. Also drop the alternative "makedev" dependency; we
-    only support udev.
-
- -- Artur Rona <[e-mail]>  Mon, 07 Mar 2011 15:01:07 +0100
-
 sane-backends (1.0.22-1) unstable; urgency=low
 
   * New upstream release.
@@ -243,27 +252,6 @@
 
  -- Julien BLACHE <[e-mail]>  Wed, 16 Feb 2011 19:00:55 +0100
 
-sane-backends (1.0.22-0ubuntu1) natty; urgency=low
-
-  * New upstream release
-  * debian/control:
-    - Use standards version 3.9.1
-  * debian/patches/allow_dll.d_symlinks.patch:
-  * debian/patches/fix_epson2_cancel.patch:
-  * debian/patches/fix_epson2_commands.patch:
-  * debian/patches/fix_xerox_mfp_color_mode.patch:
-  * debian/patches/genesys_disable_raw_data_log.patch:
-  * debian/patches/no_translations.patch:
-  * debian/patches/saned_exit_avahi_process.patch:
-  * debian/patches/scsi_perfection_2450.patch:
-  * debian/patches/scsi_scanjet_4c.patch:
-  * debian/patches/xerox_mfp_new_ids.patch:
-    - Applied upstream
-  * debian/watch:
-    - Dropped, the URL is not consistent between releases
-
- -- Robert Ancell <[e-mail]>  Mon, 14 Feb 2011 14:28:56 +1100
-
 sane-backends (1.0.22~git1.0.21-157-g126c70d-1) experimental; urgency=low
 
   * Git snapshot.
@@ -285,43 +273,6 @@
 
  -- Julien BLACHE <[e-mail]>  Wed, 23 Jun 2010 18:37:59 +0200
 
-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:
@@ -400,56 +351,6 @@
 
  -- 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:
-    - Re-enable /usr/share/locale
-  * debian/patches/no_translations.patch:
-    - Add missing translation files
-
- -- Robert Ancell <[e-mail]>  Thu, 08 Jul 2010 11:30:17 +1000
-
-sane-backends (1.0.21-2ubuntu1) maverick; urgency=low
-
-  * Merge with Debian unstable, remaining Ubuntu changes:
-  * debian/control:
-    - Add Vcs-Bzr link
-    - 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/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/libsane.install.in:
-    - No files to install from /usr/share/locale
-  * 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/sane-utils.config:
-    - No longer have scanner group
-  * debian/sane-utils.postinst:
-    - 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/sane-utils.templates:
-    - No longer have scanner group
-  * 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/patches/disable_v4l.patch:
-    - Disable v4l backend
-
- -- Robert Ancell <[e-mail]>  Thu, 17 Jun 2010 11:50:52 +1000
-
 sane-backends (1.0.21-2) unstable; urgency=low
 
   * debian/patches/fix_xerox_mfp_color_mode.patch:
@@ -489,56 +390,6 @@
 
  -- 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:
@@ -653,60 +504,6 @@
 
  -- 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:
@@ -724,38 +521,6 @@
 
  -- 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:
@@ -1183,7 +948,7 @@
 sane-backends (1.0.19~cvs20071213-5) unstable; urgency=low
 
   * debian/control:
-   + Build-Depends: xutils-dev instead of xutils. 
+   + Build-Depends: xutils-dev instead of xutils.
    + Depend on libsane-extras{,-dev,-dbg} to help fix up the buggy udev rules
       in libsane-extras.
     + Promote libgphoto2-2-dev to Depends: for libsane-dev.
@@ -2120,7 +1885,7 @@
   * Do not install the upstream changelog twice.
   * sane-utils does not create /home/saned.
   * Fixed packages descriptions (wrt #165138).
-  
+
  -- Julien BLACHE <[e-mail]>  Thu, 24 Oct 2002 18:52:29 +0200
 
 sane-backends (1.0.8-4) unstable; urgency=low
@@ -2167,13 +1932,13 @@
   * Added build-depends on gettext(closes: #163681).
 
  -- Kevin Dalley <[e-mail]>  Mon,  7 Oct 2002 09:32:21 -0700
-  
+
 sane-backends (1.0.8-1) unstable; urgency=low
 
   * New upstream release.  Many n ew backends.  Many more updated backends.
 
  -- Kevin Dalley <[e-mail]>  Sun,  6 Oct 2002 18:09:28 -0700
-  
+
 sane-backends (1.0.7-3.2) unstable; urgency=high
 
   * Non-Maintainer Upload.
@@ -2212,10 +1977,10 @@
 sane-backends (1.0.7-1) unstable; urgency=low
 
   * new upstream release of sane.
-  
+
   * adds libusb, which includes ScanMaker 3600 drivers (closes: #119393).
   * installs plustek-share.h so that plustek driver can be built (closes:
-    #72341) 
+    #72341)
 
  -- Kevin Dalley <[e-mail]>  Thu, 14 Mar 2002 01:02:21 +0000
 
@@ -2243,7 +2008,7 @@
   * New backends: bh (Bell+Howell Copiscan II series), dc240 (Kodak DC240
     Digital Camera), sm3600 (Microtek ScanMaker 3600), umax_pp (Umax paralell
     port scanners).
-  
+
   * Fixed security bug in saned.c that allowed access to scanner without
     password.
 
@@ -2277,7 +2042,7 @@
 
   * link sane-gimp1.1 with libgimp1.1-1.1.28, which is new library (closes:
     #75029).
-  
+
   * define GIMP_ENABLE_COMPAT_CRUFT to allow use of newer libgimp.
 
  -- Kevin Dalley <[e-mail]>  Sun, 22 Oct 2000 21:52:29 -0700
@@ -2320,7 +2085,7 @@
 sane-gimp1.1 (1.0.1-1999-10-21-11) frozen unstable; urgency=low
 
   * Add Build-Depends to control files for sane and sane-gimp1.1 (closes:
-    #60923). 
+    #60923).
 
  -- Kevin Dalley <[e-mail]>  Mon, 27 Mar 2000 03:16:55 -0800
 
@@ -2461,11 +2226,11 @@
 
 sane (0.74-2) unstable; urgency=low
 
-  * temporarily comment out artec in dll.conf, due to bad interaction with 
+  * temporarily comment out artec in dll.conf, due to bad interaction with
     Umax scanner.  If artec is used as a scanner, uncomment artec from
-    dll.conf 
+    dll.conf
   * automatically generates conffiles, thanks for
-    [e-mail] (fixes bug #26545) 
+    [e-mail] (fixes bug #26545)
   * fixes problem with creation of /usr/share/sane during build process
     (bug #26314)
 
@@ -2510,7 +2275,7 @@
     UMAX backend
 
   * add patches 2-5 to SnapScan backend which allows other scanners
-    to work	
+    to work
 
  -- Kevin Dalley <[e-mail]>  Sat, 31 Jan 1998 17:32:53 -0800
 
@@ -2519,7 +2284,7 @@
   * correct umax-scanner.h so that Astra 1200S is legal
 
  -- Kevin Dalley <[e-mail]>  Sun, 25 Jan 1998 09:44:45 -0800
-	
+
 sane (0.69-1) unstable; urgency=low
 
   * update to version 0.69 of sane
@@ -2559,5 +2324,3 @@
   * first Debian release of sane
 
  -- Kevin Dalley <[e-mail]>  Tue, 18 Nov 1997 21:38:41 -0800
-
-
 
=== modified file 'debian/compat'
--- debian/compat	2010-06-17 01:28:18 +0000
+++ debian/compat	2014-05-25 18:16:31 +0000
@@ -1,1 +1,1 @@
-5
+9
 
=== modified file 'debian/control'
--- debian/control	2012-09-10 07:39:11 +0000
+++ debian/control	2014-05-25 18:16:31 +0000
@@ -2,16 +2,37 @@
 Section: graphics
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Julien BLACHE <[e-mail]>
-Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8.1.3), po-debconf, libv4l-dev [linux-any], libgphoto2-2-dev, libltdl3-dev, libjpeg-dev, libtiff5-dev, libusb-1.0-0-dev [!hurd-i386], libieee1284-3-dev (>= 0.2.10-5) [!hurd-i386], libcam-dev [kfreebsd-any], libavahi-client-dev (>= 0.6.4), gettext, texlive, texlive-latex-extra, autotools-dev, pkg-config, chrpath, xutils-dev
+XSBC-Original-Maintainer: Debian QA Group <[e-mail]>
+Standards-Version: 3.9.4
+Build-Depends:
+ dh-autoreconf,
+ chrpath,
+ debhelper (>= 9),
+ gettext,
+ libavahi-client-dev,
+ libcam-dev [kfreebsd-any],
+ libgphoto2-dev,
+ libieee1284-3-dev [!hurd-i386],
+ libjpeg-dev,
+ libltdl3-dev,
+ libtiff5-dev,
+ libusb-1.0-0-dev [!hurd-i386],
+ libv4l-dev [linux-any],
+ pkg-config,
+ po-debconf,
+ texlive,
+ texlive-latex-extra,
+ xutils-dev
 Homepage: http://www.sane-project.org
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/sane-backends/ubuntu
 
 Package: sane-utils
-Section: graphics
 Architecture: any
-Depends: adduser (>= 3.47), update-inetd (>= 4.31), ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: foreign
+Depends:
+ adduser,
+ update-inetd,
+ ${misc:Depends},
+ ${shlibs:Depends}
 Suggests: avahi-daemon, unpaper
 Replaces: libsane (<< 1.0.11-4)
 Description: API library for scanners -- utilities
@@ -53,8 +74,14 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: adduser (>= 3.47), libsane-common (= ${binary:Version}), udev (>= 0.88-1) [linux-any], acl (>= 2.2.49-4) [linux-any], ${shlibs:Depends}, ${misc:Depends}
-Suggests: avahi-daemon, hpoj, hplip, libsane-extras (>= 1.0.22.1), sane-utils (>= ${binary:Version})
+Depends:
+ acl [linux-any],
+ adduser,
+ libsane-common (= ${binary:Version}),
+ udev [linux-any] | makedev [linux-any],
+ ${misc:Depends},
+ ${shlibs:Depends}
+Suggests: avahi-daemon, hplip, hpoj, libsane-extras, sane-utils (>= ${binary:Version})
 Replaces: libsane-extras (<< 1.0.18.14)
 Description: API library for scanners
  SANE stands for "Scanner Access Now Easy" and is an application
@@ -77,8 +104,19 @@
 Package: libsane-dev
 Section: libdevel
 Architecture: any
-Depends: libsane (= ${binary:Version}), libjpeg-dev, libtiff5-dev, libusb-1.0-0-dev [!hurd-i386], libieee1284-3-dev (>= 0.2.10-5) [!hurd-i386], libcam-dev [kfreebsd-any], libgphoto2-2-dev, libv4l-dev [linux-any], libavahi-client-dev, pkg-config, ${misc:Depends}
-Suggests: libsane-extras-dev (>= 1.0.22.1)
+Depends:
+ libavahi-client-dev,
+ libcam-dev [kfreebsd-any],
+ libgphoto2-dev,
+ libieee1284-3-dev [!hurd-i386],
+ libjpeg-dev,
+ libsane (= ${binary:Version}),
+ libtiff5-dev,
+ libusb-1.0-0-dev [!hurd-i386],
+ libv4l-dev [linux-any],
+ pkg-config,
+ ${misc:Depends}
+Suggests: libsane-extras-dev
 Replaces: libsane-extras-dev (<< 1.0.18.14)
 Description: API development library for scanners [development files]
  SANE stands for "Scanner Access Now Easy" and is an application
@@ -99,7 +137,7 @@
 Priority: extra
 Architecture: any
 Depends: libsane (= ${binary:Version}), ${misc:Depends}
-Suggests: libsane-extras-dbg (>= 1.0.22.1)
+Suggests: libsane-extras-dbg
 Replaces: libsane-extras-dbg (<< 1.0.18.14)
 Description: API development library for scanners [debug symbols]
  SANE stands for "Scanner Access Now Easy" and is an application
 
=== modified file 'debian/copyright'
--- debian/copyright	2010-06-17 01:28:18 +0000
+++ debian/copyright	2014-05-25 18:16:31 +0000
@@ -47,4 +47,4 @@
 
 On Debian systems, the complete text of the GNU General Public License (the
 "COPYING" file referred to above) can be found in the
-/usr/share/common-licenses/GPL file.
+/usr/share/common-licenses/GPL-2 file.
 
=== modified file 'debian/libsane-dev.install'
--- debian/libsane-dev.install	2011-12-05 04:27:00 +0000
+++ debian/libsane-dev.install	2014-05-25 18:16:31 +0000
@@ -1,7 +1,7 @@
+usr/bin/sane-config
 usr/include/
+usr/lib/*/*.a
+usr/lib/*/*.so
 usr/lib/*/sane/*.a
 usr/lib/*/sane/*.so
-usr/lib/*/*.a
-usr/lib/*/*.so
-usr/bin/sane-config
 usr/share/man/man1/sane-config.1
 
=== modified file 'debian/libsane.README.Debian'
--- debian/libsane.README.Debian	2011-03-04 20:37:43 +0000
+++ debian/libsane.README.Debian	2014-05-25 18:16:31 +0000
@@ -75,7 +75,7 @@
 
 This package added a scanner group to your system. We recommend you add to
 this group the users that should be able to access your scanner(s), and
-make sure the appropriate device files (eg. /dev/sg0, ...) are owned by root 
+make sure the appropriate device files (eg. /dev/sg0, ...) are owned by root
 and the scanner group, with permissions set to 0660.
 
 For USB and SCSI scanners, the permissions will be automatically set by udev;
 
=== modified file 'debian/libsane.install'
--- debian/libsane.install	2012-09-10 07:26:02 +0000
+++ debian/libsane.install	2014-05-25 18:16:31 +0000
@@ -1,5 +1,5 @@
+etc/
+usr/lib/*/*.la
+usr/lib/*/*.so.*
+usr/lib/*/sane/*.la
 usr/lib/*/sane/*.so.*
-usr/lib/*/sane/*.la
-usr/lib/*/*.so.*
-usr/lib/*/*.la
-etc/
 
=== modified file 'debian/libsane.postinst'
--- debian/libsane.postinst	2010-06-17 01:28:18 +0000
+++ debian/libsane.postinst	2014-05-25 18:16:31 +0000
@@ -1,17 +1,23 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 case "$1" in
     configure)
+    # Add the scanner system group if it doesn't exist
+    if ! getent group | grep -q "^scanner:"; then
+	echo "Adding scanner group..."
+	addgroup --quiet --system scanner || true
+    fi
 
     if [ "$(uname -s)" = "Linux" ]; then
 	if [ -e /dev/MAKEDEV ]; then
 	    # create /dev/parport*
 	    if [ ! -c /dev/parport0 ]; then
-		(cd /dev && ./MAKEDEV parport) || true 
+		(cd /dev && ./MAKEDEV parport) || true
 	    fi
 	    # create /dev/sg*
 	    if [ ! -c /dev/sg0 ]; then
-		(cd /dev && ./MAKEDEV sg) || true 
+		(cd /dev && ./MAKEDEV sg) || true
 	    fi
 	fi
     fi
 
=== modified file 'debian/libsane.postrm'
--- debian/libsane.postrm	2010-06-17 01:28:18 +0000
+++ debian/libsane.postrm	2014-05-25 18:16:31 +0000
@@ -9,5 +9,3 @@
     echo "Removing directory /etc/sane.d/ ..."
     rmdir --ignore-fail-on-non-empty /etc/sane.d/
 fi
-
-
 
=== modified file 'debian/patches/disable_v4l.patch'
--- debian/patches/disable_v4l.patch	2010-12-23 00:11:31 +0000
+++ debian/patches/disable_v4l.patch	2014-05-25 18:16:31 +0000
@@ -1,5 +1,5 @@
 From: Robert Ancell <[e-mail]>
-Description: Disable V4L backend.
+Description: Disable V4L backend, xsane should not detect TV cards.
 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
 
=== added file 'debian/patches/fix-FTBFS-format-not-a-string-literal-error.patch'
--- debian/patches/fix-FTBFS-format-not-a-string-literal-error.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-FTBFS-format-not-a-string-literal-error.patch	2014-05-25 18:16:31 +0000
@@ -0,0 +1,30 @@
+From: Markus Koschany <[e-mail]>
+Date: Thu, 27 Jun 2013 12:12:40 +0200
+Subject: fix FTBFS format not a string literal error
+
+---
+ frontend/scanimage.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/frontend/scanimage.c b/frontend/scanimage.c
+index ce958df..8f4a727 100644
+--- a/frontend/scanimage.c
++++ b/frontend/scanimage.c
+@@ -1893,7 +1893,7 @@ main (int argc, char **argv)
+ 				printf (start, int_arg);
+ 				break;
+ 			      case 0:
+-				printf (start);
++				printf ("%s", start);
+ 				break;
+ 			      }
+ 			    *percent = cc;
+@@ -1907,7 +1907,7 @@ main (int argc, char **argv)
+ 			  }
+ 		      }
+ 		    if (*start)
+-		      printf (start);
++		      printf ("%s", start);
+ 		  }
+ 	      }
+ 	    if (i == 0 && ch != 'f')
 
=== added file 'debian/patches/fix-for-broken-tpu-scan.patch'
--- debian/patches/fix-for-broken-tpu-scan.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-for-broken-tpu-scan.patch	2014-05-25 18:16:31 +0000
@@ -0,0 +1,19 @@
+Description: Fix for broken tpu scan, to unbreak Canon pixma MP970
+Author: Rolf Bensch <[e-mail]>
+Bug-Ubuntu: https://launchpad.net/bugs/1096612
+
+diff --git a/backend/pixma_mp810.c b/backend/pixma_mp810.c
+index 09b5d45..f523857 100644
+--- a/backend/pixma_mp810.c
++++ b/backend/pixma_mp810.c
+@@ -803,6 +803,7 @@ send_scan_param (pixma_t * s)
+         {
+           data[0x00] = 0x04;
+           data[0x01] = 0x02;
++          data[0x1e] = 0x02;  /* NB: CanoScan 8800F: 0x02->negatives, 0x01->positives, paper->0x00 */
+         }
+       data[0x02] = 0x01;
+       if (is_scanning_from_adfdup (s))
+-- 
+1.8.1.2
+
 
=== added file 'debian/patches/fix-gl646-setup-registers.patch'
--- debian/patches/fix-gl646-setup-registers.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-gl646-setup-registers.patch	2014-05-25 18:16:31 +0000
@@ -0,0 +1,67 @@
+Index: sane-backends-1.0.23/backend/genesys_gl646.c
+===================================================================
+--- sane-backends-1.0.23.orig/backend/genesys_gl646.c	2014-05-09 11:04:45.739727050 +1200
++++ sane-backends-1.0.23/backend/genesys_gl646.c	2014-05-09 11:04:45.735727050 +1200
+@@ -551,7 +551,7 @@
+   i = 0;
+   dpi = 9600;
+   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+-  while (sensor_master[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       /* computes distance and keep mode if it is closer than previous */
+       if (sensor == sensor_master[i].sensor
+@@ -585,7 +585,7 @@
+   dpi = 0;
+   dist = 9600;
+   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+-  while (sensor_master[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       /* exit on perfect match */
+       if (sensor == sensor_master[i].sensor
+@@ -628,7 +628,7 @@
+ 
+   i = 0;
+   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+-  while (sensor_master[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       /* exit on perfect match */
+       if (sensor == sensor_master[i].sensor
+@@ -659,7 +659,7 @@
+ 
+   i = 0;
+   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+-  while (sensor_master[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       /* exit on perfect match */
+       if (sensor == sensor_master[i].sensor
+@@ -745,7 +745,7 @@
+    * sensor mode setting */
+   i = 0;
+   nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+-  while (sensor_master[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       if (dev->model->ccd_type == sensor_master[i].sensor
+ 	  && sensor_master[i].dpi == xresolution
+@@ -767,7 +767,7 @@
+    * motor mode setting */
+   i = 0;
+   nb = sizeof (motor_master) / sizeof (Motor_Master);
+-  while (motor_master[i].motor != -1 && i < nb)
++  while (i < nb)
+     {
+       if (dev->model->motor_type == motor_master[i].motor
+ 	  && motor_master[i].dpi == resolution
+@@ -788,7 +788,7 @@
+   /* now we can search for the specific sensor settings */
+   i = 0;
+   nb = sizeof (sensor_settings) / sizeof (Sensor_Settings);
+-  while (sensor_settings[i].sensor != -1 && i < nb)
++  while (i < nb)
+     {
+       if (sensor->sensor == sensor_settings[i].sensor
+ 	  && sensor->cksel == sensor_settings[i].cksel)
 
=== added file 'debian/patches/frontend_libs.patch'
--- debian/patches/frontend_libs.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/frontend_libs.patch	2014-05-25 18:16:31 +0000
@@ -0,0 +1,46 @@
+From: Markus Koschany <[e-mail]>
+Date: Sun, 30 Jun 2013 15:20:24 +0200
+Subject: frontend_libs
+
+Only link frontends against the libraries they need
+Reduce the dependencies on frontends by linking in only the required
+libraries.
+---
+ frontend/Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: sane-backends-1.0.23/frontend/Makefile.in
+===================================================================
+--- sane-backends-1.0.23.orig/frontend/Makefile.in	2012-08-15 11:49:38.000000000 +1000
++++ sane-backends-1.0.23/frontend/Makefile.in	2013-12-15 23:44:08.000000000 +1100
+@@ -143,7 +143,7 @@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS =
+ LIBTOOL = @LIBTOOL@
+ LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
+ LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
+@@ -265,7 +265,7 @@
+ 
+ saned_SOURCES = saned.c
+ saned_LDADD = ../backend/libsane.la ../sanei/libsanei.la ../lib/liblib.la \
+-             ../lib/libfelib.la @SYSLOG_LIBS@
++             ../lib/libfelib.la @SYSLOG_LIBS@ @AVAHI_LIBS@
+ 
+ test_SOURCES = test.c
+ test_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la
+Index: sane-backends-1.0.23/frontend/Makefile.am
+===================================================================
+--- sane-backends-1.0.23.orig/frontend/Makefile.am	2013-12-15 23:52:14.739264532 +1100
++++ sane-backends-1.0.23/frontend/Makefile.am	2013-12-15 23:52:19.967332543 +1100
+@@ -22,7 +22,7 @@
+ 
+ saned_SOURCES = saned.c
+ saned_LDADD = ../backend/libsane.la ../sanei/libsanei.la ../lib/liblib.la \
+-             ../lib/libfelib.la @SYSLOG_LIBS@
++             ../lib/libfelib.la @SYSLOG_LIBS@ @AVAHI_LIBS@
+ 
+ test_SOURCES = test.c
+ test_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la
 
=== added file 'debian/patches/kfreebsd.patch'
--- debian/patches/kfreebsd.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/kfreebsd.patch	2014-05-25 18:16:31 +0000
@@ -0,0 +1,17 @@
+description: Fix build failure on kfreebsd (closes: #680234)
+author: Petr Salinger
+Index: sane-backends-1.0.22/backend/umax_pp_low.c
+===================================================================
+--- sane-backends-1.0.22.orig/backend/umax_pp_low.c	2010-12-01 18:49:58.000000000 -0500
++++ sane-backends-1.0.22/backend/umax_pp_low.c	2012-07-15 17:10:47.000000000 -0400
+@@ -73,8 +73,10 @@
+ #endif
+ 
+ #ifdef HAVE_MACHINE_CPUFUNC_H
++#ifndef __GLIBC__
+ #include <machine/cpufunc.h>
+ #endif
++#endif
+ 
+ #ifdef HAVE_I386_SET_IOPERM
+ #include <machine/sysarch.h>
 
=== modified file 'debian/patches/libsane_deps.patch'
--- debian/patches/libsane_deps.patch	2011-03-04 20:37:43 +0000
+++ debian/patches/libsane_deps.patch	2014-05-25 18:16:31 +0000
@@ -1,22 +1,43 @@
-Description: Reduce libsane.so dependencies to the bare minimum
- Trim dependencies to keep only what's really required by libsane.so
- (aka dll backend).
-Author: Julien BLACHE <[e-mail]>
-
-Index: sane-backends-1.0.22/backend/Makefile.in
+From: Markus Koschany <[e-mail]>
+Date: Sun, 30 Jun 2013 18:58:59 +0200
+Subject: libsane_deps
+
+Reduce libsane.so dependencies to the bare minimum.
+Trim dependencies to keep only what's really required by libsane.so
+(aka dll backend).
+Original patch author: Julien BLACHE <[e-mail]>
+---
+ backend/Makefile.in | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+Index: sane-backends-1.0.23/backend/Makefile.in
 ===================================================================
---- sane-backends-1.0.22.orig/backend/Makefile.in	2011-01-30 19:50:55.000000000 +0100
-+++ sane-backends-1.0.22/backend/Makefile.in	2011-02-14 18:58:26.341016002 +0100
-@@ -2411,10 +2411,10 @@
+--- sane-backends-1.0.23.orig/backend/Makefile.in	2013-12-15 23:44:08.000000000 +1100
++++ sane-backends-1.0.23/backend/Makefile.in	2013-12-15 23:44:08.000000000 +1100
+@@ -2472,10 +2472,9 @@
  nodist_libsane_la_SOURCES = dll-s.c
  libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
  libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
--libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo $(DL_LIBS) $(LIBV4L_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(GPHOTO2_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(AVAHI_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
+-libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo $(DL_LIBS) $(LIBV4L_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(GPHOTO2_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(AVAHI_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
+-
 +libsane_la_LIBADD = $(COMMON_LIBS) libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_config.lo ../sanei/sanei_constrain_value.lo $(DL_LIBS)
- 
  # WARNING: Automake is getting this wrong so have to do it ourselves.
--libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo @SANEI_SANEI_JPEG_LO@
+-libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo @SANEI_SANEI_JPEG_LO@
 +libsane_la_DEPENDENCIES = libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_config.lo
  all: $(BUILT_SOURCES)
  	$(MAKE) $(AM_MAKEFLAGS) all-am
  
+Index: sane-backends-1.0.23/backend/Makefile.am
+===================================================================
+--- sane-backends-1.0.23.orig/backend/Makefile.am	2012-07-25 10:02:39.000000000 +1000
++++ sane-backends-1.0.23/backend/Makefile.am	2013-12-15 23:50:15.613715057 +1100
+@@ -1120,7 +1120,7 @@
+ nodist_libsane_la_SOURCES =  dll-s.c
+ libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
+ libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
+-libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo $(DL_LIBS) $(LIBV4L_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(GPHOTO2_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(AVAHI_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
++libsane_la_LIBADD = $(COMMON_LIBS) libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_config.lo ../sanei/sanei_constrain_value.lo $(DL_LIBS)
+ 
+ # WARNING: Automake is getting this wrong so have to do it ourselves.
+-libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo @SANEI_SANEI_JPEG_LO@
++libsane_la_DEPENDENCIES = libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_config.lo
 
=== modified file 'debian/patches/multiarch_dll_search_path.patch'
--- debian/patches/multiarch_dll_search_path.patch	2012-09-10 07:14:52 +0000
+++ debian/patches/multiarch_dll_search_path.patch	2014-05-25 18:16:31 +0000
@@ -3,11 +3,11 @@
  but keep /usr/lib/sane as a fallback for now.
 Author: Julien BLACHE <[e-mail]>
 
-Index: sane-backends-1.0.22/backend/dll.c
+Index: sane-backends-1.0.23/backend/dll.c
 ===================================================================
---- sane-backends-1.0.22.orig/backend/dll.c	2011-06-13 15:35:40.743153154 +0200
-+++ sane-backends-1.0.22/backend/dll.c	2011-06-13 16:39:05.213837175 +0200
-@@ -428,7 +428,7 @@
+--- sane-backends-1.0.23.orig/backend/dll.c	2012-08-10 10:33:29.000000000 +1000
++++ sane-backends-1.0.23/backend/dll.c	2013-12-15 23:44:08.000000000 +1100
+@@ -430,7 +430,7 @@
  
    if (path)
      {
@@ -16,7 +16,7 @@
        src = malloc (src_len);
        if (!src)
  	{
-@@ -436,12 +436,11 @@
+@@ -438,12 +438,11 @@
  	  return SANE_STATUS_NO_MEM;
  	}
        orig_src = src;
@@ -31,11 +31,11 @@
        if (!src)
  	{
  	  DBG (1, "load: strdup failed: %s\n", strerror (errno));
-Index: sane-backends-1.0.22/backend/Makefile.in
+Index: sane-backends-1.0.23/backend/Makefile.in
 ===================================================================
---- sane-backends-1.0.22.orig/backend/Makefile.in	2011-06-13 16:39:27.185757336 +0200
-+++ sane-backends-1.0.22/backend/Makefile.in	2011-06-13 16:40:25.145547849 +0200
-@@ -1636,7 +1636,7 @@
+--- sane-backends-1.0.23.orig/backend/Makefile.in	2012-08-15 11:49:37.000000000 +1000
++++ sane-backends-1.0.23/backend/Makefile.in	2013-12-15 23:50:32.000000000 +1100
+@@ -1680,7 +1680,7 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -44,3 +44,16 @@
  AM_LDFLAGS = @STRICT_LDFLAGS@
  # The -rpath option is added because we are creating _LTLIBRARIES based
  # on configure substitution.  This causes automake to not know the
+Index: sane-backends-1.0.23/backend/Makefile.am
+===================================================================
+--- sane-backends-1.0.23.orig/backend/Makefile.am	2013-12-15 23:50:32.000000000 +1100
++++ sane-backends-1.0.23/backend/Makefile.am	2013-12-15 23:54:36.113103917 +1100
+@@ -24,7 +24,7 @@
+ SCSI_LIBS = @SCSI_LIBS@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ 
+-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="$(libdir)/sane"
++AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="$(libdir)/sane" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\""
+ 
+ V_MAJOR = @V_MAJOR@
+ V_MINOR = @V_MINOR@
 
=== modified file 'debian/patches/multiarch_manpages_libdir.patch'
--- debian/patches/multiarch_manpages_libdir.patch	2012-09-10 07:15:19 +0000
+++ debian/patches/multiarch_manpages_libdir.patch	2014-05-25 18:16:31 +0000
@@ -3,11 +3,24 @@
  a generic /usr/lib/arch_triplet/sane path instead.
 Author: Julien BLACHE <[e-mail]>
 
-Index: sane-backends-1.0.22/doc/Makefile.in
-===================================================================
---- sane-backends-1.0.22.orig/doc/Makefile.in	2011-06-13 15:32:13.059822473 +0200
-+++ sane-backends-1.0.22/doc/Makefile.in	2011-06-13 15:32:40.479734324 +0200
-@@ -804,7 +804,7 @@
+Index: sane-backends-1.0.23/doc/Makefile.in
+===================================================================
+--- sane-backends-1.0.23.orig/doc/Makefile.in	2012-08-15 11:49:38.000000000 +1000
++++ sane-backends-1.0.23/doc/Makefile.in	2013-12-15 23:48:08.000000000 +1100
+@@ -809,7 +809,7 @@
+ 	@sed -e 's|@DATADIR@|$(datadir)|g' \
+ 	  -e 's|@CONFIGDIR@|$(configdir)|g' \
+ 	  -e 's|@DOCDIR@|$(docdir)|g' \
+-	  -e 's|@LIBDIR@|$(libdir)/sane|g' \
++	  -e 's|@LIBDIR@|/usr/lib/arch_triplet/sane|g' \
+ 	  -e 's|@BINDIR@|$(bindir)|g' \
+ 	  -e 's|@SBINDIR@|$(sbindir)|g' \
+ 	  -e 's|@PACKAGEVERSION@|$(package_version)|g' $^ >$@
+Index: sane-backends-1.0.23/doc/Makefile.am
+===================================================================
+--- sane-backends-1.0.23.orig/doc/Makefile.am	2012-07-01 12:00:44.000000000 +1000
++++ sane-backends-1.0.23/doc/Makefile.am	2013-12-15 23:53:10.183985845 +1100
+@@ -108,7 +108,7 @@
  	@sed -e 's|@DATADIR@|$(datadir)|g' \
  	  -e 's|@CONFIGDIR@|$(configdir)|g' \
  	  -e 's|@DOCDIR@|$(docdir)|g' \
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-12-05 04:27:00 +0000
+++ debian/patches/series	2014-05-25 18:16:31 +0000
@@ -1,24 +1,16 @@
-frontends_libs.patch
+dll_backend_conf.patch
+multiarch_dll_search_path.patch
+multiarch_manpages_libdir.patch
+kfreebsd.patch
+fix-FTBFS-format-not-a-string-literal-error.patch
+frontend_libs.patch
 libsane_deps.patch
-disable_rpath.patch
-sane-config_and_pkg-config_fixes.patch
-dll_backend_conf.patch
+trim-libraries-in-sane-backends.pc.in.patch
 unneeded_doc.patch
 sane-desc.c_debian_mods.patch
-multiarch_dll_search_path.patch
-multiarch_manpages_libdir.patch
-
-# New features
-sane-desc_udev+acl.patch
-udev_usb_suspend.patch
-
-# Fixes below this line
-fix_v4l_build.patch
-xerox_mfp_fix_usb_devices.patch
-xerox_mfp_add_scx_4623fw.patch
-hurd_path_max_fix.patch
-scanimage_man_batch_start.patch
 
 # from Ubuntu
 disable_v4l.patch
 fix_avahi_error_paths.patch
+fix-for-broken-tpu-scan.patch
+fix-gl646-setup-registers.patch 
 
=== added file 'debian/patches/trim-libraries-in-sane-backends.pc.in.patch'
--- debian/patches/trim-libraries-in-sane-backends.pc.in.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/trim-libraries-in-sane-backends.pc.in.patch	2014-05-25 18:16:31 +0000
@@ -0,0 +1,26 @@
+From: Markus Koschany <[e-mail]>
+Date: Sun, 30 Jun 2013 19:13:54 +0200
+Subject: trim libraries in sane-backends.pc.in
+
+Update the original sane-config_and_pkg-config_fixes.patch from Julien BLACHE.
+Patching RPATH related flags is no longer necessary. Still trim the libraries
+in sane-backends.pc.in to the bare minimum for what is needed for libsane.
+---
+ tools/sane-backends.pc.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/sane-backends.pc.in b/tools/sane-backends.pc.in
+index b4d9731..6124747 100644
+--- a/tools/sane-backends.pc.in
++++ b/tools/sane-backends.pc.in
+@@ -2,8 +2,8 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-ldflags=@LDFLAGS@ @GPHOTO2_LDFLAGS@
+-libs=@LIBS@ @DL_LIBS@ @LIBV4L_LIBS@ @MATH_LIB@ @TIFF_LIBS@ @JPEG_LIBS@ @GPHOTO2_LIBS@ @SOCKET_LIBS@ @AVAHI_LIBS@ @USB_LIBS@ @SCSI_LIBS@ @RESMGR_LIBS@
++ldflags=@LDFLAGS@
++libs=@LIBS@
+ 
+ Name: SANE Backends
+ Description: Backends for SANE, the universal scanner interface
 
=== modified file 'debian/patches/unneeded_doc.patch'
--- debian/patches/unneeded_doc.patch	2011-03-04 20:37:43 +0000
+++ debian/patches/unneeded_doc.patch	2014-05-25 18:16:31 +0000
@@ -1,14 +1,23 @@
-Description: Avoid generating some docs we don't want
- Do not generate some documentation we do not want; do not include
- sane.png in the html documentation, as it is not distributed in the
- source tarball.
-Author: Julien BLACHE <[e-mail]>
-
-Index: sane-backends-1.0.22/Makefile.in
+From: Markus Koschany <[e-mail]>
+Date: Sun, 30 Jun 2013 19:29:40 +0200
+Subject: unneeded_doc
+
+Avoid generating some docs we don't want.
+Do not generate some documentation we do not want; do not include
+sane.png in the html documentation, as it is not distributed in the
+source tarball.
+
+Original Author: Julien BLACHE <[e-mail]>
+---
+ Makefile.in     | 6 +-----
+ doc/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+Index: sane-backends-1.0.23/Makefile.in
 ===================================================================
---- sane-backends-1.0.22.orig/Makefile.in	2011-01-30 19:50:56.000000000 +0100
-+++ sane-backends-1.0.22/Makefile.in	2011-02-14 19:02:55.957016001 +0100
-@@ -295,11 +295,7 @@
+--- sane-backends-1.0.23.orig/Makefile.in	2012-08-15 11:49:39.000000000 +1000
++++ sane-backends-1.0.23/Makefile.in	2013-12-15 23:44:08.000000000 +1100
+@@ -298,11 +298,7 @@
  top_srcdir = @top_srcdir@
  SUBDIRS = include lib sanei backend frontend tools doc po
  DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite
@@ -21,12 +30,12 @@
  
  EXTRA_DIST = ChangeLog-1.0.0 ChangeLog-1.0.1  ChangeLog-1.0.2 \
   ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 ChangeLog-1.0.6 \
-Index: sane-backends-1.0.22/doc/Makefile.in
+Index: sane-backends-1.0.23/doc/Makefile.in
 ===================================================================
---- sane-backends-1.0.22.orig/doc/Makefile.in	2011-01-30 19:50:55.000000000 +0100
-+++ sane-backends-1.0.22/doc/Makefile.in	2011-02-14 19:02:55.957016001 +0100
-@@ -333,7 +333,7 @@
- MAN2HTML = nroff -man |\
+--- sane-backends-1.0.23.orig/doc/Makefile.in	2013-12-15 23:44:08.000000000 +1100
++++ sane-backends-1.0.23/doc/Makefile.in	2013-12-15 23:44:08.000000000 +1100
+@@ -337,7 +337,7 @@
+ MAN2HTML = nroff -c -man |\
  	  man2html -compress -topm 6 -botm 6 -nodepage -title $${page} \
            -cgiurl '$$title.$$section.html'|\
 -	  sed 's,<BODY>,<BODY BGCOLOR=\#FFFFFF TEXT=\#000000><H1 ALIGN=CENTER><IMG SRC="/images/sane.png" HEIGHT=117 WIDTH=346></H1>,'
@@ -34,3 +43,20 @@
  
  beman5dir = $(mandir)/man5
  BEDOCS = canon/canon.changes canon/canon.install2700F.txt \
+Index: sane-backends-1.0.23/Makefile.am
+===================================================================
+--- sane-backends-1.0.23.orig/Makefile.am	2011-11-22 07:17:48.000000000 +1100
++++ sane-backends-1.0.23/Makefile.am	2013-12-15 23:47:59.435944300 +1100
+@@ -7,11 +7,7 @@
+ SUBDIRS = include lib sanei backend frontend tools doc po
+ DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite
+ 
+-dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \
+- README README.aix README.beos README.darwin README.djpeg README.freebsd \
+- README.hp-ux README.linux README.netbsd README.openbsd README.os2 \
+- README.solaris README.unixware2 README.unixware7 README.windows \
+- README.zeta
++dist_doc_DATA = README AUTHORS NEWS PROBLEMS PROJECTS
+ EXTRA_DIST = ChangeLog-1.0.0 ChangeLog-1.0.1  ChangeLog-1.0.2 \
+  ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 ChangeLog-1.0.6 \
+  ChangeLog-1.0.7 ChangeLog-1.0.8 ChangeLog-1.0.9 ChangeLog-1.0.10 \
 
=== added file 'debian/po/ca.po'
--- debian/po/ca.po	1970-01-01 00:00:00 +0000
+++ debian/po/ca.po	2014-05-25 18:16:31 +0000
@@ -0,0 +1,116 @@
+# sane-backends translation to Catalan
+# Copyright (C) 2010 Software in the Public Interest
+# This file is distributed under the same license as the PACKAGE package.
+# Innocent De Marchi <[e-mail]>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.0.22-6\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-12-12 13:14+0100\n"
+"PO-Revision-Date: 2011-09-30 19:07+0100\n"
+"Last-Translator: Innocent De Marchi <[e-mail]>\n"
+"Language-Team: catalan <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Catalan\n"
+"X-Poedit-Country: SPAIN\n"
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid "Enable saned as a standalone server?"
+msgstr "Activar saned com un servidor independent?"
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid ""
+"The saned server, when enabled, makes scanners available over the network."
+msgstr ""
+"El servidor saned, quan està activada, permet tenir els escànners "
+"disponibles a la xarxa."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid ""
+"There are two ways of running saned:\n"
+" - as an inetd service, started by the inetd superserver. In this mode,\n"
+"saned is started on demand when a client connects to the server;\n"
+" - as a standalone daemon, started at system boot. In this mode, saned\n"
+"runs in the background all by itself and listens for client connections."
+msgstr ""
+"Hi ha dues maneres d'executar saned:\n"
+" - com un servei d'inetd, iniciat pel super servidor inetd. En aquesta "
+"modalitat,\n"
+"saned s'inicia en la demanda quan un client es connecta al servidor;\n"
+" - com un dimoni independent, en l'arrencada del sistema. En aquesta "
+"modalitat, saned\n"
+"s'executa en segon pla per si mateix i escolta les connexions dels clients."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid ""
+"When run in standalone mode, saned advertises itself on the network and can "
+"be detected automatically by the SANE clients with no configuration on the "
+"client side. You still need to configure the server to accept connections "
+"from your clients. This feature is experimental and requires a running Avahi "
+"daemon."
+msgstr ""
+"Quan s'executa en mode independent, saned s'anuncia a la xarxa i pot ser "
+"detectat automàticament pels clients SANE sense que els clients hagin "
+"d'ésser configurats. Tot i així, és necessari configurar el servidor per "
+"acceptar connexions dels seus clients. Aquesta característica és "
+"experimental i requereix que el dimoni Avahi estigui en funcionament."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid "Accept this option if you want to make use of this feature."
+msgstr "Acceptar aquesta opció si desitja fer ús d'aquesta funció."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid "Add saned user to the scanner group?"
+msgstr "Afegir l'usuari saned al grup escànner?"
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid ""
+"The saned server, when enabled, makes scanners available over the network. "
+"By applying different permissions to the different scanners connected to "
+"your machine, you can control which ones will be made available over the "
+"network."
+msgstr ""
+"El servidor saned, quan està activat, fa que els escànners estiguin "
+"disponibles a la xarxa. Mitjançant l'aplicació de diferents permisos als "
+"diferents escànners connectats a la vostra màquina, podeu controlar quins "
+"estaran disponibles a la xarxa."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid ""
+"Read /usr/share/doc/sane-utils/README.Debian for details on how to manage "
+"permissions for saned. By default, saned is run under the saned user and "
+"group."
+msgstr ""
+"Llegiu «/usr/share/doc/sane-utils/README.Debian» per a més detalls sobre la "
+"forma d'administrar els permisos de saned. Per defecte, saned s'executa sota "
+"l'usuari i grup saned."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid ""
+"Accept this option if you want to make all your scanners available over the "
+"network without restriction."
+msgstr ""
+"Acceptau aquesta opció si voleu que tots els escànners estiguin disponibles "
+"a la xarxa sense restriccions."
 
=== modified file 'debian/po/cs.po'
--- debian/po/cs.po	2011-03-04 20:37:43 +0000
+++ debian/po/cs.po	2014-05-25 18:16:31 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2010-09-28 12:02+0200\n"
 "Last-Translator: Miroslav Kure <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,8 +43,8 @@
 "Existují dva způsoby spouštění saned:\n"
 " - jako služba inetd, kterou startuje superserver inetd. V tomto režimu je "
 "saned spuštěn pouze v případě, že se klient snaží připojit k serveru;\n"
-" - jako samostatný daemon spouštěný při zavádění systému. V tomto "
-"režimu běží saned celou dobu na pozadí a sám naslouchá příchozím spojením."
+" - jako samostatný daemon spouštěný při zavádění systému. V tomto režimu "
+"běží saned celou dobu na pozadí a sám naslouchá příchozím spojením."
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/da.po'
--- debian/po/da.po	2011-03-04 20:37:43 +0000
+++ debian/po/da.po	2014-05-25 18:16:31 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2010-10-09 13:26+0100\n"
 "Last-Translator: Joe Hansen <[e-mail]>\n"
 "Language-Team: Danish <[e-mail]> \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -55,11 +56,11 @@
 "from your clients. This feature is experimental and requires a running Avahi "
 "daemon."
 msgstr ""
-"Når kørt i enkeltstående tilstand, reklamerer saned for sig selv på netværket "
-"og kan detekteres automatisk af SANE-klienter uden nogen konfiguration fra "
-"klientsiden. Du skal stadig konfigurere serveren til at acceptere forbindelserne "
-"fra dine klienter. Denne funktion er eksperimentel og kræver en kørende "
-"Avahidæmon."
+"Når kørt i enkeltstående tilstand, reklamerer saned for sig selv på "
+"netværket og kan detekteres automatisk af SANE-klienter uden nogen "
+"konfiguration fra klientsiden. Du skal stadig konfigurere serveren til at "
+"acceptere forbindelserne fra dine klienter. Denne funktion er eksperimentel "
+"og kræver en kørende Avahidæmon."
 
 #. Type: boolean
 #. Description
@@ -82,10 +83,10 @@
 "your machine, you can control which ones will be made available over the "
 "network."
 msgstr ""
-"Sanedserveren, når aktiveret, gør skannere tilgængelige over netværket. "
-"Ved at anvende forskellige rettigheder for de forskellige skannere "
-"tilsluttet din maskine, kan du kontrollere hvilke, som vil være tilgængelige "
-"over netværket."
+"Sanedserveren, når aktiveret, gør skannere tilgængelige over netværket. Ved "
+"at anvende forskellige rettigheder for de forskellige skannere tilsluttet "
+"din maskine, kan du kontrollere hvilke, som vil være tilgængelige over "
+"netværket."
 
 #. Type: boolean
 #. Description
@@ -96,8 +97,8 @@
 "group."
 msgstr ""
 "Læs /usr/share/doc/sane-utils/README.Debian for detaljer om hvordan du "
-"håndterer rettigheder for saned. Som standard køres saned under sanedbrugeren "
-"og -gruppen."
+"håndterer rettigheder for saned. Som standard køres saned under "
+"sanedbrugeren og -gruppen."
 
 #. Type: boolean
 #. Description
@@ -106,5 +107,5 @@
 "Accept this option if you want to make all your scanners available over the "
 "network without restriction."
 msgstr ""
-"Accepter denne indstilling hvis du ønsker at gøre alle dine skannere tilgængelige "
-"over netværket uden begrænsninger."
+"Accepter denne indstilling hvis du ønsker at gøre alle dine skannere "
+"tilgængelige over netværket uden begrænsninger."
 
=== modified file 'debian/po/de.po'
--- debian/po/de.po	2010-06-17 01:28:18 +0000
+++ debian/po/de.po	2014-05-25 18:16:31 +0000
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2009-12-27 10:20+0100\n"
 "Last-Translator: Helge Kreutzmann <[e-mail]>\n"
 "Language-Team: de <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
=== modified file 'debian/po/es.po'
--- debian/po/es.po	2011-03-04 20:37:43 +0000
+++ debian/po/es.po	2014-05-25 18:16:31 +0000
@@ -35,6 +35,7 @@
 "PO-Revision-Date: 2010-10-10 14:03+0100\n"
 "Last-Translator: Camaleón <[e-mail]>\n"
 "Language-Team: Debian Spanish team <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,19 +49,15 @@
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-msgid "The saned server, when enabled, makes scanners available over the network."
-msgstr "Se puede acceder a los escáneres a través de la red cuando se activa el servidor saned."
+msgid ""
+"The saned server, when enabled, makes scanners available over the network."
+msgstr ""
+"Se puede acceder a los escáneres a través de la red cuando se activa el "
+"servidor saned."
 
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-#| msgid ""
-#| "There are two ways of running saned:\n"
-#| " - as an inetd service, started by the inetd superserver. In this mode,\n"
-#| "saned is started as needed by inetd whenever a client tries to connect to "
-#| "the server;\n"
-#| " - as a standalone daemon, started at system boot. In this mode, saned\n"
-#| "runs in the background all by itself and listens for client connections."
 msgid ""
 "There are two ways of running saned:\n"
 " - as an inetd service, started by the inetd superserver. In this mode,\n"
@@ -69,21 +66,30 @@
 "runs in the background all by itself and listens for client connections."
 msgstr ""
 "Hay dos maneras de ejecutar saned:\n"
-" - como un servicio inetd, iniciado por el súper servidor inetd. En este modo,\n"
-"saned se inicia bajo demanda cada vez que el cliente intenta conectarse al servidor;\n"
-" - como un demonio independiente, lanzado al inicio del sistema. En este modo, saned\n"
-"se ejecuta en segundo plano a sí mismo y escucha las conexiones de los clientes."
+" - como un servicio inetd, iniciado por el súper servidor inetd. En este "
+"modo,\n"
+"saned se inicia bajo demanda cada vez que el cliente intenta conectarse al "
+"servidor;\n"
+" - como un demonio independiente, lanzado al inicio del sistema. En este "
+"modo, saned\n"
+"se ejecuta en segundo plano a sí mismo y escucha las conexiones de los "
+"clientes."
 
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-#| msgid ""
-#| "When run in standalone mode, saned advertises itself on the network and "
-#| "can be detected automatically by the SANE clients with no configuration "
-#| "on the client side. You still need to configure the server to accept "
-#| "connections from your clients."
-msgid "When run in standalone mode, saned advertises itself on the network and can be detected automatically by the SANE clients with no configuration on the client side. You still need to configure the server to accept connections from your clients. This feature is experimental and requires a running Avahi daemon."
-msgstr "En modo independiente, saned se anuncia a sí mismo en la red y puede detectarse automáticamente por los clientes SANE sin configuración por parte de los mismos. Aun así, será necesario que configure el servidor para aceptar conexiones de los clientes. Esta característica es experimental y necesita que el demonio Avahi esté en ejecución."
+msgid ""
+"When run in standalone mode, saned advertises itself on the network and can "
+"be detected automatically by the SANE clients with no configuration on the "
+"client side. You still need to configure the server to accept connections "
+"from your clients. This feature is experimental and requires a running Avahi "
+"daemon."
+msgstr ""
+"En modo independiente, saned se anuncia a sí mismo en la red y puede "
+"detectarse automáticamente por los clientes SANE sin configuración por parte "
+"de los mismos. Aun así, será necesario que configure el servidor para "
+"aceptar conexiones de los clientes. Esta característica es experimental y "
+"necesita que el demonio Avahi esté en ejecución."
 
 #. Type: boolean
 #. Description
@@ -100,18 +106,35 @@
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:2001
-msgid "The saned server, when enabled, makes scanners available over the network. By applying different permissions to the different scanners connected to your machine, you can control which ones will be made available over the network."
-msgstr "Se puede acceder a los escáneres a través de la red cuando está activado el servidor saned. Puede controlar qué dispositivos se ofrecerán de esta forma aplicando distintos permisos a los distintos escáneres conectados a su equipo."
-
-#. Type: boolean
-#. Description
-#: ../sane-utils.templates:2001
-msgid "Read /usr/share/doc/sane-utils/README.Debian for details on how to manage permissions for saned. By default, saned is run under the saned user and group."
-msgstr "Consulte «/usr/share/doc/sane-utils/README.Debian» para obtener detalles sobre cómo gestionar los permisos para saned. De manera predeterminada, saned se ejecuta con el usuario y grupo saned."
-
-#. Type: boolean
-#. Description
-#: ../sane-utils.templates:2001
-msgid "Accept this option if you want to make all your scanners available over the network without restriction."
-msgstr "Acepte esta opción si desea que todos los escáneres estén disponibles a través de la red sin restricciones."
-
+msgid ""
+"The saned server, when enabled, makes scanners available over the network. "
+"By applying different permissions to the different scanners connected to "
+"your machine, you can control which ones will be made available over the "
+"network."
+msgstr ""
+"Se puede acceder a los escáneres a través de la red cuando está activado el "
+"servidor saned. Puede controlar qué dispositivos se ofrecerán de esta forma "
+"aplicando distintos permisos a los distintos escáneres conectados a su "
+"equipo."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid ""
+"Read /usr/share/doc/sane-utils/README.Debian for details on how to manage "
+"permissions for saned. By default, saned is run under the saned user and "
+"group."
+msgstr ""
+"Consulte «/usr/share/doc/sane-utils/README.Debian» para obtener detalles "
+"sobre cómo gestionar los permisos para saned. De manera predeterminada, "
+"saned se ejecuta con el usuario y grupo saned."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid ""
+"Accept this option if you want to make all your scanners available over the "
+"network without restriction."
+msgstr ""
+"Acepte esta opción si desea que todos los escáneres estén disponibles a "
+"través de la red sin restricciones."
 
=== modified file 'debian/po/eu.po'
--- debian/po/eu.po	2011-03-04 20:37:43 +0000
+++ debian/po/eu.po	2014-05-25 18:16:31 +0000
@@ -28,7 +28,8 @@
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-msgid "The saned server, when enabled, makes scanners available over the network."
+msgid ""
+"The saned server, when enabled, makes scanners available over the network."
 msgstr ""
 "Saned zerbitzariak, gaituta dagoenean, eskanerrak sarearen bidez eskuragarri "
 "egiten ditu."
@@ -36,13 +37,6 @@
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-#| msgid ""
-#| "There are two ways of running saned:\n"
-#| " - as an inetd service, started by the inetd superserver. In this mode,\n"
-#| "saned is started as needed by inetd whenever a client tries to connect to "
-#| "the server;\n"
-#| " - as a standalone daemon, started at system boot. In this mode, saned\n"
-#| "runs in the background all by itself and listens for client connections."
 msgid ""
 "There are two ways of running saned:\n"
 " - as an inetd service, started by the inetd superserver. In this mode,\n"
@@ -60,11 +54,6 @@
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-#| msgid ""
-#| "When run in standalone mode, saned advertises itself on the network and "
-#| "can be detected automatically by the SANE clients with no configuration "
-#| "on the client side. You still need to configure the server to accept "
-#| "connections from your clients."
 msgid ""
 "When run in standalone mode, saned advertises itself on the network and can "
 "be detected automatically by the SANE clients with no configuration on the "
@@ -74,8 +63,9 @@
 msgstr ""
 "Bakarkako moduan exekutatzean, saned-ek bere burua sarean aurkezten du eta "
 "automatikoki atzeman dezakete SANE bezeroek konfigurazio berezirik gabe. Zuk "
-"zerbitzaria konfiguratu behar duzu bezeroetatik konexioak onartzeko. Eginbide "
-"hau esperimentala da, eta Avahi daemona exekutatzen egotea eskatzen du."
+"zerbitzaria konfiguratu behar duzu bezeroetatik konexioak onartzeko. "
+"Eginbide hau esperimentala da, eta Avahi daemona exekutatzen egotea eskatzen "
+"du."
 
 #. Type: boolean
 #. Description
@@ -124,4 +114,3 @@
 msgstr ""
 "Onartu aukera hau zure eskaner guztiak sarearen bidez eta mugarik gabe "
 "erabilgarri egin bahi badituzu."
-
 
=== modified file 'debian/po/fr.po'
--- debian/po/fr.po	2010-06-17 08:24:44 +0000
+++ debian/po/fr.po	2014-05-25 18:16:31 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2009-12-29 14:10+0100\n"
 "Last-Translator: Christian Perrier <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,13 +36,6 @@
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-#| msgid ""
-#| "There are two ways of running saned:\n"
-#| " - as an inetd service, started by the inetd superserver. In this mode,\n"
-#| "saned is started as needed by inetd whenever a client tries to connect to "
-#| "the server;\n"
-#| " - as a standalone daemon, started at system boot. In this mode, saned\n"
-#| "runs in the background all by itself and listens for client connections."
 msgid ""
 "There are two ways of running saned:\n"
 " - as an inetd service, started by the inetd superserver. In this mode,\n"
@@ -59,11 +53,6 @@
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-#| msgid ""
-#| "When run in standalone mode, saned advertises itself on the network and "
-#| "can be detected automatically by the SANE clients with no configuration "
-#| "on the client side. You still need to configure the server to accept "
-#| "connections from your clients."
 msgid ""
 "When run in standalone mode, saned advertises itself on the network and can "
 "be detected automatically by the SANE clients with no configuration on the "
@@ -115,7 +104,8 @@
 msgstr ""
 "Veuillez lire le fichier /usr/share/doc/sane-utils/README.Debian pour plus "
 "d'informations sur la gestion des permissions pour saned. Par défaut, le "
-"démon est exécuté avec les privilèges de l'utilisateur et du groupe « saned »."
+"démon est exécuté avec les privilèges de l'utilisateur et du groupe "
+"« saned »."
 
 #. Type: boolean
 #. Description
 
=== modified file 'debian/po/gl.po'
--- debian/po/gl.po	2010-06-17 01:28:18 +0000
+++ debian/po/gl.po	2014-05-25 18:16:31 +0000
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2008-05-06 22:50+0100\n"
 "Last-Translator: Jacobo Tarrio <[e-mail]>\n"
 "Language-Team: Galician <[e-mail]>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
=== modified file 'debian/po/it.po'
--- debian/po/it.po	2011-03-04 20:37:43 +0000
+++ debian/po/it.po	2014-05-25 18:16:31 +0000
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2010-08-20 16:35+0200\n"
 "Last-Translator: Luca Monducci <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
=== modified file 'debian/po/ja.po'
--- debian/po/ja.po	2010-06-17 01:28:18 +0000
+++ debian/po/ja.po	2014-05-25 18:16:31 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2010-01-09 11:21+0200\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
=== modified file 'debian/po/nl.po'
--- debian/po/nl.po	2012-09-10 07:39:27 +0000
+++ debian/po/nl.po	2014-05-25 18:16:31 +0000
@@ -11,10 +11,10 @@
 "PO-Revision-Date: 2011-05-17 10:34+0200\n"
 "Last-Translator: Jeroen Schot <[e-mail]>\n"
 "Language-Team: Debian l10n Dutch <[e-mail]>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
 
 #. Type: boolean
 #. Description
 
=== added file 'debian/po/pl.po'
--- debian/po/pl.po	1970-01-01 00:00:00 +0000
+++ debian/po/pl.po	2014-05-25 18:16:31 +0000
@@ -0,0 +1,114 @@
+# Translation of sane-backends debconf templates to Polish.
+# Copyright (C) 2009
+# This file is distributed under the same license as the sane-backends package.
+#
+# Michał Kułach <[e-mail]>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-12-12 13:14+0100\n"
+"PO-Revision-Date: 2012-02-02 11:05+0100\n"
+"Last-Translator: Michał Kułach <[e-mail]>\n"
+"Language-Team: Polish <[e-mail]>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid "Enable saned as a standalone server?"
+msgstr "Włączyć saned jako samodzielny serwer?"
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid ""
+"The saned server, when enabled, makes scanners available over the network."
+msgstr "Serwer saned, kiedy jest uruchomiony, udostępnia skanery w sieci."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid ""
+"There are two ways of running saned:\n"
+" - as an inetd service, started by the inetd superserver. In this mode,\n"
+"saned is started on demand when a client connects to the server;\n"
+" - as a standalone daemon, started at system boot. In this mode, saned\n"
+"runs in the background all by itself and listens for client connections."
+msgstr ""
+"Są dwa sposoby działania saned:\n"
+" - jako usługa inetd, uruchomiona przez super-serwer inetd. W tym trybie "
+"saned\n"
+"jest uruchamiany na żądanie, podczas połączenia klienta z serwerem;\n"
+" - jako samodzielny demon, uruchamiany podczas rozruchu systemu. W tym "
+"trybie\n"
+"saned działa w tle i nasłuchuje połączeń klientów."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid ""
+"When run in standalone mode, saned advertises itself on the network and can "
+"be detected automatically by the SANE clients with no configuration on the "
+"client side. You still need to configure the server to accept connections "
+"from your clients. This feature is experimental and requires a running Avahi "
+"daemon."
+msgstr ""
+"Jeśli program działa w trybie samodzielnym, saned rozgłasza się w sieci i "
+"może być automatycznie wykrywany przez klienty SANE, bez potrzeby "
+"konfiguracji po stronie klienta. Nadal jednak będzie konieczne "
+"skonfigurowanie serwera tak, aby akceptował połączenia od klientów. Funkcja "
+"ta jest eksperymentalna i wymaga działania demona Avahi."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid "Accept this option if you want to make use of this feature."
+msgstr "Proszę wybrać \"tak\", aby używać tej funkcji."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid "Add saned user to the scanner group?"
+msgstr "Czy dodać użytkownika saned do grupy scanner?"
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid ""
+"The saned server, when enabled, makes scanners available over the network. "
+"By applying different permissions to the different scanners connected to "
+"your machine, you can control which ones will be made available over the "
+"network."
+msgstr ""
+"Serwer saned, kiedy jest uruchomiony, udostępnia skanery w sieci. Po "
+"wprowadzeniu różnych uprawnień dla różnych skanerów podłączonych do tego "
+"komputera, można kontrolować który z nich ma być dostępny w sieci."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid ""
+"Read /usr/share/doc/sane-utils/README.Debian for details on how to manage "
+"permissions for saned. By default, saned is run under the saned user and "
+"group."
+msgstr ""
+"Proszę zapoznać się z /usr/share/doc/sane-utils/README.Debian, aby "
+"dowiedzieć się więcej o zarządzaniu uprawnieniami saned. Domyślnie saned "
+"działa z poziomu użytkownika i grupy saned."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid ""
+"Accept this option if you want to make all your scanners available over the "
+"network without restriction."
+msgstr ""
+"Proszę wybrać \"tak\", aby udostępnić wszystkie swoje skanery w sieci bez "
+"dodatkowych ograniczeń."
 
=== modified file 'debian/po/pt.po'
--- debian/po/pt.po	2010-06-17 01:28:18 +0000
+++ debian/po/pt.po	2014-05-25 18:16:31 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2009-12-27 21:49+0000\n"
 "Last-Translator: Américo Monteiro <[e-mail]>\n"
 "Language-Team: Portuguese <[e-mail]>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,13 +35,6 @@
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-#| msgid ""
-#| "There are two ways of running saned:\n"
-#| " - as an inetd service, started by the inetd superserver. In this mode,\n"
-#| "saned is started as needed by inetd whenever a client tries to connect to "
-#| "the server;\n"
-#| " - as a standalone daemon, started at system boot. In this mode, saned\n"
-#| "runs in the background all by itself and listens for client connections."
 msgid ""
 "There are two ways of running saned:\n"
 " - as an inetd service, started by the inetd superserver. In this mode,\n"
@@ -57,11 +51,6 @@
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-#| msgid ""
-#| "When run in standalone mode, saned advertises itself on the network and "
-#| "can be detected automatically by the SANE clients with no configuration "
-#| "on the client side. You still need to configure the server to accept "
-#| "connections from your clients."
 msgid ""
 "When run in standalone mode, saned advertises itself on the network and can "
 "be detected automatically by the SANE clients with no configuration on the "
@@ -121,4 +110,3 @@
 msgstr ""
 "Aceite esta opção se deseja tornar todos os seus scanners disponíveis na "
 "rede sem restrições."
-
 
=== modified file 'debian/po/pt_BR.po'
--- debian/po/pt_BR.po	2011-12-05 04:27:00 +0000
+++ debian/po/pt_BR.po	2014-05-25 18:16:31 +0000
@@ -10,12 +10,12 @@
 "POT-Creation-Date: 2009-12-12 13:14+0100\n"
 "PO-Revision-Date: 2011-03-19 18:31-0300\n"
 "Last-Translator: Eder L. Marques <[e-mail]>\n"
-"Language-Team: Brazilian Portuguese <[e-mail]>"
-"\n"
+"Language-Team: Brazilian Portuguese <[e-mail]."
+"org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 
 #. Type: boolean
 #. Description
@@ -35,13 +35,6 @@
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-#| msgid ""
-#| "There are two ways of running saned:\n"
-#| " - as an inetd service, started by the inetd superserver. In this mode,\n"
-#| "saned is started as needed by inetd whenever a client tries to connect to "
-#| "the server;\n"
-#| " - as a standalone daemon, started at system boot. In this mode, saned\n"
-#| "runs in the background all by itself and listens for client connections."
 msgid ""
 "There are two ways of running saned:\n"
 " - as an inetd service, started by the inetd superserver. In this mode,\n"
@@ -60,11 +53,6 @@
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-#| msgid ""
-#| "When run in standalone mode, saned advertises itself on the network and "
-#| "can be detected automatically by the SANE clients with no configuration "
-#| "on the client side. You still need to configure the server to accept "
-#| "connections from your clients."
 msgid ""
 "When run in standalone mode, saned advertises itself on the network and can "
 "be detected automatically by the SANE clients with no configuration on the "
 
=== modified file 'debian/po/ru.po'
--- debian/po/ru.po	2010-06-17 01:28:18 +0000
+++ debian/po/ru.po	2014-05-25 18:16:31 +0000
@@ -12,11 +12,13 @@
 "PO-Revision-Date: 2009-12-30 19:10+0300\n"
 "Last-Translator: Yuri Kozlov <[e-mail]>\n"
 "Language-Team: Russian <[e-mail]>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: boolean
 #. Description
@@ -27,19 +29,13 @@
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-msgid "The saned server, when enabled, makes scanners available over the network."
+msgid ""
+"The saned server, when enabled, makes scanners available over the network."
 msgstr "Если включена служба saned, то сканеры становятся доступными по сети."
 
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-#| msgid ""
-#| "There are two ways of running saned:\n"
-#| " - as an inetd service, started by the inetd superserver. In this mode,\n"
-#| "saned is started as needed by inetd whenever a client tries to connect to "
-#| "the server;\n"
-#| " - as a standalone daemon, started at system boot. In this mode, saned\n"
-#| "runs in the background all by itself and listens for client connections."
 msgid ""
 "There are two ways of running saned:\n"
 " - as an inetd service, started by the inetd superserver. In this mode,\n"
@@ -58,11 +54,6 @@
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-#| msgid ""
-#| "When run in standalone mode, saned advertises itself on the network and "
-#| "can be detected automatically by the SANE clients with no configuration "
-#| "on the client side. You still need to configure the server to accept "
-#| "connections from your clients."
 msgid ""
 "When run in standalone mode, saned advertises itself on the network and can "
 "be detected automatically by the SANE clients with no configuration on the "
@@ -121,4 +112,3 @@
 msgstr ""
 "Ответьте утвердительно, если хотите, чтобы все сканеры были доступны по сети "
 "без ограничений."
-
 
=== added file 'debian/po/sk.po'
--- debian/po/sk.po	1970-01-01 00:00:00 +0000
+++ debian/po/sk.po	2014-05-25 18:16:31 +0000
@@ -0,0 +1,112 @@
+# Slovak translations for sane-backends package
+# Slovenské preklady pre balík sane-backends.
+# Copyright (C) 2011 THE sane-backends'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the sane-backends package.
+# Automatically generated, 2011.
+# Slavko <[e-mail]>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sane-backends 1.0.22-6\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-12-12 13:14+0100\n"
+"PO-Revision-Date: 2011-08-25 10:52+0200\n"
+"Last-Translator: Slavko <[e-mail]>\n"
+"Language-Team: Slovak <[e-mail]>\n"
+"Language: sk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid "Enable saned as a standalone server?"
+msgstr "Povoliť saned ako samostatný server?"
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid ""
+"The saned server, when enabled, makes scanners available over the network."
+msgstr "Server saned, keď je povolený, sprístupňuje skenery cez sieť."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid ""
+"There are two ways of running saned:\n"
+" - as an inetd service, started by the inetd superserver. In this mode,\n"
+"saned is started on demand when a client connects to the server;\n"
+" - as a standalone daemon, started at system boot. In this mode, saned\n"
+"runs in the background all by itself and listens for client connections."
+msgstr ""
+"Existujú dva spôsoby spustenia saned:\n"
+" - ako služba inetd, spúšťaný pomocou superservera inetd. V tomto režime\n"
+"je saned spustený na požiadanie, pri pripojení klienta k serveru;\n"
+" - ako samostatný démon, spúšťaný pri štarte systému. V tomto režime saned\n"
+"stále beží na pozadí a sám prijíma spojenia klientov."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid ""
+"When run in standalone mode, saned advertises itself on the network and can "
+"be detected automatically by the SANE clients with no configuration on the "
+"client side. You still need to configure the server to accept connections "
+"from your clients. This feature is experimental and requires a running Avahi "
+"daemon."
+msgstr ""
+"Pri spustení v samostatnom režime sa saned sám ponúka v sieti a klienty SANE "
+"ho tak môžu automaticky zistiť, bez potreby nastavenia na strane klienta. "
+"Stále však budete musieť nastaviť server tak, aby prijímal spojenia od "
+"svojich klientov. Táto vlastnosť je experimentálna a vyžaduje bežiaceho "
+"démona Avahi."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid "Accept this option if you want to make use of this feature."
+msgstr "Vyberte túto voľbu, ak chcete používať túto funkciu."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid "Add saned user to the scanner group?"
+msgstr "Pridať používateľa saned do skupiny scanner?"
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid ""
+"The saned server, when enabled, makes scanners available over the network. "
+"By applying different permissions to the different scanners connected to "
+"your machine, you can control which ones will be made available over the "
+"network."
+msgstr ""
+"Server saned, keď je povolený, sprístupňuje skenery cez sieť. Pomocou "
+"nastavenia rôznych práv rôznym skenerom, ktoré sú pripojené k vášmu stroju, "
+"môžete riadiť ktorý(é) z nich bude dostupný cez sieť."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid ""
+"Read /usr/share/doc/sane-utils/README.Debian for details on how to manage "
+"permissions for saned. By default, saned is run under the saned user and "
+"group."
+msgstr ""
+"Ďalšie podrobnosti o správe práv saned hľadajte v /usr/share/doc/sane-utils/"
+"README.Debian. Predvolene je saned spustený s právami používateľa a skupiny "
+"saned."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid ""
+"Accept this option if you want to make all your scanners available over the "
+"network without restriction."
+msgstr ""
+"Vyberte túto voľbu, ak chcete sprístupniť cez sieť všetky svoje skenery bez "
+"obmedzení."
 
=== modified file 'debian/po/sv.po'
--- debian/po/sv.po	2010-06-17 01:28:18 +0000
+++ debian/po/sv.po	2014-05-25 18:16:31 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2009-12-29 11:26+0100\n"
 "Last-Translator: Martin Bagge <[e-mail]>\n"
 "Language-Team: swedish <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,13 +33,6 @@
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-#| msgid ""
-#| "There are two ways of running saned:\n"
-#| " - as an inetd service, started by the inetd superserver. In this mode,\n"
-#| "saned is started as needed by inetd whenever a client tries to connect to "
-#| "the server;\n"
-#| " - as a standalone daemon, started at system boot. In this mode, saned\n"
-#| "runs in the background all by itself and listens for client connections."
 msgid ""
 "There are two ways of running saned:\n"
 " - as an inetd service, started by the inetd superserver. In this mode,\n"
@@ -56,11 +50,6 @@
 #. Type: boolean
 #. Description
 #: ../sane-utils.templates:1001
-#| msgid ""
-#| "When run in standalone mode, saned advertises itself on the network and "
-#| "can be detected automatically by the SANE clients with no configuration "
-#| "on the client side. You still need to configure the server to accept "
-#| "connections from your clients."
 msgid ""
 "When run in standalone mode, saned advertises itself on the network and can "
 "be detected automatically by the SANE clients with no configuration on the "
 
=== modified file 'debian/po/vi.po'
--- debian/po/vi.po	2011-03-04 20:37:43 +0000
+++ debian/po/vi.po	2014-05-25 18:16:31 +0000
@@ -10,35 +10,29 @@
 "PO-Revision-Date: 2010-10-27 14:41+1030\n"
 "Last-Translator: Clytie Siddall <[e-mail]>\n"
 "Language-Team: Vietnamese <[e-mail]>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
-#: ../sane-utils.templates:1001
 #. Type: boolean
 #. Description
+#: ../sane-utils.templates:1001
 msgid "Enable saned as a standalone server?"
 msgstr "Bật saned làm trình phục vụ độc lập ?"
 
-#: ../sane-utils.templates:1001
 #. Type: boolean
 #. Description
+#: ../sane-utils.templates:1001
 msgid ""
 "The saned server, when enabled, makes scanners available over the network."
 msgstr "Bật trình phục vụ saned thì làm cho máy quét sẵn sàng qua mạng."
 
-#: ../sane-utils.templates:1001
 #. Type: boolean
 #. Description
-#| msgid ""
-#| "There are two ways of running saned:\n"
-#| " - as an inetd service, started by the inetd superserver. In this mode,\n"
-#| "saned is started as needed by inetd whenever a client tries to connect to "
-#| "the server;\n"
-#| " - as a standalone daemon, started at system boot. In this mode, saned\n"
-#| "runs in the background all by itself and listens for client connections."
+#: ../sane-utils.templates:1001
 msgid ""
 "There are two ways of running saned:\n"
 " - as an inetd service, started by the inetd superserver. In this mode,\n"
@@ -54,14 +48,9 @@
 "\tTrong chế độ này, saned chạy một mình về nền,\n"
 "\tvà lắng nghe kết nối của ứng dụng khách."
 
-#: ../sane-utils.templates:1001
 #. Type: boolean
 #. Description
-#| msgid ""
-#| "When run in standalone mode, saned advertises itself on the network and "
-#| "can be detected automatically by the SANE clients with no configuration "
-#| "on the client side. You still need to configure the server to accept "
-#| "connections from your clients."
+#: ../sane-utils.templates:1001
 msgid ""
 "When run in standalone mode, saned advertises itself on the network and can "
 "be detected automatically by the SANE clients with no configuration on the "
@@ -69,46 +58,56 @@
 "from your clients. This feature is experimental and requires a running Avahi "
 "daemon."
 msgstr ""
-"Chạy trong chế độ độc lập thì trình nền saned tự quảng cáo trên mạng, và có thể được tự động phát hiện bởi ứng dụng khách SANE mà không cần cấu hình riêng bên khách. Bạn vẫn còn cần phải cấu hình trình phục vụ để chấp nhận kết nối từ ứng dụng khách. Tính năng này vẫn còn dựa vào thực nghiệm, cũng yêu cầu một trình nền Avahi đang chạy."
+"Chạy trong chế độ độc lập thì trình nền saned tự quảng cáo trên mạng, và có "
+"thể được tự động phát hiện bởi ứng dụng khách SANE mà không cần cấu hình "
+"riêng bên khách. Bạn vẫn còn cần phải cấu hình trình phục vụ để chấp nhận "
+"kết nối từ ứng dụng khách. Tính năng này vẫn còn dựa vào thực nghiệm, cũng "
+"yêu cầu một trình nền Avahi đang chạy."
 
-#: ../sane-utils.templates:1001
 #. Type: boolean
 #. Description
+#: ../sane-utils.templates:1001
 msgid "Accept this option if you want to make use of this feature."
 msgstr "Bật tuỳ chọn này để sử dụng tính năng đó."
 
-#: ../sane-utils.templates:2001
 #. Type: boolean
 #. Description
+#: ../sane-utils.templates:2001
 msgid "Add saned user to the scanner group?"
 msgstr "Thêm người dùng saned vào nhóm « scanner » ?"
 
-#: ../sane-utils.templates:2001
 #. Type: boolean
 #. Description
+#: ../sane-utils.templates:2001
 msgid ""
 "The saned server, when enabled, makes scanners available over the network. "
 "By applying different permissions to the different scanners connected to "
 "your machine, you can control which ones will be made available over the "
 "network."
 msgstr ""
-"Bật trình phục vụ saned thì làm cho máy quét sẵn sàng trên khắp mạng. Bằng cách áp dụng các quyền hạn khác nhau cho những máy quét khác nhau được kết nối đến máy này, bạn có thể điều khiển những máy quét sẽ được công bố qua mạng."
+"Bật trình phục vụ saned thì làm cho máy quét sẵn sàng trên khắp mạng. Bằng "
+"cách áp dụng các quyền hạn khác nhau cho những máy quét khác nhau được kết "
+"nối đến máy này, bạn có thể điều khiển những máy quét sẽ được công bố qua "
+"mạng."
 
-#: ../sane-utils.templates:2001
 #. Type: boolean
 #. Description
+#: ../sane-utils.templates:2001
 msgid ""
 "Read /usr/share/doc/sane-utils/README.Debian for details on how to manage "
 "permissions for saned. By default, saned is run under the saned user and "
 "group."
 msgstr ""
-"Xem tài liệu Đọc Đi « /usr/share/doc/sane-utils/README.Debian » để tìm chi tiết về quản lý quyền hạn cho saned như thế nào. Mặc định là saned được chạy dưới người dùng và nhóm « saned »."
+"Xem tài liệu Đọc Đi « /usr/share/doc/sane-utils/README.Debian » để tìm chi "
+"tiết về quản lý quyền hạn cho saned như thế nào. Mặc định là saned được chạy "
+"dưới người dùng và nhóm « saned »."
 
-#: ../sane-utils.templates:2001
 #. Type: boolean
 #. Description
+#: ../sane-utils.templates:2001
 msgid ""
 "Accept this option if you want to make all your scanners available over the "
 "network without restriction."
 msgstr ""
-"Bật tùy chọn này để làm cho tất cả các máy quét sẵn sàng qua mạng một cách không điều kiện."
+"Bật tùy chọn này để làm cho tất cả các máy quét sẵn sàng qua mạng một cách "
+"không điều kiện."
 
=== modified file 'debian/po/zh_CN.po'
--- debian/po/zh_CN.po	2011-03-04 20:37:43 +0000
+++ debian/po/zh_CN.po	2014-05-25 18:16:31 +0000
@@ -12,10 +12,10 @@
 "PO-Revision-Date: 2010-10-09 16:57+0800\n"
 "Last-Translator: YunQiang Su <[e-mail]>\n"
 "Language-Team: Chinese (simplified) <[e-mail]>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. Type: boolean
 
=== modified file 'debian/rules'
--- debian/rules	2012-09-10 07:13:25 +0000
+++ debian/rules	2014-05-25 18:16:31 +0000
@@ -1,17 +1,14 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
 ifeq ($(DEB_HOST_ARCH_OS),)
   DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))
   ifeq ($(DEB_HOST_ARCH_OS),gnu)
@@ -28,18 +25,10 @@
 	STRIP = ""
 endif
 
-autotools: autotools-stamp
-autotools-stamp:
-	-rm -f config.sub config.guess
-	ln -s /usr/share/misc/config.sub config.sub
-	ln -s /usr/share/misc/config.guess config.guess
-	touch autotools-stamp
-
-configure: configure-stamp
-configure-stamp: autotools-stamp
-	dh_testdir
-
-	# Add here commands to configure the package.
+%:
+	dh $@ --parallel --with autoreconf
+
+override_dh_auto_configure:
 	LDFLAGS="-Wl,-Bsymbolic-functions" \
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr \
@@ -58,100 +47,64 @@
 		--enable-avahi \
 		--enable-libusb_1_0
 
+override_dh_auto_build:
 	# generate POT file for translators
 	(cd po && make sane-backends.pot)
-
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-
-	# Add here commands to compile the package.
 	$(MAKE)
 
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f autotools-stamp configure-stamp build-stamp
-
+override_dh_auto_clean:
 	# Autoconf-generated files
-	rm -f include/byteorder.h include/_stdint.h
-
+	$(RM) include/byteorder.h include/_stdint.h
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
-
-	rm -f debian/libsane-common.install
-	rm -f debian/libsane.udev
-	rm -f config.sub config.guess
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp
+	$(RM) debian/libsane-common.install
+	$(RM) debian/libsane.udev
+	dh_auto_clean
+
+override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
 	# remove /usr/lib/sane/libsane.so.1 (libtool side-effect ?)
-	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sane/libsane.so.1
-
+	$(RM) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sane/libsane.so.1
 	# remove libsane-dll, same as regular libsane
-	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sane/libsane-dll.*
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-
-	# Install the pkg-config file
-	mkdir -p debian/libsane-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
-	cp tools/sane-backends.pc debian/libsane-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
-
+	$(RM) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sane/libsane-dll.*
 	# install only the manpages for the backends which have been built
 	cp debian/libsane-common.install.in debian/libsane-common.install
-	ls debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sane/*.so | sed -e "s#.*/lib\([^.]\+\)[.]so#usr/share/man/man5/\1.5#" | { while read mp; do \
+	ls debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sane/*.so | sed -e \
+		"s#.*/lib\([^.]\+\)[.]so#usr/share/man/man5/\1.5#" | { while read mp; do \
 		test -e debian/tmp/$$mp && echo $$mp >> debian/libsane-common.install; done }
-
 	# Empty dependency_libs in all .la files
 	find debian/tmp/usr -name "*.la" -type f -exec sed -e "s,^dependency_libs=.*,dependency_libs=''," -i {} \;
 
-	dh_install --sourcedir=debian/tmp
-
-	# install the umax_pp tool into sane-utils
-	cp tools/umax_pp debian/sane-utils/usr/bin
-
-	# Platform-specific documentation
-ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
-	cp README.freebsd debian/libsane-common/usr/share/doc/libsane/
-endif
-ifeq (linux,$(DEB_HOST_ARCH_OS))
-	cp README.linux debian/libsane-common/usr/share/doc/libsane/
-endif
-
+override_dh_install:
+	dh_install
+	# Install HAL fdi file
+	mkdir -p $(CURDIR)/debian/libsane-common/usr/share/hal/fdi/preprobe/10osvendor
+	$(CURDIR)/tools/sane-desc -s $(CURDIR)/doc/descriptions -m hal-new > \
+	$(CURDIR)/debian/libsane-common/usr/share/hal/fdi/preprobe/10osvendor/20-libsane.fdi
+	# Install the pkg-config file
+	mkdir -p debian/libsane-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
+	cp tools/sane-backends.pc debian/libsane-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
+
+override_dh_installdocs:
 	dh_installdocs
-
 	# move files that belong to libsane-dev
 	mv debian/libsane-common/usr/share/doc/libsane/sane.ps debian/libsane-dev/usr/share/doc/libsane-dev/
 	mv debian/libsane-common/usr/share/doc/libsane/backend-writing.txt debian/libsane-dev/usr/share/doc/libsane-dev/
-
+	# Platform-specific documentation
 	# move the html files into html/
 	install -d debian/libsane-common/usr/share/doc/libsane/html
 	mv debian/libsane-common/usr/share/doc/libsane/*.html debian/libsane-common/usr/share/doc/libsane/html/
-
 	# create the /etc/sane.d/dll.d directory in libsane
 	install -d debian/libsane/etc/sane.d/dll.d
-	rm -f debian/libsane/etc/sane.d/saned.conf
+	$(RM) debian/libsane/etc/sane.d/saned.conf
+ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
+	cp README.freebsd debian/libsane-common/usr/share/doc/libsane/
+endif
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+	cp README.linux debian/libsane-common/usr/share/doc/libsane/
+endif
 
+override_dh_installudev:
 ifeq (linux,$(DEB_HOST_ARCH_OS))
 	# udev support
 	# Generate the udev rules file
@@ -159,32 +112,22 @@
 	dh_installudev
 endif
 
-	# Install HAL fdi file
-	mkdir -p $(CURDIR)/debian/libsane-common/usr/share/hal/fdi/preprobe/10osvendor
-	$(CURDIR)/tools/sane-desc -s $(CURDIR)/doc/descriptions -m hal-new > $(CURDIR)/debian/libsane-common/usr/share/hal/fdi/preprobe/10osvendor/20-libsane.fdi
-
 	# remove rpath from the binaries (wonderful tool !)
 	chrpath -d debian/sane-utils/usr/sbin/saned
 	chrpath -d debian/sane-utils/usr/bin/scanimage
 	chrpath -d debian/sane-utils/usr/bin/sane-find-scanner
 
+override_dh_installexamples:
 	# install the xerox script as an example
 	dh_installexamples -plibsane-common tools/README tools/xerox
 	mv debian/libsane-common/usr/share/doc/libsane-common/examples debian/libsane-common/usr/share/doc/libsane/
 
-	dh_installdebconf	
+override_dh_installinit:
 	dh_installinit -psane-utils --name=saned --error-handler=saned_eh -- start 50 2 3 4 5 . stop 20 1 .
-	dh_installchangelogs ChangeLog
-	dh_link
+
+override_dh_strip:
 	dh_strip --dbg-package=libsane-dbg
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install autotools
+
+override_dh_builddeb:
+	dh_builddeb -- -Zxz
+
 
=== modified file 'debian/sane-utils.config'
--- debian/sane-utils.config	2010-06-17 01:28:18 +0000
+++ debian/sane-utils.config	2014-05-25 18:16:31 +0000
@@ -14,4 +14,5 @@
 fi
 
 db_input medium sane-utils/saned_run || true
+db_input medium sane-utils/saned_scanner_group || true
 db_go || true
 
=== modified file 'debian/sane-utils.install'
--- debian/sane-utils.install	2010-06-17 01:28:18 +0000
+++ debian/sane-utils.install	2014-05-25 18:16:31 +0000
@@ -1,9 +1,10 @@
 etc/sane.d/saned.conf
-usr/sbin/saned
+usr/bin/gamma4scanimage
 usr/bin/sane-find-scanner
 usr/bin/scanimage
-usr/bin/gamma4scanimage
+usr/sbin/saned
+usr/share/man/man1/gamma4scanimage.1
+usr/share/man/man1/sane-find-scanner.1
+usr/share/man/man1/scanimage.1
 usr/share/man/man8/saned.8
-usr/share/man/man1/scanimage.1
-usr/share/man/man1/sane-find-scanner.1
-usr/share/man/man1/gamma4scanimage.1
+tools/umax_pp usr/bin
 
=== modified file 'debian/sane-utils.postinst'
--- debian/sane-utils.postinst	2010-06-17 08:24:44 +0000
+++ debian/sane-utils.postinst	2014-05-25 18:16:31 +0000
@@ -12,6 +12,9 @@
     db_get sane-utils/saned_run
     RUN_SANED="$RET"
 
+    db_get sane-utils/saned_scanner_group
+    SANED_IN_SCANNER="$RET"
+
     # Add saned service, disabled by default
     if [ -x /usr/sbin/update-inetd ]; then
 	update-inetd --add "#<off># sane-port\tstream\ttcp\tnowait\tsaned:saned\t/usr/sbin/saned saned"
@@ -26,8 +29,12 @@
 	adduser --quiet --system --no-create-home --group saned || true
     fi
 
-    if id saned | grep -q "groups=.*\(scanner\)"; then
+    if [ "$SANED_IN_SCANNER" = "true" ]; then
+	adduser --quiet saned scanner
+    else
+	if id saned | grep -q "groups=.*\(scanner\)"; then
 	    deluser --quiet saned scanner
+	fi
     fi
 
     if [ -e $SANED_DEFAULT ]; then
@@ -40,10 +47,6 @@
 	sed -e "s/^ *RUN=.*/RUN=$RUN_SANED/" < $SANED_DEFAULT > $SANED_DEFAULT.tmp
 	mv -f $SANED_DEFAULT.tmp $SANED_DEFAULT
     fi
-
-    if dpkg --compare-versions "$2" lt "1.0.19-23ubuntu4"; then
-	update-rc.d -f saned remove
-    fi
 fi
 
 
 
=== modified file 'debian/sane-utils.templates'
--- debian/sane-utils.templates	2010-06-17 01:28:18 +0000
+++ debian/sane-utils.templates	2014-05-25 18:16:31 +0000
@@ -17,3 +17,19 @@
  a running Avahi daemon.
  .
  Accept this option if you want to make use of this feature.
+
+Template: sane-utils/saned_scanner_group
+Type: boolean
+Default: true
+_Description: Add saned user to the scanner group?
+ The saned server, when enabled, makes scanners available over the network.
+ By applying different permissions to the different scanners connected to
+ your machine, you can control which ones will be made available over the
+ network.
+ .
+ Read /usr/share/doc/sane-utils/README.Debian for details on how to manage
+ permissions for saned. By default, saned is run under the saned user and
+ group.
+ .
+ Accept this option if you want to make all your scanners available over
+ the network without restriction.