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

commit 8be52367f3af2f97f8dd89c5af3f89c0d87b2a7a
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Sep 7 21:48:13 2016 +0200

    multiarchify
---
 debian/compat                                    | 2 +-
 debian/control                                   | 7 ++++++-
 debian/liborcus-0.11-0.install                   | 6 +++---
 debian/liborcus-dev.install                      | 6 +++---
 debian/liborcus-spreadsheet-model-0.11-0.install | 2 +-
 debian/rules                                     | 2 +-
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index b83273f..8c68f5e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: liborcus
 Priority: optional
 Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
 Uploaders: Rene Engelhard <rene at debian.org>
-Build-Depends: debhelper (>= 8.0.0), zlib1g-dev, python3, dh-autoreconf, pkg-config, libboost-system-dev, dpkg-dev (>= 1.16.1), libboost-iostreams-dev, libboost-program-options-dev, libboost-filesystem-dev, libmdds-dev (>= 1.2), chrpath, libixion-dev (>= 0.11.0~), python3-dev
+Build-Depends: debhelper (>= 9), zlib1g-dev, python3, dh-autoreconf, pkg-config, libboost-system-dev, dpkg-dev (>= 1.16.1), libboost-iostreams-dev, libboost-program-options-dev, libboost-filesystem-dev, libmdds-dev (>= 1.2), chrpath, libixion-dev (>= 0.11.0~), python3-dev
 Standards-Version: 3.9.3
 Section: libs
 Homepage: https://gitlab.com/orcus/orcus
@@ -10,6 +10,7 @@ Homepage: https://gitlab.com/orcus/orcus
 Package: liborcus-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: liborcus-0.11-0 (= ${binary:Version}), liborcus-spreadsheet-model-0.11-0 (= ${binary:Version}), ${misc:Depends}
 Description: library for processing spreadsheet documents -- development
  Orcus is a library that provides a collection of standalone file processing
@@ -26,6 +27,8 @@ Description: library for processing spreadsheet documents -- development
 Package: liborcus-0.11-0
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: library for processing spreadsheet documents
  Orcus is a library that provides a collection of standalone file processing
@@ -39,6 +42,8 @@ Description: library for processing spreadsheet documents
 Package: liborcus-spreadsheet-model-0.11-0
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: library for processing spreadsheet documents - spreadsheet model library
  Orcus is a library that provides a collection of standalone file processing
diff --git a/debian/liborcus-0.11-0.install b/debian/liborcus-0.11-0.install
index fe43104..ca53a41 100644
--- a/debian/liborcus-0.11-0.install
+++ b/debian/liborcus-0.11-0.install
@@ -1,4 +1,4 @@
-usr/lib/liborcus-0.11*.so.*
-usr/lib/liborcus-mso-0.11*.so.*
-usr/lib/liborcus-parser-0.11*.so.*
+usr/lib/*/liborcus-0.11*.so.*
+usr/lib/*/liborcus-mso-0.11*.so.*
+usr/lib/*/liborcus-parser-0.11*.so.*
 
diff --git a/debian/liborcus-dev.install b/debian/liborcus-dev.install
index 6cd8ddd..76f28fa 100644
--- a/debian/liborcus-dev.install
+++ b/debian/liborcus-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/liborcus-spreadsheet-model-0.11-0.install b/debian/liborcus-spreadsheet-model-0.11-0.install
index 5a0500d..b4475c7 100644
--- a/debian/liborcus-spreadsheet-model-0.11-0.install
+++ b/debian/liborcus-spreadsheet-model-0.11-0.install
@@ -1 +1 @@
-usr/lib/liborcus-spreadsheet-model-0.11.so.*
+usr/lib/*/liborcus-spreadsheet-model-0.11.so.*
diff --git a/debian/rules b/debian/rules
index 6e87603..3cc6533 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,5 +38,5 @@ endif
 override_dh_auto_install:
 	dh_auto_install
 	find debian/tmp/usr/lib/python* -name "*.*a" -exec rm {} \;
-	chrpath -d debian/tmp/usr/lib/liborcus-0.11.so.0.0.0
+	chrpath -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/liborcus-0.11.so.0.0.0
 

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