[libmwaw] 04/05: multiarchify

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libmwaw.

commit 139e687d55f6c6207f100a7bf9a66f82187b35d4
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Sep 12 22:15:05 2016 +0200

    multiarchify
---
 debian/compat                | 2 +-
 debian/control               | 5 ++++-
 debian/libmwaw-0.3-3.install | 2 +-
 debian/libmwaw-dev.install   | 4 ++--
 debian/rules                 | 4 ++--
 5 files changed, 10 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 5f61e92..0c5b620 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libmwaw
 Priority: optional
 Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
 Uploaders: Rene Engelhard <rene at debian.org>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
                dh-autoreconf,
                libboost-dev,
                librevenge-dev,
@@ -16,6 +16,7 @@ Homepage: http://sourceforge.net/projects/libmwaw
 Package: libmwaw-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libmwaw-0.3-3 (= ${binary:Version}),
          librevenge-dev,
          ${misc:Depends}
@@ -37,6 +38,8 @@ Description: import library for some old Mac text documents -- documentation
 
 Package: libmwaw-0.3-3
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: import library for some old Mac text documents
  libmwaw contains some import filters for old Mac text documents
diff --git a/debian/libmwaw-0.3-3.install b/debian/libmwaw-0.3-3.install
index d0dbfd1..3ddde58 100644
--- a/debian/libmwaw-0.3-3.install
+++ b/debian/libmwaw-0.3-3.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/libmwaw-dev.install b/debian/libmwaw-dev.install
index 5774e64..7df81cd 100644
--- a/debian/libmwaw-dev.install
+++ b/debian/libmwaw-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 e614803..74500f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,10 @@ ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
   NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
 endif
 	
-CONFIGURE_FLAGS += --disable-werror --docdir=/usr/share/doc/libmwaw-doc --libdir=/usr/lib --without-docs
+CONFIGURE_FLAGS += --disable-werror --docdir=/usr/share/doc/libmwaw-doc --without-docs
 
 %:
-	dh $@ --parallel --with autoreconf
+	dh $@ --with autoreconf
 
 override_dh_auto_configure:
 

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