Merge branch 'release/debian/1.0.14-16' into masterdebian/1.0.14-16

9 files changed, 41 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 16bc1f1..ffc2877 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,18 @@
-sane-frontends (1.0.14-16) UNRELEASED; urgency=medium
+sane-frontends (1.0.14-16) unstable; urgency=medium
 
-  * debian/watch: Fix to new gitlab download stucture.
+  * debian/watch: Fix to new gitlab download structure.
   * Add "Restrictions: superficial" to debian/tests/control (Closes: #969867).
-
- -- Jörg Frings-Fürst <debian@jff.email>  Mon, 18 May 2020 11:48:22 +0200
+  * Switch to debhelper-compat:
+    - debian/control: change to debhelper-compat (=13).
+    - remove debian/compat.
+  * Declare compliance with Debian Policy 4.5.0 (No changes needed).
+  * Add Forwarded: not-needed to patches.
+  * Fix breakout-link to /usr/lib/gimp/2.0/plug-ins/xscanimage:
+    - Remove sane.links.
+    - New sane.preinst.
+  * debian/control: Add Rules-Requires-Root: No.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Wed, 16 Sep 2020 20:57:03 +0200
 
 sane-frontends (1.0.14-15) unstable; urgency=medium
 
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 48082f7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/debian/control b/debian/control
index 308ad24..37890fb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,10 @@ Source: sane-frontends
 Section: graphics
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
-Standards-Version: 4.4.0
+Standards-Version: 4.5.0
+Rules-Requires-Root: no
 Build-Depends:
- debhelper (>= 12),
+ debhelper-compat (= 13),
  libgimp2.0-dev,
  libgtk2.0-dev,
  libsane-dev
diff --git a/debian/patches/0125-scanadf-SIGCHLD.patch b/debian/patches/0125-scanadf-SIGCHLD.patch
index ab91534..9ce9856 100644
--- a/debian/patches/0125-scanadf-SIGCHLD.patch
+++ b/debian/patches/0125-scanadf-SIGCHLD.patch
@@ -2,6 +2,7 @@ Description: Sets SIGCHLD to SIG_DFL before execle().
 Author: Jakub Wilk <jwilk@debian.org>
 Origin: http://www.opengroup.org/onlinepubs/009695399/functions/exec.html
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=596232
+Forwarded: not-needed
 Last-Update: 2014-12-03
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/0135-xscanimage_c-out-of-bounds.patch b/debian/patches/0135-xscanimage_c-out-of-bounds.patch
index 2249f5a..33fc9d1 100644
--- a/debian/patches/0135-xscanimage_c-out-of-bounds.patch
+++ b/debian/patches/0135-xscanimage_c-out-of-bounds.patch
@@ -1,5 +1,6 @@
 Description: Correct out-of-bounds
 Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Forwarded: not-needed
 Last-Update: 2014-12-03
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/0605-manpages-typo.patch b/debian/patches/0605-manpages-typo.patch
index 2bc246b..720da4d 100644
--- a/debian/patches/0605-manpages-typo.patch
+++ b/debian/patches/0605-manpages-typo.patch
@@ -1,6 +1,7 @@
 Description: Correct typos in manpages
 Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612686
+Forwarded: not-needed
 Last-Update: 2014-12-03
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/sane.install b/debian/sane.install
index d40d673..25e252c 100644
--- a/debian/sane.install
+++ b/debian/sane.install
@@ -1 +1,2 @@
 debian/xscanimage-icon-32x32-2.xpm usr/share/sane
+debian/sane/usr/bin/xscanimage usr/lib/gimp/2.0/plug-ins/xscanimage
diff --git a/debian/sane.links b/debian/sane.links
index 54aafe8..1ad6c2f 100644
--- a/debian/sane.links
+++ b/debian/sane.links
@@ -1 +1 @@
-usr/bin/xscanimage usr/lib/gimp/2.0/plug-ins/xscanimage
+#usr/bin/xscanimage usr/lib/gimp/2.0/plug-ins/xscanimage
diff --git a/debian/sane.preinst b/debian/sane.preinst
new file mode 100644
index 0000000..9b78cf4
--- /dev/null
+++ b/debian/sane.preinst
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+    install|upgrade|abort-upgrade)
+#
+# remove obsolete link
+#
+	if [ -L /usr/lib/gimp/2.0/plug-ins/xscanimage ] ; then
+	    rm -f /usr/lib/gimp/2.0/plug-ins/xscanimage
+	fi
+	;;
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+	;;
+esac
+
+
+#DEBHELPER#