From 367c9223dfbe5e3a4f4a4a82f328cea41c0e7ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 8 May 2020 21:10:42 +0200 Subject: new release 1.0.29-2 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 00701ef..3d921e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sane-backends (1.0.29-2) UNRELEASED; urgency=medium + + * Upload to unstable. + + -- Jörg Frings-Fürst Fri, 08 May 2020 21:07:06 +0200 + sane-backends (1.0.29-1~experimental4) experimental; urgency=medium * Add HOST_NAME_MAX to debian/patches/0155-hurd_PATH_MAX.patch. -- cgit v1.2.3 From 1ae6cba5016d9ea065d064915da55afe69c7c762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 9 May 2020 18:58:54 +0200 Subject: Migrate to debhelper 13; Fix to new gitlab download stucture --- debian/changelog | 3 +++ debian/control | 2 +- debian/watch | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3d921e8..3e4f8d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ sane-backends (1.0.29-2) UNRELEASED; urgency=medium * Upload to unstable. + * Migrate to debhelper 13: + - Bump minimum debhelper-compat version in debian/control to = 13. + * debian/watch: Fix to new gitlab download stucture. -- Jörg Frings-Fürst Fri, 08 May 2020 21:07:06 +0200 diff --git a/debian/control b/debian/control index 344f204..a239e4c 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], 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.* -- cgit v1.2.3 From 1e31bfd0ef26c9439843829a2513d1a6010542c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 23 May 2020 16:23:52 +0200 Subject: New upstream release --- debian/changelog | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3e4f8d9..9885df6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ -sane-backends (1.0.29-2) UNRELEASED; urgency=medium +sane-backends (1.0.30-1) UNRELEASED; urgency=medium - * Upload to unstable. + * 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 stucture. + * debian/watch: Fix to new gitlab download structure. -- Jörg Frings-Fürst Fri, 08 May 2020 21:07:06 +0200 -- cgit v1.2.3 From 0cebfcec4131c8ecb8c47b4ced09ec0fd3d1ba5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 24 May 2020 13:01:17 +0200 Subject: d/rules: Remove DEB_LDFLAGS_MAINT_APPEND after lintian warning --- debian/changelog | 5 +++-- debian/rules | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9885df6..efe11ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sane-backends (1.0.30-1) UNRELEASED; urgency=medium +sane-backends (1.0.30-1) unstable; urgency=medium * New upstream release (Closes: #961302): - fixes CVE-2020-12867, CVE-2020-12862, CVE-2020-12863, CVE-2020-12865, @@ -6,8 +6,9 @@ sane-backends (1.0.30-1) UNRELEASED; 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. - -- Jörg Frings-Fürst Fri, 08 May 2020 21:07:06 +0200 + -- Jörg Frings-Fürst Sat, 23 May 2020 16:24:21 +0200 sane-backends (1.0.29-1~experimental4) experimental; urgency=medium diff --git a/debian/rules b/debian/rules index 05d8b98..6694316 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 -- cgit v1.2.3 From db55c84dfb314ff78c903e8939756d8c9c46726a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 24 May 2020 13:05:48 +0200 Subject: d/changelog: Change distribution to experimental, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index efe11ef..4da7740 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sane-backends (1.0.30-1) unstable; urgency=medium +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, @@ -8,7 +8,7 @@ sane-backends (1.0.30-1) unstable; urgency=medium * debian/watch: Fix to new gitlab download structure. * debian/rules: Remove DEB_LDFLAGS_MAINT_APPEND after lintian warning. - -- Jörg Frings-Fürst Sat, 23 May 2020 16:24:21 +0200 + -- Jörg Frings-Fürst Sun, 24 May 2020 13:03:27 +0200 sane-backends (1.0.29-1~experimental4) experimental; urgency=medium -- cgit v1.2.3 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(-) (limited to 'debian') 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 (limited to 'debian') 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(-) (limited to 'debian') 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(-) (limited to 'debian') 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