From 7cca33c5964f4f2e9e04effbbea0b45f460986e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 16 Sep 2020 19:45:50 +0200 Subject: witch to debhelper-compat --- debian/changelog | 3 +++ debian/compat | 1 - debian/control | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index 16bc1f1..7285d0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ sane-frontends (1.0.14-16) UNRELEASED; urgency=medium * debian/watch: Fix to new gitlab download stucture. * Add "Restrictions: superficial" to debian/tests/control (Closes: #969867). + * Switch to debhelper-compat: + - debian/control: change to debhelper-compat (=13). + - remove debian/compat. -- Jörg Frings-Fürst Mon, 18 May 2020 11:48:22 +0200 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..9f7abf1 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Standards-Version: 4.4.0 Build-Depends: - debhelper (>= 12), + debhelper-compat (= 13), libgimp2.0-dev, libgtk2.0-dev, libsane-dev -- cgit v1.2.3 From 8f3eb81943db453361bdd35b694871c37efe21e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 16 Sep 2020 19:47:54 +0200 Subject: Declare compliance with Debian Policy 4.5.0 --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7285d0c..cd927d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ sane-frontends (1.0.14-16) UNRELEASED; 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). * 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). -- Jörg Frings-Fürst Mon, 18 May 2020 11:48:22 +0200 diff --git a/debian/control b/debian/control index 9f7abf1..ffd4af4 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: sane-frontends Section: graphics Priority: optional Maintainer: Jörg Frings-Fürst -Standards-Version: 4.4.0 +Standards-Version: 4.5.0 Build-Depends: debhelper-compat (= 13), libgimp2.0-dev, -- cgit v1.2.3 From 4de7cae507fa2663a4300470432745aa08d48b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 16 Sep 2020 20:03:53 +0200 Subject: Add Forwarded: not-needed to patches --- debian/changelog | 1 + debian/patches/0125-scanadf-SIGCHLD.patch | 1 + debian/patches/0135-xscanimage_c-out-of-bounds.patch | 1 + debian/patches/0605-manpages-typo.patch | 1 + 4 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index cd927d4..b604d56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ sane-frontends (1.0.14-16) UNRELEASED; urgency=medium - 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. -- Jörg Frings-Fürst Mon, 18 May 2020 11:48:22 +0200 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 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 +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 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/ -- cgit v1.2.3 From 267031261a9613bca22befbd124804be6848d282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 16 Sep 2020 20:48:55 +0200 Subject: Fix breakout-link to /usr/lib/gimp/2.0/plug-ins/xscanimage --- debian/changelog | 3 +++ debian/sane.install | 1 + debian/sane.links | 2 +- debian/sane.preinst | 20 ++++++++++++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 debian/sane.preinst diff --git a/debian/changelog b/debian/changelog index b604d56..d9977a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ sane-frontends (1.0.14-16) UNRELEASED; urgency=medium - 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. -- Jörg Frings-Fürst Mon, 18 May 2020 11:48:22 +0200 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# -- cgit v1.2.3 From c90d7cde247eedbc05e9453ed3c2b95d19542661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 16 Sep 2020 20:54:14 +0200 Subject: d/control: Add Rules-Requires-Root: No --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index d9977a9..cd78f75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ sane-frontends (1.0.14-16) UNRELEASED; urgency=medium * 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 Mon, 18 May 2020 11:48:22 +0200 diff --git a/debian/control b/debian/control index ffd4af4..37890fb 100644 --- a/debian/control +++ b/debian/control @@ -3,6 +3,7 @@ Section: graphics Priority: optional Maintainer: Jörg Frings-Fürst Standards-Version: 4.5.0 +Rules-Requires-Root: no Build-Depends: debhelper-compat (= 13), libgimp2.0-dev, -- cgit v1.2.3 From 9f6cc7cc24818d0db1bd5d62a8b90d49b35c77ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 16 Sep 2020 20:58:21 +0200 Subject: d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cd78f75..ffc2877 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -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 structure. * Add "Restrictions: superficial" to debian/tests/control (Closes: #969867). @@ -12,7 +12,7 @@ sane-frontends (1.0.14-16) UNRELEASED; urgency=medium - New sane.preinst. * debian/control: Add Rules-Requires-Root: No. - -- Jörg Frings-Fürst Mon, 18 May 2020 11:48:22 +0200 + -- Jörg Frings-Fürst Wed, 16 Sep 2020 20:57:03 +0200 sane-frontends (1.0.14-15) unstable; urgency=medium -- cgit v1.2.3