From cdb0c379d18ce9423d0038d45d74af84c76b3451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 24 May 2020 18:17:45 +0200 Subject: d/rules: Add override_dh_installman-arch to remove obsolete man page sane-config.1 --- debian/changelog | 4 +++- debian/rules | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4da7740..9bee89e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,9 @@ sane-backends (1.0.30-1~experimental1) experimental; urgency=medium * Migrate to debhelper 13: - Bump minimum debhelper-compat version in debian/control to = 13. * debian/watch: Fix to new gitlab download structure. - * debian/rules: Remove DEB_LDFLAGS_MAINT_APPEND after lintian warning. + * debian/rules: + - Remove DEB_LDFLAGS_MAINT_APPEND after lintian warning. + - Add override_dh_installman-arch to remove obsolete man page sane-config.1. -- Jörg Frings-Fürst Sun, 24 May 2020 13:03:27 +0200 diff --git a/debian/rules b/debian/rules index 6694316..eac8ba3 100755 --- a/debian/rules +++ b/debian/rules @@ -92,6 +92,10 @@ override_dh_installman-indep: # remove manpages for not build libs $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man5/sane-v4l.5 +override_dh_installman-arch: + dh_installman + $(RM) $(CURDIR)/debian/sane-utils/usr/share/man/man1/sane-config.1 + override_dh_installdocs-arch: dh_installdocs # move files that belong to libsane-dev -- cgit v1.2.3 From 6a41ccf8e16ea7e3ba45a10e6ab3262b6bc6cab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 24 May 2020 18:21:55 +0200 Subject: Remove d/libsane-dev.preinst because sane-config was removed in oldstable --- debian/changelog | 2 ++ debian/libsane-dev.preinst | 23 ----------------------- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 debian/libsane-dev.preinst diff --git a/debian/changelog b/debian/changelog index 9bee89e..2e36847 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ sane-backends (1.0.30-1~experimental1) experimental; urgency=medium * debian/rules: - Remove DEB_LDFLAGS_MAINT_APPEND after lintian warning. - Add override_dh_installman-arch to remove obsolete man page sane-config.1. + * Remove debian/libsane-dev.preinst because sane-config was removed in + oldstable. -- Jörg Frings-Fürst Sun, 24 May 2020 13:03:27 +0200 diff --git a/debian/libsane-dev.preinst b/debian/libsane-dev.preinst deleted file mode 100644 index d547bda..0000000 --- a/debian/libsane-dev.preinst +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -set -e - - - -case "$1" in - install|upgrade|abort-upgrade) -# -# remove obsolete files -# - rm -f /usr/bin/sane-config.* - if [ -h /usr/bin/sane-config ] ; then - rm -f /usr/bin/sane-config - fi - ;; - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - - -#DEBHELPER# -- cgit v1.2.3 From 5f8f239ef6dda376c3c3f5864aac9d713a396527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 24 May 2020 19:44:51 +0200 Subject: d/control: Replace Conflicts with Break --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2e36847..f9c08da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ sane-backends (1.0.30-1~experimental1) experimental; urgency=medium * debian/rules: - Remove DEB_LDFLAGS_MAINT_APPEND after lintian warning. - Add override_dh_installman-arch to remove obsolete man page sane-config.1. + * debian/control: + - Replace Conflicts with Breaks. * Remove debian/libsane-dev.preinst because sane-config was removed in oldstable. diff --git a/debian/control b/debian/control index a239e4c..fe40df3 100644 --- a/debian/control +++ b/debian/control @@ -84,7 +84,7 @@ Package: libsane1 Section: libs Architecture: any Multi-Arch: same -Conflicts: libsane (<< 1.0.29-1~) +Breaks: libsane (<< 1.0.29-1~) Replaces: libsane (<< 1.0.29-1~) Provides: libsane (= ${binary:Version}) Depends: -- cgit v1.2.3 From 7bdc7d1d6c70c7aa518f4364ffc8ffe1d910674a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 24 May 2020 19:45:47 +0200 Subject: d/changelog: Change date and time --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f9c08da..14504bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,7 @@ sane-backends (1.0.30-1~experimental1) experimental; urgency=medium * Remove debian/libsane-dev.preinst because sane-config was removed in oldstable. - -- Jörg Frings-Fürst Sun, 24 May 2020 13:03:27 +0200 + -- Jörg Frings-Fürst Sun, 24 May 2020 19:45:00 +0200 sane-backends (1.0.29-1~experimental4) experimental; urgency=medium -- cgit v1.2.3 -- cgit v1.2.3