Merge branch 'release/experimental/1.0.27-1_experimental6'experimental/1.0.27-1_experimental6

8 files changed, 46 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index cdb72b7..5fb12fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+sane-backends (1.0.27-1~experimental6) experimental; urgency=medium
+
+  * Refresh symbols file for sparc64.
+  * Rewrite debian/watch for gitlab (Thanks to
+    Sebastiaan Couwenberg <sebastic@xs4all.nl>).
+  * Declare compliance with Debian Policy 4.1.5 (No changes needed).
+  * Replace manual installation of systemd files with
+    installation via dh_installsystemd (Closes: #905275).
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 03 Aug 2018 18:17:11 +0200
+
 sane-backends (1.0.27-1~experimental5) experimental; urgency=medium
 
   * debian/rules:
diff --git a/debian/control b/debian/control
index 8dc9ce7..cb78d0f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: sane-backends
 Section: graphics
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
-Standards-Version: 4.1.4
+Standards-Version: 4.1.5
 Build-Depends:
  autoconf,
  chrpath,
diff --git a/debian/libsane1.symbols.sparc64 b/debian/libsane1.symbols.sparc64
index a79c5af..04a5076 100644
--- a/debian/libsane1.symbols.sparc64
+++ b/debian/libsane1.symbols.sparc64
@@ -5389,7 +5389,6 @@ libsane-plustek_pp.so.1 libsane1 #MINVER#
  sanei_pp_outb_addr@Base 1.0.25
  sanei_pp_outb_ctrl@Base 1.0.25
  sanei_pp_outb_data@Base 1.0.25
- sanei_pp_outb_epp@Base 1.0.25
  sanei_pp_release@Base 1.0.25
  sanei_pp_set_datadir@Base 1.0.25
  sanei_pp_setmode@Base 1.0.25
@@ -7149,7 +7148,6 @@ libsane.so.1 libsane1 #MINVER#
  sanei_pp_outb_addr@Base 1.0.25
  sanei_pp_outb_ctrl@Base 1.0.25
  sanei_pp_outb_data@Base 1.0.25
- sanei_pp_outb_epp@Base 1.0.25
  sanei_pp_release@Base 1.0.25
  sanei_pp_set_datadir@Base 1.0.25
  sanei_pp_setmode@Base 1.0.25
diff --git a/debian/rules b/debian/rules
index 69b8f35..a53610d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -129,8 +129,9 @@ endif
 override_dh_installinit-arch:
 	dh_installinit -psane-utils --name=saned
 
-override_dh_systemd_enable-arch:
-	dh_systemd_enable --no-enable debian/saned.socket
+override_dh_installsystemd-arch:
+	dh_installsystemd -psane-utils --no-enable --name=saned
+	dh_installsystemd -psane-utils --no-enable --name=saned@
 
 override_dh_makeshlibs-arch:
 	dh_makeshlibs -- -v$(DEB_VERSION_UPSTREAM) -Pdebian/libsane1 -plibsane1
diff --git a/debian/sane-utils.install b/debian/sane-utils.install
index ed670e4..0162791 100644
--- a/debian/sane-utils.install
+++ b/debian/sane-utils.install
@@ -4,5 +4,3 @@ usr/bin/sane-find-scanner
 usr/bin/scanimage
 usr/sbin/saned
 tools/umax_pp usr/bin
-debian/saned.socket lib/systemd/system
-debian/saned@.service lib/systemd/system
diff --git a/debian/sane-utils.saned.socket b/debian/sane-utils.saned.socket
new file mode 100644
index 0000000..a14daef
--- /dev/null
+++ b/debian/sane-utils.saned.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=saned incoming socket
+
+[Socket]
+ListenStream=6566
+Accept=yes
+MaxConnections=64
+
+[Install]
+WantedBy=sockets.target
diff --git a/debian/sane-utils.saned@.service b/debian/sane-utils.saned@.service
new file mode 100644
index 0000000..425ee7a
--- /dev/null
+++ b/debian/sane-utils.saned@.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Scanner Service
+Requires=saned.socket
+
+[Service]
+ExecStart=/usr/sbin/saned
+User=saned
+Group=saned
+StandardInput=null
+StandardOutput=syslog
+StandardError=syslog
+Environment=SANE_CONFIG_DIR=/etc/sane.d
+# Environment=SANE_CONFIG_DIR=/etc/sane.d SANE_DEBUG_DLL=255
+
+[Install]
+Also=saned.socket
diff --git a/debian/watch b/debian/watch
index 2207322..a3e79c0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -2,4 +2,8 @@
 # watch file for sane-backends
 #
 version=4
-https://alioth.debian.org/frs/?group_id=30186 .*/sane-backends-(.*).(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
+opts=\
+dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/ \
+https://gitlab.com/sane-project/backends/tags \
+(?:.*?/)?(?:rel|v|sane-backends)[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))