summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-05-26 12:15:40 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-05-26 12:15:40 +0200
commitd404b8154beefa0e15ce8c96c1c539a46e28a4da (patch)
treec085558d171157c60138c85a02a9d43e92d4b4e4 /debian
parentdb55c84dfb314ff78c903e8939756d8c9c46726a (diff)
parentc393b9b94c4718c86df08b26ec36a4a2ba4c34ad (diff)
Merge tag 'experimental/1.0.30-1_experimental1' into develop
New upstream release [RC]
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog10
-rw-r--r--debian/control2
-rw-r--r--debian/libsane-dev.preinst23
-rwxr-xr-xdebian/rules4
4 files changed, 13 insertions, 26 deletions
diff --git a/debian/changelog b/debian/changelog
index 4da7740..14504bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,15 @@ 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.
+ * debian/control:
+ - Replace Conflicts with Breaks.
+ * Remove debian/libsane-dev.preinst because sane-config was removed in
+ oldstable.
- -- Jörg Frings-Fürst <debian@jff.email> Sun, 24 May 2020 13:03:27 +0200
+ -- Jörg Frings-Fürst <debian@jff.email> Sun, 24 May 2020 19:45:00 +0200
sane-backends (1.0.29-1~experimental4) experimental; urgency=medium
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:
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#
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