[libstaroffice] 04/06: multiarchify

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libstaroffice.

commit bd2a4ade032fc8bd7f50461a0de87b4f00fc5d7d
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Wed Sep 7 22:58:48 2016 +0200

    multiarchify
---
 debian/control                     | 3 +++
 debian/libstaroffice-0.0-0.install | 2 +-
 debian/libstaroffice-dev.install   | 6 +++---
 debian/rules                       | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 9e1b0f9..a35d64f 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Homepage: https://github.com/fosnola/libstaroffice
 Package: libstaroffice-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libstaroffice-0.0-0 (= ${binary:Version}), ${misc:Depends}
 Description: Import filter library to import all StarOffice documents -- development
  The purpose of libstaroffice is to build a filter for old StarOffice's
@@ -23,6 +24,8 @@ Description: Import filter library to import all StarOffice documents -- develop
 
 Package: libstaroffice-0.0-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Import filter library to import all StarOffice documents
  The purpose of libstaroffice is to build a filter for old StarOffice's
diff --git a/debian/libstaroffice-0.0-0.install b/debian/libstaroffice-0.0-0.install
index d0dbfd1..3ddde58 100644
--- a/debian/libstaroffice-0.0-0.install
+++ b/debian/libstaroffice-0.0-0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/libstaroffice-dev.install b/debian/libstaroffice-dev.install
index 6cd8ddd..76f28fa 100644
--- a/debian/libstaroffice-dev.install
+++ b/debian/libstaroffice-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 c333f21..28b28fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
   NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
 endif
 
-CONFIGURE_FLAGS += --libdir=/usr/lib --without-docs --enable-static --disable-werror
+CONFIGURE_FLAGS += --without-docs --enable-static --disable-werror
 
 # main packaging script based on dh7 syntax
 %:

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