Merge branch 'release/experimental/1.0.27-1%experimental4'experimental/1.0.27-1%experimental4

13 files changed, 282 insertions, 27 deletions

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
index da9083e..12d594c 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS.Debian
@@ -11,4 +11,4 @@ sane-backends (1.0.25-3) unstable; urgency=medium
   .
   Please use pkg-config instead of sane-config from the package pkg-config.
 
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sat, 10 Dec 2016 13:45:15 +0100
+ -- Jörg Frings-Fürst <debian@jff.email>  Sat, 10 Dec 2016 13:45:15 +0100
diff --git a/debian/README.source b/debian/README.source
index e4f2b3d..a62f7b9 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -10,7 +10,7 @@ Please upload unattended uploads use a branch feature/<your title>.
 
 Many thanks.
 
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Fri, 02 Jun 2017 19:00:40 +0200
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 02 Jun 2017 19:00:40 +0200
 
 [1] http://nvie.com/posts/a-successful-git-branching-model/
 [2] https://github.com/petervanderdoes/gitflow-avh
diff --git a/debian/changelog b/debian/changelog
index af8671c..3ce7ac9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+sane-backends (1.0.27-1~experimental4) experimental; urgency=medium
+
+  * Change to my new email address.
+  * debian/rules:
+    - Add override_dh_autoreconf to prevent removal of libtool.m4
+      (Closes: #887032).
+    - Remove outdated configure parameter --enable-translations.
+    - Add configure parameter --enable-parport-directio
+      for better parallel port handling.
+    - Rename configure parameter --with-docdir to --docdir.
+    - Fix source directory for backend-writing.txt.
+  * debian/copyright:
+    - Use secure copyright format URI.
+  * Migrate to debhelper 11:
+    - Change debian/compat to 11.
+    - Bump minimum debhelper version in debian/control to >= 11.
+  * Declare compliance with Debian Policy 4.1.4:
+    - Remove the RUN parameter from /etc/default/saned and /etc/init.d/saned
+      in compliance with Debian Policy Manual section 9.3.3.1.
+  * Refresh debian/patches/0100-source_spelling.patch.
+  * New debian/patches/0715-20-sane.hwdb_multi-arch.patch:
+    - Remove buildtime from 20-sane.hwdb to make the file ready for multi-arch.
+      (Closes: #880391)
+  * debian/libsane1.README.Debian:
+    - Replace ConsoleKit with ConsoleKit/systemd-logind (Closes: #872364).
+  * debian/control:
+    - Add libsnmp-dev to Build-Depends to enable SNMP support.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sat, 14 Apr 2018 13:30:56 +0200
+
 sane-backends (1.0.27-1~experimental3) experimental; urgency=medium
 
   * debian/control:
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index 798b009..d815329 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,12 @@
 Source: sane-backends
 Section: graphics
 Priority: optional
-Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Standards-Version: 4.1.1
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
+Standards-Version: 4.1.4
 Build-Depends:
  autoconf,
  chrpath,
- debhelper (>= 10),
+ debhelper (>= 11),
  gettext,
  libavahi-client-dev,
  libcam-dev [kfreebsd-any],
@@ -15,6 +15,7 @@ Build-Depends:
  libieee1284-3-dev [!hurd-i386],
  libjpeg-dev,
  libltdl3-dev,
+ libsnmp-dev,
  libsystemd-dev [linux-any],
  libtiff-dev,
  libusb-1.0-0-dev,
diff --git a/debian/copyright b/debian/copyright
index 7a672b5..8735810 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: sane-backends
 Upstream-Contact:
 Source: ftp://ftp.sane-project.org/pub/sane/
@@ -13,7 +13,7 @@ Copyright: 1997-2002 Kevin Dalley <kevind@rahul.net>
            2002-2011 Julien BLACHE <jblache@debian.org>
            2002-2006 Aurélien Jarno <aurel32@debian.org>
            2013      Mark Buda <hermit@acm.org>
-           2014-2017 Jörg Frings-Fürst <debian@jff-webhosting.net>
+           2014-2017 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+ with sane exception
 
 Files: backend/abaton.*
diff --git a/debian/libsane1.README.Debian b/debian/libsane1.README.Debian
index 426bf65..b5e4235 100644
--- a/debian/libsane1.README.Debian
+++ b/debian/libsane1.README.Debian
@@ -64,14 +64,14 @@ components, please refer to the manual pages listed below:
 SETUP
 -----
 
-In this day and age, SANE integrates with udev and ConsoleKit seemlessly; this
-means users physically logged into the machine (as opposed to users logged in
-remotely via SSH) have access to the scanners by default.
+In this day and age, SANE integrates with udev and ConsoleKit/systemd-logind
+seemlessly; this means users physically logged into the machine (as opposed
+to users logged in remotely via SSH) have access to the scanners by default.
 
 The solution proposed below is a legacy setup that remains valid for sharing
-scanners with saned or for systems that don't use ConsoleKit. Note that this is
-only a proposed solution, you are free to come up with and implement whatever
-access control mechanism you see fit.
+scanners with saned or for systems that don't use ConsoleKit/systemd-logind.
+Note that this is only a proposed solution, you are free to come up with and
+implement whatever access control mechanism you see fit.
 
 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
diff --git a/debian/patches/0100-source_spelling.patch b/debian/patches/0100-source_spelling.patch
index 8796e35..0985e99 100644
--- a/debian/patches/0100-source_spelling.patch
+++ b/debian/patches/0100-source_spelling.patch
@@ -47,3 +47,108 @@ Index: trunk/doc/sane-pixma.man
  .PP
  Setting timeouts should only be required in exceptional cases.
  .PP
+@@ -288,7 +288,7 @@ common subnet for scanning.
+ .PP
+ Scanner detection is slightly more complicated. The pixma backend sends
+ a broadcast on all direct connected subnets it can find (provided your OS 
+-allows for enumeration of all netowrk interfaces). The broadcast is sent FROM 
++allows for enumeration of all network interfaces). The broadcast is sent FROM 
+ port 8612 TO port 8610 or 8612 on the broadcast address of each interface.
+ The outgoing packets will be allowed by the rule described above.
+ .PP
+Index: trunk/doc/sane-canon_dr.man
+===================================================================
+--- trunk.orig/doc/sane-canon_dr.man
++++ trunk/doc/sane-canon_dr.man
+@@ -105,7 +105,7 @@ Scanners can be specified in the configu
+ .PP
+ "scsi CANON DR"
+ .RS
+-Requests backend to search all scsi busses in the system for a device 
++Requests backend to search all scsi buses in the system for a device 
+ which reports itself to be a scanner made by 'CANON', with a model name
+ starting with 'DR'. 
+ .RE
+@@ -119,7 +119,7 @@ specify one. Probably should not be used
+ .PP
+ "usb 0x04a9 0x1603" (or other vendor/product ids)
+ .RS
+-Requests backend to search all usb busses in the system for a device 
++Requests backend to search all usb buses in the system for a device 
+ which uses that vendor and product id. The device will then be queried
+ to determine if it is a Canon scanner.
+ .RE
+Index: trunk/doc/sane-cardscan.man
+===================================================================
+--- trunk.orig/doc/sane-cardscan.man
++++ trunk/doc/sane-cardscan.man
+@@ -37,7 +37,7 @@ Scanners can be specified in the configu
+ .PP
+ "usb 0x04c5 0x1042" (or other vendor/product ids)
+ .RS
+-Requests backend to search all usb busses in the system for a device 
++Requests backend to search all usb buses in the system for a device 
+ which uses that vendor and product id. The device will then be queried
+ to determine if it is a cardscan scanner.
+ .RE
+Index: trunk/doc/sane-epjitsu.man
+===================================================================
+--- trunk.orig/doc/sane-epjitsu.man
++++ trunk/doc/sane-epjitsu.man
+@@ -42,7 +42,7 @@ Scanners can be specified in the configu
+ .PP
+ "usb 0x04c5 0x10c7" (or other vendor/product ids)
+ .RS
+-Requests backend to search all usb busses in the system for a device which uses that vendor and product id. The device will then be queried to determine if it is a supported scanner.
++Requests backend to search all usb buses in the system for a device which uses that vendor and product id. The device will then be queried to determine if it is a supported scanner.
+ .RE
+ .PP
+ "usb /dev/usb/scanner0" (or other device file)
+Index: trunk/doc/sane-fujitsu.man
+===================================================================
+--- trunk.orig/doc/sane-fujitsu.man
++++ trunk/doc/sane-fujitsu.man
+@@ -109,7 +109,7 @@ Scanners can be specified in the configu
+ .PP
+ "scsi FUJITSU"
+ .RS
+-Requests backend to search all scsi busses in the system for a device 
++Requests backend to search all scsi buses in the system for a device 
+ which reports itself to be a scanner made by 'FUJITSU'. 
+ .RE
+ .PP
+@@ -122,7 +122,7 @@ specify one. Probably should not be used
+ .PP
+ "usb 0x04c5 0x1042" (or other vendor/product ids)
+ .RS
+-Requests backend to search all usb busses in the system for a device 
++Requests backend to search all usb buses in the system for a device 
+ which uses that vendor and product id. The device will then be queried
+ to determine if it is a Fujitsu scanner.
+ .RE
+Index: trunk/doc/saned.man
+===================================================================
+--- trunk.orig/doc/saned.man
++++ trunk/doc/saned.man
+@@ -220,7 +220,7 @@ to the systemd journal. The systemd supp
+ requires compilation with the systemd-devel package
+ installed on the system. this is the preferred option.
+ 
+-Saned can be used wih systemd without the systemd integration 
++Saned can be used with systemd without the systemd integration 
+ compiled in, but then logging of debug information is not supported. 
+ 
+ The systemd configuration is different for the 2 options, so
+Index: trunk/doc/sane-kodak.man
+===================================================================
+--- trunk.orig/doc/sane-kodak.man
++++ trunk/doc/sane-kodak.man
+@@ -77,7 +77,7 @@ Scanners can be specified in the configu
+ .PP
+ "scsi KODAK"
+ .RS
+-Requests backend to search all scsi busses in the system for a device 
++Requests backend to search all scsi buses in the system for a device 
+ which reports itself to be a scanner made by 'KODAK'. 
+ .RE
+ .PP
diff --git a/debian/patches/0715-20-sane.hwdb_multi-arch.patch b/debian/patches/0715-20-sane.hwdb_multi-arch.patch
new file mode 100644
index 0000000..350c911
--- /dev/null
+++ b/debian/patches/0715-20-sane.hwdb_multi-arch.patch
@@ -0,0 +1,123 @@
+Description: Make 20-sane.hwdb Multi-Arch ready
+Author: Jörg Frings-Fürst <debian@jff.email>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=880391
+Forwarded: not-needed
+Last-Update: 2018-04-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/tools/sane-desc.c
+===================================================================
+--- trunk.orig/tools/sane-desc.c
++++ trunk/tools/sane-desc.c
+@@ -3326,10 +3326,10 @@ print_usermap_header (void)
+ 
+   printf
+     ("# This file was automatically created based on description files (*.desc)\n"
+-    "# by sane-desc %s from %s on %s"
++    "# by sane-desc %s from %s\n"
+     "#\n"
+     ,
+-    SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (&current_time)));
++    SANE_DESC_VERSION, PACKAGE_STRING);
+ 
+   printf
+      ("# The entries below are used to detect a USB device and change owner\n"
+@@ -3398,8 +3398,8 @@ print_db_header (void)
+ {
+   time_t current_time = time (0);
+   printf ("# This file was automatically created based on description files (*.desc)\n"
+-	  "# by sane-desc %s from %s on %s",
+-	  SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (&current_time)));
++	  "# by sane-desc %s from %s\n",
++	  SANE_DESC_VERSION, PACKAGE_STRING);
+   printf
+     ("#\n"
+      "# The entries below are used to detect a USB device when it's plugged in\n"
+@@ -3656,8 +3656,8 @@ print_udevhwdb_header (void)
+ {
+   time_t current_time = time (0);
+   printf ("# This file was automatically created based on description files (*.desc)\n"
+-	  "# by sane-desc %s from %s on %s",
+-	  SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (&current_time)));
++	  "# by sane-desc %s from %s\n",
++	  SANE_DESC_VERSION, PACKAGE_STRING);
+ 
+   printf
+     ("#\n"
+@@ -3766,8 +3766,8 @@ print_hwdb_header (void)
+ {
+   time_t current_time = time (0);
+   printf ("# This file was automatically created based on description files (*.desc)\n"
+-	  "# by sane-desc %s from %s on %s",
+-	  SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (&current_time)));
++	  "# by sane-desc %s from %s\n",
++	  SANE_DESC_VERSION, PACKAGE_STRING);
+ 
+   printf
+     ("#\n"
+Index: trunk/testsuite/tools/data/db.ref
+===================================================================
+--- trunk.orig/testsuite/tools/data/db.ref
++++ trunk/testsuite/tools/data/db.ref
+@@ -1,5 +1,5 @@
+ # This file was automatically created based on description files (*.desc)
+-# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013
++# by sane-desc 3.5 from sane-backends 1.0.24git
+ #
+ # The entries below are used to detect a USB device when it's plugged in
+ # and then run a script to change the ownership and
+Index: trunk/testsuite/tools/data/hwdb.ref
+===================================================================
+--- trunk.orig/testsuite/tools/data/hwdb.ref
++++ trunk/testsuite/tools/data/hwdb.ref
+@@ -1,5 +1,5 @@
+ # This file was automatically created based on description files (*.desc)
+-# by sane-desc 3.5 from sane-backends 1.0.25git on Tue Dec  3 15:24:46 2013
++# by sane-desc 3.5 from sane-backends 1.0.25git
+ #
+ # hwdb file for supported USB devices
+ #
+Index: trunk/testsuite/tools/data/udev+acl.ref
+===================================================================
+--- trunk.orig/testsuite/tools/data/udev+acl.ref
++++ trunk/testsuite/tools/data/udev+acl.ref
+@@ -1,5 +1,5 @@
+ # This file was automatically created based on description files (*.desc)
+-# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:49 2013
++# by sane-desc 3.5 from sane-backends 1.0.24git
+ #
+ # udev rules file for supported USB and SCSI devices
+ #
+Index: trunk/testsuite/tools/data/udev+hwdb.ref
+===================================================================
+--- trunk.orig/testsuite/tools/data/udev+hwdb.ref
++++ trunk/testsuite/tools/data/udev+hwdb.ref
+@@ -1,5 +1,5 @@
+ # This file was automatically created based on description files (*.desc)
+-# by sane-desc 3.5 from sane-backends 1.0.24git on Thu Aug  1 18:50:15 2013
++# by sane-desc 3.5 from sane-backends 1.0.24git
+ #
+ # udev rules file for supported USB and SCSI devices
+ #
+Index: trunk/testsuite/tools/data/udev.ref
+===================================================================
+--- trunk.orig/testsuite/tools/data/udev.ref
++++ trunk/testsuite/tools/data/udev.ref
+@@ -1,5 +1,5 @@
+ # This file was automatically created based on description files (*.desc)
+-# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013
++# by sane-desc 3.5 from sane-backends 1.0.24git
+ #
+ # udev rules file for supported USB and SCSI devices
+ #
+Index: trunk/testsuite/tools/data/usermap.ref
+===================================================================
+--- trunk.orig/testsuite/tools/data/usermap.ref
++++ trunk/testsuite/tools/data/usermap.ref
+@@ -1,5 +1,5 @@
+ # This file was automatically created based on description files (*.desc)
+-# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013
++# by sane-desc 3.5 from sane-backends 1.0.24git
+ #
+ # The entries below are used to detect a USB device and change owner
+ # and permissions on the "device node" used by libusb.
diff --git a/debian/patches/series b/debian/patches/series
index 02949a2..8b454dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,5 @@
 0145-avahi.patch
 0100-source_spelling.patch
 0150-genesys-Fix-use-of-uninitialized-variable.patch
+#0130-usb-timeout.patch
+0715-20-sane.hwdb_multi-arch.patch
diff --git a/debian/rules b/debian/rules
index 293d798..91512fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,16 +28,19 @@ override_dh_auto_configure:
 		--localstatedir=/var \
 		--datadir=\$${prefix}/share \
 		--mandir=\$${prefix}/share/man \
-		--with-docdir=\$${prefix}/share/doc/libsane \
+		--docdir=\$${prefix}/share/doc/libsane \
 		--disable-locking \
 		--enable-static \
 		--enable-pthread \
 		--with-gphoto2 \
-		--enable-translations \
 		--enable-avahi \
 		--enable-pnm-backend \
 		--with-usb \
-		--without-v4l
+		--without-v4l \
+		--enable-parport-directio
+
+override_dh_autoreconf:
+	dh_autoreconf -Xlibtool.m4
 
 override_dh_auto_build-indep:
 	# generate POT file for translators
@@ -89,7 +92,7 @@ override_dh_installman-indep:
 override_dh_installdocs-arch:
 	dh_installdocs
 	# move files that belong to libsane-dev
-	mv debian/tmp/usr/share/doc/sane-backends/backend-writing.txt debian/libsane-dev/usr/share/doc/libsane-dev/
+	mv debian/tmp/usr/share/doc/libsane/backend-writing.txt debian/libsane-dev/usr/share/doc/libsane-dev/
 
 override_dh_installdocs-indep:
 	dh_installdocs
diff --git a/debian/sane-utils.saned.default b/debian/sane-utils.saned.default
index b0647cc..691e5a5 100644
--- a/debian/sane-utils.saned.default
+++ b/debian/sane-utils.saned.default
@@ -1,8 +1,4 @@
 # Defaults for the saned initscript, from sane-utils
 
-# To enable under systemd please read README.Debian
-# Set to yes to start saned under SysV
-RUN=no
-
 # Set to the user saned should run as
 RUN_AS_USER=saned
diff --git a/debian/sane-utils.saned.init b/debian/sane-utils.saned.init
index 2e624a6..e629105 100644
--- a/debian/sane-utils.saned.init
+++ b/debian/sane-utils.saned.init
@@ -33,11 +33,6 @@ if [ -f /etc/default/saned ] ; then
     . /etc/default/saned
 fi
 
-if [ "x$RUN" != "xyes" ] ; then
-    log_success_msg "$NAME disabled; edit /etc/default/saned"
-    exit 0
-fi
-
 DAEMON_OPTS="-a $RUN_AS_USER"
 
 set -e