summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debian/changelog14
-rw-r--r--debian/control10
-rw-r--r--debian/libsane1.postinst12
-rw-r--r--debian/patches/0125-multiarch_dll_search_path.patch54
-rw-r--r--debian/patches/series2
-rwxr-xr-xdebian/rules2
6 files changed, 49 insertions, 45 deletions
diff --git a/debian/changelog b/debian/changelog
index 3063b48..d2304eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+sane-backends (1.0.27-3) unstable; urgency=medium
+
+ * debian/rules:
+ - Remove superfluous man page sane-config.1 (Closes: #910255).
+ (Thanks to Michael Westwind <wormrunner@gmail.com>).
+ * 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).
+ * debian/control:
+ - Change Breaks to Conflicts for binary package libsane1.
+
+ -- Jörg Frings-Fürst <debian@jff.email> Fri, 05 Oct 2018 07:18:56 +0200
+
sane-backends (1.0.27-2) unstable; urgency=medium
* debian/control:
diff --git a/debian/control b/debian/control
index ae76392..c52b8dc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: sane-backends
Section: graphics
Priority: optional
Maintainer: Jörg Frings-Fürst <debian@jff.email>
-Standards-Version: 4.1.5
+Standards-Version: 4.2.1
Build-Depends:
autoconf,
chrpath,
@@ -78,14 +78,14 @@ 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,
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)
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
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 06:29:54 +0000