Source: xapian-core
Followup-For: Bug #765820
Here's an updated patch for 1.2.21. It also patches original source
files instead of derived files (eg: debian/control.in instead of
debian/control)
-- System Information:
Debian Release: 8.0
APT prefers testing
APT policy: (700, 'testing'), (650, 'stable'), (600, 'unstable'), (550,
'experimental')
Architecture: i386 (x86_64)
Foreign Architectures: amd64
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_IE.UTF-8, LC_CTYPE=en_IE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)
--- a/debian/compat 2015-07-18 16:30:49.000000000 +0100
+++ b/debian/compat 2015-07-18 16:31:58.000000000 +0100
@@ -1 +1 @@
-7
+9
--- a/debian/control.in 2015-07-18 16:28:41.000000000 +0100
+++ b/debian/control.in 2015-07-18 16:30:36.000000000 +0100
@@ -11,8 +11,10 @@
Package: libxapian@LIBXAPIAN_SOVERSION@
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: xapian-tools
+Multi-Arch: same
Description: Search engine library
This package contains the core Xapian runtime library.
.
@@ -30,6 +32,7 @@
Priority: extra
Depends: libxapian@LIBXAPIAN_SOVERSION@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: libc6-dbg, libgcc1-dbg, zlib1g-dbg, libstdc++6-4.6-dbg
+Multi-Arch: same
Description: Debugging symbols for the Xapian Search engine library
This package contains debugging symbols for the core Xapian library.
.
--- a/debian/libxapianVERSION-dev.install
+++ b/debian/libxapianVERSION-dev.install
@@ -1,9 +1,9 @@
usr/bin/xapian-config
usr/include
-usr/lib/cmake/xapian
-usr/lib/libxapian.a
-usr/lib/libxapian.la
-usr/lib/libxapian.so
-usr/lib/pkgconfig/xapian-core.pc
+usr/lib/*/cmake/xapian
+usr/lib/*/libxapian.a
+usr/lib/*/libxapian.la
+usr/lib/*/libxapian.so
+usr/lib/*/pkgconfig/xapian-core.pc
usr/share/aclocal
usr/share/man/man1/xapian-config.1
--- a/debian/libxapianVERSION.install
+++ b/debian/libxapianVERSION.install
@@ -1 +1 @@
-usr/lib/libxapian.so.*
+usr/lib/*/libxapian.so.*
--- a/debian/rules
+++ b/debian/rules
@@ -55,6 +55,7 @@
# Disable the testsuite when cross-compiling.
DEB_BUILD_OPTIONS += nocheck
endif
+confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
# For i386 and *-i386.
ifeq ($(patsubst %-i386,i386,$(DEB_HOST_ARCH)), i386)
@@ -165,13 +166,13 @@
ifdef XAPIAN_BUILD_SSE
$(MAKE) -C build-sse2 DESTDIR=$(CURDIR)/debian/tmp-sse2 install
- mkdir -p $(CURDIR)/debian/libxapian$(libxapian_soversion)/usr/lib/sse2
- mv $(CURDIR)/debian/tmp-sse2/usr/lib/libxapian*.so.* $(CURDIR)/debian/libxapian$(libxapian_soversion)/usr/lib/sse2
+ mkdir -p $(CURDIR)/debian/libxapian$(libxapian_soversion)/usr/lib/$(DEB_HOST_MULTIARCH)/sse2
+ mv $(CURDIR)/debian/tmp-sse2/usr/lib/$(DEB_HOST_MULTIARCH)/libxapian*.so.* $(CURDIR)/debian/libxapian$(libxapian_soversion)/usr/lib/$(DEB_HOST_MULTIARCH)/sse2
rm -rf $(CURDIR)/debian/tmp-sse2
endif
# Empty dependency_libs to placate luddite release goal.
- sed -i 's/^\(dependency_libs=\).*/\1/' $(CURDIR)/debian/tmp/usr/lib/libxapian.la
+ sed -i 's/^\(dependency_libs=\).*/\1/' $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libxapian.la
# Install the example source code
mkdir -p debian/tmp/usr/share/doc/xapian-examples/examples
