diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 18 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/libsane-dev.preinst | 23 | ||||
| -rwxr-xr-x | debian/rules | 5 | ||||
| -rw-r--r-- | debian/watch | 2 |
5 files changed, 25 insertions, 27 deletions
diff --git a/debian/changelog b/debian/changelog index 00701ef..14504bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +sane-backends (1.0.30-1~experimental1) experimental; urgency=medium + + * New upstream release (Closes: #961302): + - fixes CVE-2020-12867, CVE-2020-12862, CVE-2020-12863, CVE-2020-12865, + CVE-2020-12861, CVE-2020-12864. + * 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. + - 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 19:45:00 +0200 + sane-backends (1.0.29-1~experimental4) experimental; urgency=medium * Add HOST_NAME_MAX to debian/patches/0155-hurd_PATH_MAX.patch. diff --git a/debian/control b/debian/control index 344f204..fe40df3 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: autoconf, autoconf-archive, chrpath, - debhelper-compat (= 12), + debhelper-compat (= 13), gettext, libavahi-client-dev, libcam-dev [kfreebsd-any], @@ -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 05d8b98..eac8ba3 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,6 @@ #export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed include /usr/share/dpkg/default.mk @@ -93,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 diff --git a/debian/watch b/debian/watch index ae623cb..c384aa1 100644 --- a/debian/watch +++ b/debian/watch @@ -6,4 +6,4 @@ opts=\ dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\ uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\ filenamemangle=s/.*\/archive\/(\d\S+)\/backends.*\.tar\.gz/backends-$1\.tar\.gz/g \ - https://gitlab.com/sane-project/backends/tags?sort=updated_desc .*/archive/(\d\S+)/.*\.tar\.gz.* + https://gitlab.com/sane-project/backends/-/tags?sort=updated_desc .*/archive/(\d\S+)/.*\.tar\.gz.* |