summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-08-28 12:27:54 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-08-28 12:27:54 +0200
commita57887d8a22d5f062490c84a24e7f49ace31f1eb (patch)
treeb206411262588dd0fa80e01e39c6295b0e8fbd52
parent13dc1e18743b448b39fddffe9f16e1facf5b9f2b (diff)
Add /lib64/sane to lib search path
-rw-r--r--debian/changelog10
-rw-r--r--debian/patches/0125-multiarch_dll_search_path.patch2
2 files changed, 7 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 979a2da..26eee57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
sane-backends (1.0.31-1~experimental1) UNRELEASED; urgency=medium
- * New upstream release (Closes: #968949).
+ * New upstream release (Closes: #968949, #962539).
* Add back libsane transitional package, to ease upgrades (Closes: #962936):
- debian/control: Add package libsane as oldlibs.
Thanks to Gianfranco Costamagna <locutusofborg@debian.org>.
- * debian/copyright: Fix lintian *-globbing-patterns errors.
+ * debian/copyright:
+ - Fix lintian *-globbing-patterns errors.
+ - Refresh to the new upstream release.
* Convert debian/po/de.po to utf-8.
* New patches:
- debian/patches/0045-disable_lock_test_at_build_time.patch
@@ -21,8 +23,8 @@ sane-backends (1.0.31-1~experimental1) UNRELEASED; urgency=medium
- New debian/sane-utils.logrotate to pack and remove old logs.
* debian/libsane-common.lintian-overrides:
- Rename tags.
- * debian/copyright:
- - Refresh to the new upstream release.
+ * debian/patches/0125-multiarch_dll_search_path.patch:
+ - Add $(prefix)/lib64/sane to lib search path (Closes: #931297).
-- Jörg Frings-Fürst <debian@jff.email> Mon, 01 Jun 2020 13:14:34 +0200
diff --git a/debian/patches/0125-multiarch_dll_search_path.patch b/debian/patches/0125-multiarch_dll_search_path.patch
index a420f82..25726c7 100644
--- a/debian/patches/0125-multiarch_dll_search_path.patch
+++ b/debian/patches/0125-multiarch_dll_search_path.patch
@@ -39,7 +39,7 @@ Index: trunk/backend/Makefile.am
## 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