[libexttextcat] 05/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 libexttextcat.

commit ab16879c00221fce50859d06e07c0b912bd6a9d0
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Sep 6 20:15:58 2016 +0200

    multiarchify
---
 debian/compat                      | 2 +-
 debian/control                     | 6 +++++-
 debian/libexttextcat-2.0-0.install | 4 ++--
 debian/libexttextcat-dev.install   | 6 +++---
 debian/libexttextcat-dev.links     | 5 +++--
 debian/rules                       | 1 +
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 1f147ae..b82ef8f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,15 @@ Section: libs
 Priority: optional
 Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
 Uploaders: Rene Engelhard <rene at debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), dh-autoreconf
+Build-Depends: cdbs (>= 0.4.93~), debhelper (>= 9), dh-exec (>= 0.3), dh-autoreconf
 Standards-Version: 3.7.2
 Homepage: https://wiki.documentfoundation.org/Libexttextcat
 
 Package: libexttextcat-2.0-0
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, libexttextcat-data (= ${source:Version})
 Description: Language detection library
  Libextttextcat is a library with functions that implement the classification
@@ -20,6 +22,7 @@ Description: Language detection library
 Package: libexttextcat-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libexttextcat-2.0-0 (= ${binary:Version}), ${misc:Depends}
 Description: Language detection library - development files
  Libexttextcat is a library with functions that implement the classification
@@ -33,6 +36,7 @@ Description: Language detection library - development files
 Package: libexttextcat-data
 Section: text
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: Language detection library - data files
  Libextttextcat is a library with functions that implement the classification
diff --git a/debian/libexttextcat-2.0-0.install b/debian/libexttextcat-2.0-0.install
index 3119fc1..6d28c97 100644
--- a/debian/libexttextcat-2.0-0.install
+++ b/debian/libexttextcat-2.0-0.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libexttextcat-2.0.so.0.0.0
-debian/tmp/usr/lib/libexttextcat-2.0.so.0
+debian/tmp/usr/lib/*/libexttextcat-2.0.so.0.0.0
+debian/tmp/usr/lib/*/libexttextcat-2.0.so.0
diff --git a/debian/libexttextcat-dev.install b/debian/libexttextcat-dev.install
index 7cba27b..85f402a 100644
--- a/debian/libexttextcat-dev.install
+++ b/debian/libexttextcat-dev.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/libexttextcat-2.0.a
-debian/tmp/usr/lib/libexttextcat-2.0.so
+debian/tmp/usr/lib/*/libexttextcat-2.0.a
+debian/tmp/usr/lib/*/libexttextcat-2.0.so
 debian/tmp/usr/include/libexttextcat
-debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/*/pkgconfig
 debian/tmp/usr/share/vala/vapi/libexttextcat.vapi
diff --git a/debian/libexttextcat-dev.links b/debian/libexttextcat-dev.links
old mode 100644
new mode 100755
index ef163f6..ea80b4f
--- a/debian/libexttextcat-dev.links
+++ b/debian/libexttextcat-dev.links
@@ -1,3 +1,4 @@
-usr/lib/libexttextcat-2.0.a usr/lib/libexttextcat.a
-usr/lib/libexttextcat-2.0.so usr/lib/libexttextcat.so
+#! /usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libexttextcat-2.0.a usr/lib/${DEB_HOST_MULTIARCH}/libexttextcat.a
+usr/lib/${DEB_HOST_MULTIARCH}/libexttextcat-2.0.so usr/lib/${DEB_HOST_MULTIARCH}/libexttextcat.so
 
diff --git a/debian/rules b/debian/rules
index 78fc42c..b4593b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_MAKE_CHECK_TARGET = check
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 install:
 	$(MAKE) install

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