[libpagemaker] 02/03: multiarchify

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libpagemaker.

commit e11ff21476b4dd6d72c543abee48840f7112a048
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Sep 12 22:38:16 2016 +0200

    multiarchify
---
 debian/compat                     | 2 +-
 debian/control                    | 5 ++++-
 debian/libpagemaker-0.0-0.install | 2 +-
 debian/libpagemaker-dev.install   | 4 ++--
 debian/rules                      | 5 ++---
 5 files changed, 10 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 f9f62fe..aa7467d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
 Uploaders: Rene Engelhard <rene at debian.org>
 Build-Depends: autotools-dev,
                dh-autoreconf,
-               debhelper (>= 9),
+               debhelper (>= 10),
                doxygen,
                libboost-dev,
                librevenge-dev,
@@ -16,6 +16,7 @@ Homepage: http://wiki.documentfoundation.org/DLP/Libraries/libpagemaker
 Package: libpagemaker-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libpagemaker-0.0-0 (= ${binary:Version}),
          librevenge-dev,
          ${misc:Depends}
@@ -27,6 +28,8 @@ Description: Library for importing and converting PageMaker Documents -- develop
 
 Package: libpagemaker-0.0-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Library for importing and converting PageMaker Documents
  libpagemaker is library providing ability to interpret and import
diff --git a/debian/libpagemaker-0.0-0.install b/debian/libpagemaker-0.0-0.install
index d0dbfd1..3ddde58 100644
--- a/debian/libpagemaker-0.0-0.install
+++ b/debian/libpagemaker-0.0-0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/libpagemaker-dev.install b/debian/libpagemaker-dev.install
index 5774e64..7df81cd 100644
--- a/debian/libpagemaker-dev.install
+++ b/debian/libpagemaker-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 c9816f1..070dda1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,8 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with autoreconf --parallel
+	dh $@ --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --docdir=/usr/share/doc/libpagemaker-doc --libdir=/usr/lib \
-		--disable-silent-rules --disable-werror
+	dh_auto_configure -- --docdir=/usr/share/doc/libpagemaker-doc --disable-werror
 

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