From 22d17e74bcd8ba11879f5f5cb57b4dc7d9f2ae2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 4 Oct 2018 19:53:48 +0200 Subject: Remove superfluous man page sane-config.1 --- debian/changelog | 8 ++++++++ debian/rules | 2 ++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3063b48..9cc47f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +sane-backends (1.0.27-3) UNRELEASED; urgency=medium + + * debian/rules: + - Remove superfluous man page sane-config.1 (Closes: #910255). + (Thanks to Michael Westwind ). + + -- Jörg Frings-Fürst Thu, 04 Oct 2018 19:05:03 +0200 + sane-backends (1.0.27-2) unstable; urgency=medium * debian/control: diff --git a/debian/rules b/debian/rules index a53610d..4ad284a 100755 --- a/debian/rules +++ b/debian/rules @@ -90,8 +90,10 @@ override_dh_installman-indep: $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/gamma4scanimage.1 $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/sane-find-scanner.1 $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/scanimage.1 + $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/sane-config.1 $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man5/sane-umax_pp.5 $(RM) -r $(CURDIR)/debian/libsane-common/usr/share/man/man8/ + $(RM) -r $(CURDIR)/debian/libsane-common/usr/share/man/man1/ # remove manpages for not build libs $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man5/sane-v4l.5 -- cgit v1.2.3 From d9dd18ded0a9d3d61b0161886ccde7bf4bc86d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 4 Oct 2018 21:12:14 +0200 Subject: Declare compliance with Debian Policy 4.2.1 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9cc47f3..036b3d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ sane-backends (1.0.27-3) UNRELEASED; urgency=medium * debian/rules: - Remove superfluous man page sane-config.1 (Closes: #910255). (Thanks to Michael Westwind ). + * Declare compliance with Debian Policy 4.2.1 (No changes needed). -- Jörg Frings-Fürst Thu, 04 Oct 2018 19:05:03 +0200 diff --git a/debian/control b/debian/control index ae76392..309ae13 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: sane-backends Section: graphics Priority: optional Maintainer: Jörg Frings-Fürst -Standards-Version: 4.1.5 +Standards-Version: 4.2.1 Build-Depends: autoconf, chrpath, -- cgit v1.2.3 From c9c0b880fe894d2742e07ddb00985397da0f0636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 4 Oct 2018 21:30:22 +0200 Subject: Remove outdated makedev dependency --- debian/changelog | 1 + debian/control | 2 +- debian/libsane1.postinst | 12 ------------ 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 036b3d7..879a77a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ sane-backends (1.0.27-3) UNRELEASED; urgency=medium - Remove superfluous man page sane-config.1 (Closes: #910255). (Thanks to Michael Westwind ). * Declare compliance with Debian Policy 4.2.1 (No changes needed). + * Remove outdated makedev dependency (Closes: #907017). -- Jörg Frings-Fürst Thu, 04 Oct 2018 19:05:03 +0200 diff --git a/debian/control b/debian/control index 309ae13..b808617 100644 --- a/debian/control +++ b/debian/control @@ -85,7 +85,7 @@ Depends: acl [linux-any], adduser, libsane-common (= ${source:Version}), - udev [linux-any] | makedev [linux-any], + udev [linux-any], ${misc:Depends}, ${shlibs:Depends} Recommends: sane-utils (>= ${binary:Version}) diff --git a/debian/libsane1.postinst b/debian/libsane1.postinst index 914d42e..971103e 100644 --- a/debian/libsane1.postinst +++ b/debian/libsane1.postinst @@ -9,18 +9,6 @@ case "$1" in addgroup --quiet --system scanner || true fi - if [ "$(uname -s)" = "Linux" ]; then - if [ -e /dev/MAKEDEV ]; then - # create /dev/parport* - if [ ! -c /dev/parport0 ]; then - (cd /dev && ./MAKEDEV parport) || true - fi - # create /dev/sg* - if [ ! -c /dev/sg0 ]; then - (cd /dev && ./MAKEDEV sg) || true - fi - fi - fi ;; abort-upgrade|abort-remove|abort-deconfigure) -- cgit v1.2.3 From a94d3a93c14524809da1340af1e5462fa663016e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 4 Oct 2018 21:50:13 +0200 Subject: Reactivate and refresh d/p/0125-multiarch_dll_search_path.patch --- debian/changelog | 2 + .../patches/0125-multiarch_dll_search_path.patch | 54 +++++++++++----------- debian/patches/series | 2 +- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/debian/changelog b/debian/changelog index 879a77a..ab1124e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ sane-backends (1.0.27-3) UNRELEASED; urgency=medium (Thanks to Michael Westwind ). * Declare compliance with Debian Policy 4.2.1 (No changes needed). * Remove outdated makedev dependency (Closes: #907017). + * Reactivate and refresh debian/patches/0125-multiarch_dll_search_path.patch + to allow driver from non-multiarch directories (Closes: #910103). -- Jörg Frings-Fürst Thu, 04 Oct 2018 19:05:03 +0200 diff --git a/debian/patches/0125-multiarch_dll_search_path.patch b/debian/patches/0125-multiarch_dll_search_path.patch index 21c93f6..de28245 100644 --- a/debian/patches/0125-multiarch_dll_search_path.patch +++ b/debian/patches/0125-multiarch_dll_search_path.patch @@ -7,53 +7,53 @@ Index: trunk/backend/dll.c =================================================================== --- trunk.orig/backend/dll.c +++ trunk/backend/dll.c -@@ -430,7 +430,7 @@ load (struct backend *be) +@@ -450,7 +450,7 @@ load (struct backend *be) if (path) { -- src_len = strlen (path) + strlen (LIBDIR) + 1 + 1; -+ src_len = strlen (path) + strlen (DEB_DLL_LIBDIR) + 1 + 1; +- src_len = strlen (path) + strlen (DIR_SEP) + strlen(LIBDIR) + 1; ++ src_len = strlen (path) + strlen (DIR_SEP) + strlen(DEB_DLL_LIBDIR) + 1; src = malloc (src_len); if (!src) { -@@ -438,12 +438,11 @@ load (struct backend *be) - return SANE_STATUS_NO_MEM; - } +@@ -460,11 +460,11 @@ load (struct backend *be) + if (orig_src) + free (orig_src); orig_src = src; -- snprintf (src, src_len, "%s:%s", path, LIBDIR); -+ snprintf (src, src_len, "%s:%s", path, DEB_DLL_LIBDIR); +- snprintf (src, src_len, "%s%s%s", path, DIR_SEP, LIBDIR); ++ snprintf (src, src_len, "%s%s%s", path, DIR_SEP, DEB_DLL_LIBDIR); } else { - src = LIBDIR; -- src = strdup (src); -+ src = strdup (DEB_DLL_LIBDIR); ++ src = DEB_DLL_LIBDIR; + src = strdup (src); if (!src) { - DBG (1, "load: strdup failed: %s\n", strerror (errno)); Index: trunk/backend/Makefile.in =================================================================== --- trunk.orig/backend/Makefile.in +++ trunk/backend/Makefile.in -@@ -1914,7 +1914,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="\"$(libdir)/sane\"" -+AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="$(libdir)/sane" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\"" - AM_LDFLAGS = @STRICT_LDFLAGS@ - # The -rpath option is added because we are creating _LTLIBRARIES based - # on configure substitution. This causes automake to not know the +@@ -1753,7 +1753,8 @@ AMTAR = @AMTAR@ + AM_CFLAGS = @AM_CFLAGS@ + AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \ + -I$(top_srcdir)/include $(USB_CFLAGS) \ +- -DLIBDIR="\"$(libdir)/sane\"" ++ -DLIBDIR="\"$(libdir)/sane\"" \ ++ -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\"" + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AM_LDFLAGS = @AM_LDFLAGS@ $(STRICT_LDFLAGS) + AR = @AR@ Index: trunk/backend/Makefile.am =================================================================== --- trunk.orig/backend/Makefile.am +++ trunk/backend/Makefile.am -@@ -24,7 +24,7 @@ USB_LIBS = @USB_LIBS@ - SCSI_LIBS = @SCSI_LIBS@ - PTHREAD_LIBS = @PTHREAD_LIBS@ +@@ -4,7 +4,7 @@ + ## This file is part of the "Sane" build infra-structure. See + ## included LICENSE file for license information. --AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="\"$(libdir)/sane\"" -+AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="\"$(libdir)/sane\"" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\"" +-AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include $(USB_CFLAGS) -DLIBDIR="\"$(libdir)/sane\"" ++AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include $(USB_CFLAGS) -DLIBDIR="\"$(libdir)/sane\"" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\"" - V_MAJOR = @V_MAJOR@ - V_MINOR = @V_MINOR@ + AM_LDFLAGS += $(STRICT_LDFLAGS) + # The -rpath option is added because we are creating _LTLIBRARIES based diff --git a/debian/patches/series b/debian/patches/series index 8b454dc..9a7db3b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,7 +15,7 @@ #0700-mk_reproducible_results.patch 0705-kfreebsd.patch 0710-sane-desc.c_debian_mods.patch -#0125-multiarch_dll_search_path.patch +0125-multiarch_dll_search_path.patch #0135-saned-remotescanners.patch #0500-CVE-2017-6318.patch 0140-avahi.patch -- cgit v1.2.3 From 472d38beb7d0bbb46d9a2996a3b99aeaee61afa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 5 Oct 2018 06:20:47 +0200 Subject: d/control: Change Breaks to Conflicts for binary package libsane1 --- debian/changelog | 2 ++ debian/control | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ab1124e..2c09a3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ sane-backends (1.0.27-3) UNRELEASED; urgency=medium * Remove outdated makedev dependency (Closes: #907017). * Reactivate and refresh debian/patches/0125-multiarch_dll_search_path.patch to allow driver from non-multiarch directories (Closes: #910103). + * debian/control: + - Change Breaks to Conflicts for binary package libsane1 (Closes: #908681). -- Jörg Frings-Fürst Thu, 04 Oct 2018 19:05:03 +0200 diff --git a/debian/control b/debian/control index b808617..c52b8dc 100644 --- a/debian/control +++ b/debian/control @@ -78,9 +78,9 @@ Package: libsane1 Section: libs Architecture: any Multi-Arch: same -Breaks: libsane (<<1.0.27-1) -Replaces: libsane (<<1.0.27-1) -Pre-Depends: ${misc:Pre-Depends} +Conflicts: libsane (<< 1.0.27-1~) +Replaces: libsane (<< 1.0.27-1~) +Provides: libsane (= ${binary:Version}) Depends: acl [linux-any], adduser, -- cgit v1.2.3 From eddc7c5d488eb412e4d2a16a20d58917ee38a069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 5 Oct 2018 06:36:01 +0200 Subject: d/changelog: Change distribution, date / time and urgency --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2c09a3d..4cdc2bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sane-backends (1.0.27-3) UNRELEASED; urgency=medium +sane-backends (1.0.27-3) unstable; urgency=high * debian/rules: - Remove superfluous man page sane-config.1 (Closes: #910255). @@ -10,7 +10,7 @@ sane-backends (1.0.27-3) UNRELEASED; urgency=medium * debian/control: - Change Breaks to Conflicts for binary package libsane1 (Closes: #908681). - -- Jörg Frings-Fürst Thu, 04 Oct 2018 19:05:03 +0200 + -- Jörg Frings-Fürst Fri, 05 Oct 2018 06:23:55 +0200 sane-backends (1.0.27-2) unstable; urgency=medium -- cgit v1.2.3 From 70610b6ade49b65e584e1808b80705c24de6cc23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 5 Oct 2018 07:20:10 +0200 Subject: Remove Closes for bug #908681 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4cdc2bd..df04862 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,9 +8,9 @@ sane-backends (1.0.27-3) unstable; urgency=high * Reactivate and refresh debian/patches/0125-multiarch_dll_search_path.patch to allow driver from non-multiarch directories (Closes: #910103). * debian/control: - - Change Breaks to Conflicts for binary package libsane1 (Closes: #908681). + - Change Breaks to Conflicts for binary package libsane1. - -- Jörg Frings-Fürst Fri, 05 Oct 2018 06:23:55 +0200 + -- Jörg Frings-Fürst Fri, 05 Oct 2018 07:18:56 +0200 sane-backends (1.0.27-2) unstable; urgency=medium -- cgit v1.2.3 From 07c9c16d21b2381faa75f6c0f38849de261ff6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 6 Oct 2018 12:45:30 +0200 Subject: d/changelog: Set urgency back to medium --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index df04862..d2304eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sane-backends (1.0.27-3) unstable; urgency=high +sane-backends (1.0.27-3) unstable; urgency=medium * debian/rules: - Remove superfluous man page sane-config.1 (Closes: #910255). -- cgit v1.2.3