[libabw] 05/07: remove explicit --libdir=/usr/lib; multiarchify

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libabw.

commit 6ce0788f23c50df872d4b2e2f4826778c8008403
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Sep 6 01:32:38 2016 +0200

    remove explicit --libdir=/usr/lib; multiarchify
---
 debian/control              | 3 +++
 debian/libabw-0.1-1.install | 2 +-
 debian/libabw-dev.install   | 4 ++--
 debian/rules                | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index c5b386e..6ea7ca3 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Homepage: https://wiki.documentfoundation.org/DLP/Libraries/libabw
 Package: libabw-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libabw-0.1-1 (= ${binary:Version}),
          librevenge-dev,
          ${misc:Depends}
@@ -29,6 +30,8 @@ Description: library for reading and writing AbiWord(tm) documents -- developmen
 
 Package: libabw-0.1-1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library for reading and writing AbiWord(tm) documents
  Libabw is library providing ability to interpret and import AbiWord
diff --git a/debian/libabw-0.1-1.install b/debian/libabw-0.1-1.install
index d0dbfd1..3ddde58 100644
--- a/debian/libabw-0.1-1.install
+++ b/debian/libabw-0.1-1.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/libabw-dev.install b/debian/libabw-dev.install
index 5774e64..7df81cd 100644
--- a/debian/libabw-dev.install
+++ b/debian/libabw-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 0b44e9c..a92b23c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,6 @@ CPPFLAGS+=-DBOOST_SYSTEM_NO_DEPRECATED
 	dh $@ --parallel --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-werror --libdir=/usr/lib \
+	dh_auto_configure -- --disable-werror \
 		--disable-silent-rules
 

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