[ucto] 01/02: * enable multiarch: - debian/control: change "Build-Depends: cdbs, debhelper (>= 7)" to more strict "Build-Depends: cdbs (>= 0.4.93~), debhelper (>= 8.1.3)" - debian/rules: Add DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) - debian/libucto*.install: change usr/lib to usr/lib/* - debian/control: Package libucto2 marked as Multi-Arch: same. Thanks https://wiki.debian.org/Multiarch/Implementation section #cdbs_with_autotools_and_debhelper .

[Joost van Baal]

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

joostvb pushed a commit to branch master
in repository ucto.

commit 1b86f35395def23ed297a2aea273ba325768fae7
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date:   Thu Feb 4 05:35:01 2016 +0100

    * enable multiarch:
      - debian/control: change "Build-Depends: cdbs,
        debhelper (>= 7)" to more strict "Build-Depends: cdbs (>= 0.4.93~),
        debhelper (>= 8.1.3)"
      - debian/rules: Add DEB_CONFIGURE_EXTRA_FLAGS +=
        --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
      - debian/libucto*.install: change usr/lib to usr/lib/*
      - debian/control: Package libucto2 marked as Multi-Arch: same.
      Thanks
      https://wiki.debian.org/Multiarch/Implementation
      section #cdbs_with_autotools_and_debhelper .
---
 debian/changelog           | 11 +++++++++++
 debian/control             |  3 ++-
 debian/libucto-dev.install |  6 +++---
 debian/libucto2.install    |  2 +-
 debian/rules               |  3 ++-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0832d8a..f67f87e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,17 @@ ucto (0.8.0-1) unstable; urgency=low
   * .gitignore: added.
   * debian/control, debian/rules: use dh-autoreconf so that 'debian/rules
     clean' does what we want.
+  * enable multiarch:
+    - debian/control: change "Build-Depends: cdbs,
+      debhelper (>= 7)" to more strict "Build-Depends: cdbs (>= 0.4.93~),
+      debhelper (>= 8.1.3)"
+    - debian/rules: Add DEB_CONFIGURE_EXTRA_FLAGS +=
+      --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+    - debian/libucto*.install: change usr/lib to usr/lib/*
+    - debian/control: Package libucto2 marked as Multi-Arch: same.
+    Thanks
+    https://wiki.debian.org/Multiarch/Implementation
+    section #cdbs_with_autotools_and_debhelper .
 
  -- Joost van Baal-Ilić <joostvb at debian.org>  Sun, 05 Jul 2015 06:55:05 +0200
 
diff --git a/debian/control b/debian/control
index 54b0524..06d2139 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Joost van Baal-Ilić <joostvb at debian.org>, Ko van der Sloot <ko.vandersloot at uvt.nl>
-Build-Depends: cdbs, debhelper (>= 7), pkg-config, dh-autoreconf, libxml2-dev, libicu-dev, libfolia-dev (>= 0.11), libticcutils2-dev
+Build-Depends: cdbs (>= 0.4.93~), debhelper (>= 8.1.3), pkg-config, dh-autoreconf, libxml2-dev, libicu-dev, libfolia-dev (>= 0.11), libticcutils2-dev
 Standards-Version: 3.9.3
 Homepage: http://ilk.uvt.nl/ucto/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/ucto.git
@@ -50,6 +50,7 @@ Description: Unicode Tokenizer - development
 Package: libucto2
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Unicode Tokenizer - runtime
  Ucto can tokenize UTF-8 encoded text files (i.e. separate words from
diff --git a/debian/libucto-dev.install b/debian/libucto-dev.install
index 4a9757a..e487233 100644
--- a/debian/libucto-dev.install
+++ b/debian/libucto-dev.install
@@ -1,4 +1,4 @@
-usr/lib/*.a
-usr/lib/libucto.so
-usr/lib/pkgconfig
+usr/lib/*/*.a
+usr/lib/*/libucto.so
+usr/lib/*/pkgconfig
 usr/include/ucto
diff --git a/debian/libucto2.install b/debian/libucto2.install
index a84c4e4..06cf2c6 100644
--- a/debian/libucto2.install
+++ b/debian/libucto2.install
@@ -1,2 +1,2 @@
-/usr/lib/libucto.so.2*
+/usr/lib/*/libucto.so.2*
 /etc/ucto
diff --git a/debian/rules b/debian/rules
index d60ec8f..9479316 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ucto.git