[libcdr] 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 libcdr.

commit 9fdce2c902e3efdb698295c0e24d8958b0db39e6
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Sep 12 21:12:17 2016 +0200

    multiarchify
---
 debian/compat               | 2 +-
 debian/control              | 5 ++++-
 debian/libcdr-0.1-1.install | 2 +-
 debian/libcdr-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 5c35752..1ca15fe 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),
                libboost-dev,
                libcppunit-dev,
                libicu-dev,
@@ -20,6 +20,7 @@ Homepage: http://freedesktop.org/wiki/Software/libcdr
 Package: libcdr-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libcdr-0.1-1 (= ${binary:Version}),
          liblcms2-dev,
          librevenge-dev,
@@ -65,6 +66,8 @@ Description: library for reading and converting Corel DRAW files -- documentatio
 
 Package: libcdr-0.1-1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library for reading and converting Corel DRAW files
  libcdr is a library and a set of tools for reading and converting binary files
diff --git a/debian/libcdr-0.1-1.install b/debian/libcdr-0.1-1.install
index d0dbfd1..3ddde58 100644
--- a/debian/libcdr-0.1-1.install
+++ b/debian/libcdr-0.1-1.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/libcdr-dev.install b/debian/libcdr-dev.install
index 5774e64..7df81cd 100644
--- a/debian/libcdr-dev.install
+++ b/debian/libcdr-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 93d7c09..84de501 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/libcdr-doc --libdir=/usr/lib --without-docs
+CONFIGURE_FLAGS += --disable-werror --docdir=/usr/share/doc/libcdr-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/libcdr.git