[med-svn] r15646 - trunk/packages/insighttoolkit/trunk/debian

[Steven Michael Robbins]

Author: smr
Date: 2013-12-28 20:41:34 +0000 (Sat, 28 Dec 2013)
New Revision: 15646

Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/control
   trunk/packages/insighttoolkit/trunk/debian/control.in
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Make multi-arch.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2013-12-28 17:01:06 UTC (rev 15645)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2013-12-28 20:41:34 UTC (rev 15646)
@@ -6,8 +6,11 @@
     3.9.5.
   
   * watch: Change pattern from .tar.gz --> .tar.xz.
+  
+  * control.in:
+  * rules: Mark libinsighttoolkit4.5 multi-arch "same".
 
- -- Steve M. Robbins <smr at debian.org>  Tue, 24 Dec 2013 21:23:38 -0600
+ -- Steve M. Robbins <smr at debian.org>  Sat, 28 Dec 2013 14:41:06 -0600
 
 insighttoolkit4 (4.4.2-4) unstable; urgency=low
 

Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control	2013-12-28 17:01:06 UTC (rev 15645)
+++ trunk/packages/insighttoolkit/trunk/debian/control	2013-12-28 20:41:34 UTC (rev 15646)
@@ -5,7 +5,7 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steve M. Robbins <smr at debian.org>
 Build-Depends: debhelper (>= 9),
- cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
+ cmake (>= 2.8.5), cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
  zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff5-alt-dev,
  libfftw3-dev,
  uuid-dev, libminc-dev, libhdf5-dev,
@@ -17,6 +17,8 @@
 Package: libinsighttoolkit4.5
 Section: libs
 Architecture: amd64 i386
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Image processing toolkit for registration and segmentation - runtime
  ITK is an open-source software toolkit for performing registration and

Modified: trunk/packages/insighttoolkit/trunk/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control.in	2013-12-28 17:01:06 UTC (rev 15645)
+++ trunk/packages/insighttoolkit/trunk/debian/control.in	2013-12-28 20:41:34 UTC (rev 15646)
@@ -5,7 +5,7 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steve M. Robbins <smr at debian.org>
 Build-Depends: debhelper (>= 9),
- cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
+ cmake (>= 2.8.5), cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
  zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff5-alt-dev,
  libfftw3-dev,
  uuid-dev, libminc-dev, libhdf5-dev,
@@ -17,6 +17,8 @@
 Package: libinsighttoolkit at SOVERSION@
 Section: libs
 Architecture: amd64 i386
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Image processing toolkit for registration and segmentation - runtime
  ITK is an open-source software toolkit for performing registration and

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2013-12-28 17:01:06 UTC (rev 15645)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2013-12-28 20:41:34 UTC (rev 15646)
@@ -47,6 +47,7 @@
 pkg_dev = libinsighttoolkit$(VER_MAJOR)-dev
 pkg_examples = insighttoolkit$(VER_MAJOR)-examples
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@ --builddir=BUILD --parallel
@@ -63,12 +64,11 @@
 
 override_dh_lintian:
 	echo "$(pkg_lib): package-name-doesnt-match-sonames" > debian/$(pkg_lib).lintian-overrides
-	echo "$(pkg_lib): embedded-library usr/lib/libitktiff-4.2.so.1: tiff" >> debian/$(pkg_lib).lintian-overrides
 	dh_lintian
 
 override_dh_install: 
 	# pkg_lib
-	dh_install -p$(pkg_lib) -XJava -XPython -XTcl debian/tmp/usr/lib/lib*.so.* usr/lib
+	dh_install -p$(pkg_lib) -XJava -XPython -XTcl debian/tmp/usr/lib/lib*.so.* usr/lib/$(DEB_HOST_MULTIARCH)
 	cp CMake/InsightValgrind.supp Insight$(SOVERSION)Valgrind.supp
 	cp Modules/ThirdParty/VNL/src/vxl/config/valgrind.supp Insight$(SOVERSION)VxlValgrind.supp
 	dh_install -p$(pkg_lib) Insight$(SOVERSION)*.supp usr/lib/valgrind
@@ -76,7 +76,7 @@
 	# pkg_dev
 	dh_installman -p$(pkg_dev) debian/insighttoolkit.3
 	dh_installdocs -p$(pkg_dev) Documentation/*
-	dh_install -p$(pkg_dev) -XJava -XPython -XTcl debian/tmp/usr/lib/lib*.so usr/lib
+	dh_install -p$(pkg_dev) -XJava -XPython -XTcl debian/tmp/usr/lib/lib*.so usr/lib/$(DEB_HOST_MULTIARCH)
 	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/ITK-$(SOVERSION)/*
 	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/cmake
 	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/bin/itkTestDriver