From a57887d8a22d5f062490c84a24e7f49ace31f1eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 28 Aug 2020 12:27:54 +0200 Subject: Add /lib64/sane to lib search path --- debian/changelog | 10 ++++++---- debian/patches/0125-multiarch_dll_search_path.patch | 2 +- 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 . - * 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 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 -- cgit v1.2.3