[libwpd] 06/07: multiarchify

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libwpd.

commit 73ae946ca4b5493b6242ef9df27b1cb7b30d8af4
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Sep 12 23:07:19 2016 +0200

    multiarchify
---
 debian/compat                 | 2 +-
 debian/control                | 5 ++++-
 debian/libwpd-0.10-10.install | 2 +-
 debian/libwpd-dev.install     | 6 +++---
 debian/rules                  | 4 ++--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 4483e0d..1857ef3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,14 @@ Section: devel
 Priority: optional
 Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
 Uploaders:  Rene Engelhard <rene at debian.org>
-Build-Depends: debhelper (>= 9), libcppunit-dev, dh-autoreconf, zlib1g-dev, pkg-config, dpkg-dev (>= 1.16.1), librevenge-dev
+Build-Depends: debhelper (>= 10), libcppunit-dev, dh-autoreconf, zlib1g-dev, pkg-config, dpkg-dev (>= 1.16.1), librevenge-dev
 Build-Depends-Indep: doxygen
 Standards-Version: 3.9.7
 
 Package: libwpd-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libwpd-0.10-10 (= ${binary:Version}), ${misc:Depends}
 Description: Library for handling WordPerfect documents (development)
  libwpd is a library for reading and writing WordPerfect(TM) documents.
@@ -22,6 +23,8 @@ Description: Library for handling WordPerfect documents (development)
 Package: libwpd-0.10-10
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: libwpd0, libwpd2, libwpd3, libwpd4, libwpd5, libwpd6, libwpd8
 Conflicts: libwpd0, libwpd2, libwpd3, libwpd4, libwpd5, libwpd6, libwpd8
diff --git a/debian/libwpd-0.10-10.install b/debian/libwpd-0.10-10.install
index 90e9f36..8128150 100644
--- a/debian/libwpd-0.10-10.install
+++ b/debian/libwpd-0.10-10.install
@@ -1 +1 @@
-usr/lib/libwpd-0.10.so.*
+usr/lib/*/libwpd-0.10.so.*
diff --git a/debian/libwpd-dev.install b/debian/libwpd-dev.install
index 6cd8ddd..76f28fa 100644
--- a/debian/libwpd-dev.install
+++ b/debian/libwpd-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/rules b/debian/rules
index b07297c..ee79fb1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ endif
 
 #DEBHELPER_OPTIONS = -N libwpd-tools
 
-CONFIGURE_FLAGS = --disable-werror --enable-static --disable-silent-rules
+CONFIGURE_FLAGS = --disable-werror --enable-static
 
 
 build: build-arch build-indep
@@ -102,7 +102,7 @@ binary-arch: build-arch install
 	dh_fixperms -a $(DEBHELPER_OPTIONS)
 	dh_makeshlibs
 	cat debian/libwpd-0.10-10/DEBIAN/shlibs > debian/shlibs.local
-	dh_shlibdeps -a l debian/libwpd-0.10-10/usr/lib \
+	dh_shlibdeps -a l debian/libwpd-0.10-10/usr/lib/$(DEB_HOST_MULTIARCH) \
 		$(DEBHELPER_OPTIONS)
 	rm debian/shlibs.local
 	dh_installdeb -a $(DEBHELPER_OPTIONS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libwpd.git