[libfolia] 01/01: * enable multiarch (WiP): - 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/libfolia-dev.install, debian/libfolia3.install: change usr/lib to usr/lib/* Thanks https://wiki.debian.org/Multiarch/Implementation#cdbs_with_autotools_and_debhelper

Joost van Baal joostvb at moszumanska.debian.org
Thu Feb 4 03:42:38 UTC 2016 

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

joostvb pushed a commit to branch master
in repository libfolia.

commit 895754e86ad216bb19cf31af240708c3078a8009
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date:   Thu Feb 4 04:42:32 2016 +0100

    * enable multiarch (WiP):
      - 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/libfolia-dev.install, debian/libfolia3.install: change usr/lib to
        usr/lib/*
      Thanks
      https://wiki.debian.org/Multiarch/Implementation#cdbs_with_autotools_and_debhelper
---
 debian/changelog            | 52 ++++++++++++++++++++++++---------------------
 debian/control              |  2 +-
 debian/libfolia-dev.install |  4 ++--
 debian/libfolia3.install    |  2 +-
 debian/rules                |  3 +++
 5 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bead8b1..e1ef295 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,13 +7,8 @@ libfolia (0.13-2) unstable; urgency=low
           changes.  `symbols' files are now recommended over `shlibs' files
           in most situations.  All maintainers of shared library packages
           should review the entirety of this section.
-  * FIXME E: libfolia-dev: pkg-config-multi-arch-wrong-dir
-      usr/lib/pkgconfig/folia.pc full text contains architecture specific dir
-      x86_64-linux-gnu
-  W: libfolia source: diff-contains-substvars debian/libfolia2.substvars
+
   W: libfolia source: out-of-date-standards-version 3.9.5 (current is 3.9.6)
-  E: libfolia-dev: pkg-config-multi-arch-wrong-dir usr/lib/pkgconfig/folia.pc
-   full text contains architecture specific dir x86_64-linux-gnu
 
   W: libfolia source: diff-contains-substvars debian/libfolia2.substvars
   N:·
@@ -53,26 +48,35 @@ libfolia (0.13-2) unstable; urgency=low
   N:····
   N:    Check: standards-version, Type: source
   N:·
+
+  * 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/libfolia-dev.install, debian/libfolia3.install: change usr/lib to
+      usr/lib/*
+    Thanks
+    https://wiki.debian.org/Multiarch/Implementation#cdbs_with_autotools_and_debhelper
+
+
+FIXME:
+
+If /usr/lib (or a subdirectory) is listed as an installation target in debian/*.install, or the target of a link in debian/*.links, you will need to autogenerate this file to substitute in the value of $(DEB_HOST_MULTIARCH). See Dynamic debian/* files below.
+
+Any occurrences of /usr/lib in debian/rules should be replaced with /usr/lib/$(DEB_HOST_MULTIARCH).
+
+Once you have built the package and verified that the shared library package contains only the expected files, and that your -dev package still works, mark this shared library package Multi-Arch: same in debian/control.
+
+Mark the common package(which is "all") Multi-Arch: foreign in debian/control, if it may be needed by the shared library package. 
+
+
+
+
   E: libfolia-dev: pkg-config-multi-arch-wrong-dir usr/lib/pkgconfig/folia.pc
        full text contains architecture specific dir x86_64-linux-gnu
-  N:·
-  N:    The arch all pkg-config file contains a reference to a multi-arch path.
-  N:····
-  N:    This can be usually be fixed by moving this file to a multi-arch path.
-  N:····
-  N:    Another likely cause is using debhelper 9 or newer (thus enabling
-  N:    multi-arch paths by default) on a package without multi-arch support.
-  N:    The usual cure in this case is to update it for multi-arch.
-  N:····
-  N:    Last but not least, this file could contain a reference to a cross
-  N:    architecture (like for instance a x86_64-linux-gnu pkg-config file
-  N:    referencing a i386-linux-gnu file). In this case the usual cure is to
-  N:    fix this path.
-  N:····
-  N:    Severity: important, Certainty: possible
-  N:····
-  N:    Check: files, Type: binary, udeb
- 
+
  -- Joost van Baal-Ilić <joostvb at debian.org>  Tue, 28 Jul 2015 02:56:50 +0200
 
 libfolia (0.13-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 50a80bb..6662398 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, libicu-dev, libxml2-dev, libticcutils2-dev, dh-autoreconf
+Build-Depends: cdbs (>= 0.4.93~), debhelper (>= 8.1.3), pkg-config, libicu-dev, libxml2-dev, libticcutils2-dev, dh-autoreconf
 Standards-Version: 3.9.5
 Homepage: http://ilk.uvt.nl/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/libfolia.git
diff --git a/debian/libfolia-dev.install b/debian/libfolia-dev.install
index 4198232..8bb1a6c 100644
--- a/debian/libfolia-dev.install
+++ b/debian/libfolia-dev.install
@@ -1,4 +1,4 @@
 # git://anonscm.debian.org/debian-science/packages/libfolia.git
-usr/lib/libfolia.so
-usr/lib/pkgconfig
+usr/lib/*/libfolia.so
+usr/lib/*/pkgconfig
 usr/include/libfolia
diff --git a/debian/libfolia3.install b/debian/libfolia3.install
index c11f42b..f8ec008 100644
--- a/debian/libfolia3.install
+++ b/debian/libfolia3.install
@@ -1,2 +1,2 @@
 # git://anonscm.debian.org/debian-science/packages/libfolia.git
-/usr/lib/libfolia.so.3*
+/usr/lib/*/libfolia.so.3*
diff --git a/debian/rules b/debian/rules
index a9a0240..24370ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,9 @@
 
 # git://anonscm.debian.org/debian-science/packages/libfolia.git
 
+# multiarch
+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/libfolia.git

More information about the debian-science-commits mailing list