[libe-book] 03/04: multiarchify

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libe-book.

commit b685d1c772c66c70b4b85d4db2bd91ab3c3e6a11
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Sep 12 21:37:24 2016 +0200

    multiarchify
---
 debian/compat                  | 2 +-
 debian/control                 | 5 ++++-
 debian/libe-book-0.1-1.install | 2 +-
 debian/libe-book-dev.install   | 4 ++--
 debian/rules                   | 3 +--
 5 files changed, 9 insertions(+), 7 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 7daf9e4..c44affe 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
 Uploaders: Rene Engelhard <rene at debian.org>
 Build-Depends: autotools-dev,
-               debhelper (>= 9),
+               debhelper (>= 10),
                gperf,
                libboost-dev,
                libboost-filesystem-dev,
@@ -20,6 +20,7 @@ Homepage: http://www.freedesktop.org/wiki/Software/libe-book
 Package: libe-book-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libe-book-0.1-1 (= ${binary:Version}),
          librevenge-dev,
          libicu-dev,
@@ -45,6 +46,8 @@ Description: library for reading and converting various  e-book formats
 
 Package: libe-book-0.1-1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library for reading and converting various  e-book formats
  libe-book is a library and a set of tools for reading and converting
diff --git a/debian/libe-book-0.1-1.install b/debian/libe-book-0.1-1.install
index d0dbfd1..3ddde58 100644
--- a/debian/libe-book-0.1-1.install
+++ b/debian/libe-book-0.1-1.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/libe-book-dev.install b/debian/libe-book-dev.install
index 5774e64..7df81cd 100644
--- a/debian/libe-book-dev.install
+++ b/debian/libe-book-dev.install
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/rules b/debian/rules
index ced989d..7f3381e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,7 @@
 CPPFLAGS+=-DBOOST_ERROR_CODE_HEADER_ONLY
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-werror --libdir=/usr/lib \
-		--disable-silent-rules
+	dh_auto_configure -- --disable-werror
 
 # fails; temporarily disabled
 #override_dh_auto_test:

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