4 files changed, 14 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index f14118b..d946df7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+sane-backends (1.0.24-8+deb8u1) stable; urgency=medium
+
+  * Cherry-picked systemd handling from unstable (Closes: #791961):
+    - Rewrite debian/saned@.service to prevent errors by network scaning.
+    - New debian/sane-utils.links:
+      + Add a link from /dev/null to /lib/systemd/system/saned.service
+        to prevent start via fallback script /etc/init.d/saned.
+    - Add 2015 to debian/copyright.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 02 Sep 2015 14:10:00 +0200
+
 sane-backends (1.0.24-8) unstable; urgency=medium
 
   * New debian/patches/0100-usb3-corrections.patch:
diff --git a/debian/copyright b/debian/copyright
index 13aa9c7..f4bd25b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -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      Jörg Frings-Fürst <debian@jff-webhosting.net>
+           2014-2015 Jörg Frings-Fürst <debian@jff-webhosting.net>
 License: GPL-2+ with sane exception
 
 Files: backend/abaton.*
diff --git a/debian/sane-utils.links b/debian/sane-utils.links
new file mode 100644
index 0000000..50ffd0e
--- /dev/null
+++ b/debian/sane-utils.links
@@ -0,0 +1 @@
+/dev/null  /lib/systemd/system/saned.service
diff --git a/debian/saned@.service b/debian/saned@.service
index c477210..425ee7a 100644
--- a/debian/saned@.service
+++ b/debian/saned@.service
@@ -6,7 +6,7 @@ Requires=saned.socket
 ExecStart=/usr/sbin/saned
 User=saned
 Group=saned
-StandardInput=socket
+StandardInput=null
 StandardOutput=syslog
 StandardError=syslog
 Environment=SANE_CONFIG_DIR=/etc/sane.d
@@ -14,4 +14,3 @@ Environment=SANE_CONFIG_DIR=/etc/sane.d
 
 [Install]
 Also=saned.socket
-Alias=saned