[libitpp] 02/02: Multiarch additions to debian/{control,rules}

[Kumar Appaiah]

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

akumar pushed a commit to branch master
in repository libitpp.

commit e5da61dc8d3bd766b01d6c75f1cc58c4807c025a
Author: Kumar Appaiah <akumar at debian.org>
Date:   Fri Mar 21 00:30:27 2014 -0400

    Multiarch additions to debian/{control,rules}
    
    * Multiarch additions to debian/{control,rules}
      + Move the library and pkgconfig files to the
        DEB_HOST_MULTIARCH directory manually.
      + Add Multi-Arch: same for the library
    * Fix SCM URIs to canonical ones
---
 debian/changelog           | 10 ++++++++++
 debian/control             |  2 ++
 debian/libitpp-dev.install |  4 ++--
 debian/libitpp8.install    |  2 +-
 debian/rules               |  8 +++++++-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c91bb91..8a3262d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libitpp (4.3.1-3) unstable; urgency=low
+
+  * Multiarch additions to debian/{control,rules}
+    + Move the library and pkgconfig files to the
+      DEB_HOST_MULTIARCH directory manually.
+    + Add Multi-Arch: same for the library
+  * Fix SCM URIs to canonical ones
+
+ -- Kumar Appaiah <akumar at debian.org>  Thu, 20 Mar 2014 23:48:56 -0400
+
 libitpp (4.3.1-2) unstable; urgency=low
 
   * Add a patch to use memmove instead of memcpy in multilateration
diff --git a/debian/control b/debian/control
index 9cb7182..0d90214 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,8 @@ Description: C++ library of signal processing and communication routines: Header
 Package: libitpp8
 Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: C++ library of signal processing and communication routines
  IT++ is a C++ library of mathematical, signal processing and
diff --git a/debian/libitpp-dev.install b/debian/libitpp-dev.install
index ebb048d..38a4d62 100644
--- a/debian/libitpp-dev.install
+++ b/debian/libitpp-dev.install
@@ -1,6 +1,6 @@
 usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
 usr/bin/itpp-config
 usr/share/man/man1/*
 usr/share/itpp/*
diff --git a/debian/libitpp8.install b/debian/libitpp8.install
index d0dbfd1..3ddde58 100644
--- a/debian/libitpp8.install
+++ b/debian/libitpp8.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 7de6e8b..99eac38 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 DEBUG_PACKAGE = $(shell awk '/^Package/ && /-dbg *$$/ { print $$2 }' debian/control)
 %:
 	VERBOSE=1 dh $@ --parallel --builddirectory=build
@@ -8,7 +10,7 @@ DEBUG_PACKAGE = $(shell awk '/^Package/ && /-dbg *$$/ { print $$2 }' debian/cont
 
 override_dh_auto_configure:
 	mkdir -p build
-	(cd build && cmake .. -DCMAKE_CXX_FLAGS="" -DCMAKE_CXX_FLAGS_RELEASE="$(CPPFLAGS) $(CXXFLAGS)" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON -DGTEST_DIR=/usr/src/gtest -DHTML_DOCS=off)
+	(cd build && cmake .. -DCMAKE_CXX_FLAGS="" -DCMAKE_CXX_FLAGS_RELEASE="$(CPPFLAGS) $(CXXFLAGS)" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON -DGTEST_DIR=/usr/src/gtest -DHTML_DOCS=off  -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_HOST_MULTIARCH)")
 
 override_dh_auto_build-arch:
 	dh_auto_build --builddirectory=build -- itpp
@@ -23,6 +25,10 @@ override_dh_auto_test-indep:
 
 override_dh_auto_install:
 	dh_auto_install --builddirectory=build
+	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
+	mv debian/tmp/usr/lib/libitpp.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
+	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+	mv debian/tmp/usr/lib/pkgconfig/* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
 	dh_install
 
 override_dh_strip:

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