[Python-modules-commits] r18290 - in packages/shiboken/trunk/debian (7 files)

[odyx at users.alioth.debian.org]

    Date: Tuesday, August 23, 2011 @ 13:07:46
  Author: odyx
Revision: 18290

Convert library to multiarch.

- Bump B-D:
  - on debhelper to 8.9.3.
  - on cmake to 2.8.4+dfsg.1-3~.
- Bump debhelper compatibility level to 9.
- Override lintian warning about debhelper being too young.
- Update *.install files to cope with new library paths.
- Update .so symlinks paths.
- Initialize D_H_MULTIARCH from dpkg-architectures, use it in the LIB_SUFFIX cmake variable
- Add a Pre-Depends on multiarch-support to the libshiboken package.
- Add Multi-Arch: same to the libshiboken package.

Added:
  packages/shiboken/trunk/debian/source.lintian-overrides
Modified:
  packages/shiboken/trunk/debian/compat
  packages/shiboken/trunk/debian/control
  packages/shiboken/trunk/debian/libshiboken-dev.install
  packages/shiboken/trunk/debian/libshiboken1.0.install
  packages/shiboken/trunk/debian/rules
  packages/shiboken/trunk/debian/shiboken-dbg.install

Modified: packages/shiboken/trunk/debian/compat
===================================================================
--- packages/shiboken/trunk/debian/compat	2011-08-23 13:07:32 UTC (rev 18289)
+++ packages/shiboken/trunk/debian/compat	2011-08-23 13:07:46 UTC (rev 18290)
@@ -1 +1 @@
-8
+9

Modified: packages/shiboken/trunk/debian/control
===================================================================
--- packages/shiboken/trunk/debian/control	2011-08-23 13:07:32 UTC (rev 18289)
+++ packages/shiboken/trunk/debian/control	2011-08-23 13:07:46 UTC (rev 18290)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Didier Raboud <odyx at debian.org>
-Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 8~), cmake (>= 2.8.2),
+Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 8.9.3~), cmake (>= 2.8.4+dfsg.1-3~),
  libqt4-dev (>= 4:4.7.0),
  libapiextractor-dev (>= 0.10.5),
  generatorrunner (>= 0.6.11), libgenrunner-dev (>> 0.6.11),
@@ -44,6 +44,8 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: CPython bindings generator for C++ libraries - shared library
  Shiboken is a bindings generator for C++ libraries that outputs CPython
  source code. It uses generatorrunner and apiextractor to collect information

Modified: packages/shiboken/trunk/debian/libshiboken-dev.install
===================================================================
--- packages/shiboken/trunk/debian/libshiboken-dev.install	2011-08-23 13:07:32 UTC (rev 18289)
+++ packages/shiboken/trunk/debian/libshiboken-dev.install	2011-08-23 13:07:46 UTC (rev 18290)
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/*.so
-usr/lib/pkgconfig/*
-usr/lib/cmake/*
+usr/lib/*/*.so
+usr/lib/*/pkgconfig/*
+usr/lib/*/cmake/*

Modified: packages/shiboken/trunk/debian/libshiboken1.0.install
===================================================================
--- packages/shiboken/trunk/debian/libshiboken1.0.install	2011-08-23 13:07:32 UTC (rev 18289)
+++ packages/shiboken/trunk/debian/libshiboken1.0.install	2011-08-23 13:07:46 UTC (rev 18290)
@@ -1 +1 @@
-usr/lib/libshiboken*.so.*
+usr/lib/*/libshiboken*.so.*

Modified: packages/shiboken/trunk/debian/rules
===================================================================
--- packages/shiboken/trunk/debian/rules	2011-08-23 13:07:32 UTC (rev 18289)
+++ packages/shiboken/trunk/debian/rules	2011-08-23 13:07:46 UTC (rev 18290)
@@ -7,6 +7,8 @@
 PYVERSIONS=$(shell pyversions -v -r)
 DEFAULT_PY=$(shell pyversions -v -d)
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 # G++ versions
 g++-version := $(shell readlink /usr/bin/g++ | sed -e 's/g++-\(.*\)\.\(.*\)/\1\2/')
 g++-version-ge-4.5 := $(shell if test $(g++-version) -ge 45; then echo "yes"; else echo "no"; fi)
@@ -20,6 +22,7 @@
 	dh_auto_configure -a --builddirectory=build-$*-dbg -- \
 	-DCMAKE_BUILD_TYPE:STRING="Debug" \
 	-DCMAKE_SKIP_RPATH=true \
+	-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \
 	-DCMAKE_USE_PYTHON_VERSION="$*-dbg;$*_d;$*" \
 	-DPython_ADDITIONAL_VERSIONS="$*-dbg;$*_d;$*"
 
@@ -28,6 +31,7 @@
 	dh_auto_configure --builddirectory=build-$* -- \
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
 	-DCMAKE_SKIP_RPATH=true \
+	-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \
 	-DCMAKE_USE_PYTHON_VERSION=$* \
 	-DPython_ADDITIONAL_VERSIONS=$* \
 	-DDEFAULT_PYTHON_BASENAME=python${DEFAULT_PY}
@@ -90,11 +94,11 @@
 ifneq (,$(filter libshiboken-dev, $(shell dh_listpackages)))
 	# Setup the default version symbolic links
 	ln -sf libshiboken-python${DEFAULT_PY}.so \
-	               debian/libshiboken-dev/usr/lib/libshiboken.so
+	               debian/libshiboken-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libshiboken.so
 endif
 ifneq (,$(filter shiboken-dbg, $(shell dh_listpackages)))
 	ln -sf libshiboken-python${DEFAULT_PY}-dbg.so \
-	               debian/shiboken-dbg/usr/lib/libshiboken-dbg.so
+	               debian/shiboken-dbg/usr/lib/$(DEB_HOST_MULTIARCH)/libshiboken-dbg.so
 endif
 
 #### Shared libs ####

Modified: packages/shiboken/trunk/debian/shiboken-dbg.install
===================================================================
--- packages/shiboken/trunk/debian/shiboken-dbg.install	2011-08-23 13:07:32 UTC (rev 18289)
+++ packages/shiboken/trunk/debian/shiboken-dbg.install	2011-08-23 13:07:46 UTC (rev 18290)
@@ -1,2 +1,2 @@
-usr/lib/*.so*
-usr/lib/cmake/*/*-dbg.cmake
+usr/lib/*/*.so*
+usr/lib/*/cmake/*/*-dbg.cmake

Added: packages/shiboken/trunk/debian/source.lintian-overrides
===================================================================
--- packages/shiboken/trunk/debian/source.lintian-overrides	                        (rev 0)
+++ packages/shiboken/trunk/debian/source.lintian-overrides	2011-08-23 13:07:46 UTC (rev 18290)
@@ -0,0 +1,2 @@
+# Compat 9 is used on purpose, for multiarch.
+package-needs-versioned-debhelper-build-depends 9