Package: src:sane-backends
Version: 1.0.27-3.2
Tags: patch

The patch 0125-multiarch_dll_search_path.patch makes /usr/lib/sane be recognized as a directory for SANE backends. However, some .deb files with scanner drivers, typically provided by Brother, install files in /usr/lib64/sane. It would be great if that directory could be supported too.

This was mentioned in <https://bugs.debian.org/910103>, but it seems to have been overlooked.

--
Gunnar Hjalmarsson
https://launchpad.net/~gunnarhj
--- a/debian/patches/0125-multiarch_dll_search_path.patch
+++ b/debian/patches/0125-multiarch_dll_search_path.patch
@@ -1,6 +1,6 @@
 Description: Keep /usr/lib/sane as a fallback for SANE backends
  Make /usr/lib/arch_triplet/sane the default location for SANE backends,
- but keep /usr/lib/sane as a fallback for now.
+ but keep /usr/lib/sane and /usr/lib64/sane as a fallbacks for now.
 Author: Julien BLACHE <jbla...@debian.org>
 
 Index: trunk/backend/dll.c
@@ -40,7 +40,7 @@
  	-I$(top_srcdir)/include $(USB_CFLAGS) \
 -	-DLIBDIR="\"$(libdir)/sane\""
 +	-DLIBDIR="\"$(libdir)/sane\"" \
-+	-DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\""
++	-DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane:$(prefix)/lib64/sane\""
  AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
  AM_LDFLAGS = @AM_LDFLAGS@ $(STRICT_LDFLAGS)
  AR = @AR@
@@ -53,7 +53,7 @@
  ##  included LICENSE file for license information.
  
 -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\""
++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:$(prefix)/lib64/sane\""
  
  AM_LDFLAGS += $(STRICT_LDFLAGS)
  # The -rpath option is added because we are creating _LTLIBRARIES based

Reply via email to