diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-10-13 07:21:57 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-10-13 07:21:57 +0200 |
| commit | bc7bfb103acda936bd145f2d90e292a5fe0460d2 (patch) | |
| tree | 8f74d634be11840fd3f526e5fd48d94abbd7c26a /debian/patches/multiarch_dll_search_path.patch | |
| parent | 90ad29d4f6fc7011a538a339bf3d4f9260899a80 (diff) | |
Rename & reorder patches
Diffstat (limited to 'debian/patches/multiarch_dll_search_path.patch')
| -rw-r--r-- | debian/patches/multiarch_dll_search_path.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/debian/patches/multiarch_dll_search_path.patch b/debian/patches/multiarch_dll_search_path.patch deleted file mode 100644 index 703a408..0000000 --- a/debian/patches/multiarch_dll_search_path.patch +++ /dev/null @@ -1,42 +0,0 @@ -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. -Author: Julien BLACHE <jblache@debian.org> - ---- a/backend/dll.c -+++ b/backend/dll.c -@@ -430,7 +430,7 @@ - - if (path) - { -- src_len = strlen (path) + strlen (STRINGIFY (LIBDIR)) + 1 + 1; -+ src_len = strlen (path) + strlen (DEB_DLL_LIBDIR) + 1 + 1; - src = malloc (src_len); - if (!src) - { -@@ -438,12 +438,11 @@ - return SANE_STATUS_NO_MEM; - } - orig_src = src; -- snprintf (src, src_len, "%s:%s", path, STRINGIFY (LIBDIR)); -+ snprintf (src, src_len, "%s:%s", path, DEB_DLL_LIBDIR); - } - else - { -- src = STRINGIFY (LIBDIR); -- src = strdup (src); -+ src = strdup (DEB_DLL_LIBDIR); - if (!src) - { - DBG (1, "load: strdup failed: %s\n", strerror (errno)); ---- a/backend/Makefile.in -+++ b/backend/Makefile.in -@@ -1868,7 +1868,7 @@ - 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 |