[Python-modules-commits] r18311 - in packages/pyside/trunk/debian (6 files)

Wed Aug 24 13:41:14 UTC 2011

Date: Wednesday, August 24, 2011 @ 13:41:13
  Author: odyx
Revision: 18311

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 libpyside package.
- Add Multi-Arch: same to the libpyside package.

Added:
  packages/pyside/trunk/debian/source.lintian-overrides
Modified:
  packages/pyside/trunk/debian/compat
  packages/pyside/trunk/debian/control
  packages/pyside/trunk/debian/libpyside-dev.install
  packages/pyside/trunk/debian/libpyside1.0.install
  packages/pyside/trunk/debian/rules

Modified: packages/pyside/trunk/debian/compat
===================================================================

--- packages/pyside/trunk/debian/compat	2011-08-24 13:40:00 UTC (rev 18310)
+++ packages/pyside/trunk/debian/compat	2011-08-24 13:41:13 UTC (rev 18311)
@@ -1 +1 @@
-7
+9

Modified: packages/pyside/trunk/debian/control
===================================================================
--- packages/pyside/trunk/debian/control	2011-08-24 13:40:00 UTC (rev 18310)
+++ packages/pyside/trunk/debian/control	2011-08-24 13:41:13 UTC (rev 18311)
@@ -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: debhelper (>= 7.4.12~), cmake (>= 2.8.2), dpkg-dev (>= 1.15.6),
+Build-Depends: debhelper (>= 8.9.3~), cmake (>= 2.8.4+dfsg.1-3~), dpkg-dev (>= 1.15.6),
  python-all-dev (>= 2.6.6-3), python-all-dbg (>= 2.6.6-3),
  phonon-backend-gstreamer,
  libqt4-dev (>= 4:4.7.0), libphonon-dev, libqt4-opengl-dev (>= 4:4.7.0), libqtwebkit-dev,
@@ -71,6 +71,8 @@
 Package: libpyside1.0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Python bindings for Qt 4 (base files)
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.

Modified: packages/pyside/trunk/debian/libpyside-dev.install
===================================================================
--- packages/pyside/trunk/debian/libpyside-dev.install	2011-08-24 13:40:00 UTC (rev 18310)
+++ packages/pyside/trunk/debian/libpyside-dev.install	2011-08-24 13:41:13 UTC (rev 18311)
@@ -1,5 +1,5 @@
 usr/include/PySide/*
 usr/share/PySide/typesystems/*
-usr/lib/libpyside*.so
-usr/lib/cmake/PySide-*/*
-usr/lib/pkgconfig/pyside.pc
+usr/lib/*/libpyside*.so
+usr/lib/*/cmake/PySide-*/*
+usr/lib/*/pkgconfig/pyside.pc

Modified: packages/pyside/trunk/debian/libpyside1.0.install
===================================================================
--- packages/pyside/trunk/debian/libpyside1.0.install	2011-08-24 13:40:00 UTC (rev 18310)
+++ packages/pyside/trunk/debian/libpyside1.0.install	2011-08-24 13:41:13 UTC (rev 18311)
@@ -1 +1 @@
-usr/lib/libpyside*.so.*
+usr/lib/*/libpyside*.so.*

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2011-08-24 13:40:00 UTC (rev 18310)
+++ packages/pyside/trunk/debian/rules	2011-08-24 13:41:13 UTC (rev 18311)
@@ -8,6 +8,8 @@
 DEFAULT_PY=$(shell pyversions -v -d)
 LIBPYSIDE_SOVERSION=1.0
 
+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)
@@ -22,6 +24,7 @@
 	-DCMAKE_VERBOSE_MAKEFILE=OFF \
 	-DCMAKE_BUILD_TYPE:STRING="Debug" \
 	-DCMAKE_SKIP_RPATH=true \
+	-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \
 	-DCMAKE_USE_PYTHON_VERSION="$*-dbg;$*_d;$*" \
 	-DUSE_XVFB=true \
 	-DPYTHON_BASENAME=python$*-dbg
@@ -32,6 +35,7 @@
 	-DCMAKE_VERBOSE_MAKEFILE=OFF \
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
 	-DCMAKE_SKIP_RPATH=true \
+	-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \
 	-DCMAKE_USE_PYTHON_VERSION="$*" \
 	-DUSE_XVFB=true \
 	-DPYTHON_BASENAME=python$* \
@@ -113,16 +117,16 @@
 	$(shell rename 's/(debian\/tmp-dbg\/)(.*)\.so(.*)$$/debian\/tmp\/$$2_d.so$$3/'\
 	             debian/tmp-dbg/usr/lib/python*/*-packages/PySide/*.so)
 	$(shell rename 's/(debian\/tmp-dbg\/)(.*)\.so(.*)$$/debian\/tmp\/$$2.so$$3/'\
-	             debian/tmp-dbg/usr/lib/*.so*)
+	             debian/tmp-dbg/usr/lib/${DEB_HOST_MULTIARCH}/*.so*)
 	# Move the PySideConfig snippets for the debug flavours in the standard install directory
 	$(shell rename 's/(debian\/tmp-dbg\/)(.*)$$/debian\/tmp\/$$2/'\
-	             debian/tmp-dbg/usr/lib/cmake/PySide-*/*-dbg.cmake)
+	             debian/tmp-dbg/usr/lib/${DEB_HOST_MULTIARCH}/cmake/PySide-*/*-dbg.cmake)
 endif
 ifneq (,$(filter libpyside$(LIBPYSIDE_SOVERSION), $(shell dh_listpackages)))
 	# Setup the default version symbolic links
 	$(shell ln -s libpyside-python${DEFAULT_PY}.so.${LIBPYSIDE_SOVERSION} \
-	             debian/tmp/usr/lib/libpyside${LIBPYSIDE_SOVERSION}.so)
-	$(shell ln -s libpyside${LIBPYSIDE_SOVERSION}.so debian/tmp/usr/lib/libpyside.so)
+	             debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libpyside${LIBPYSIDE_SOVERSION}.so)
+	$(shell ln -s libpyside${LIBPYSIDE_SOVERSION}.so debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libpyside.so)
 endif
 
 override_dh_install_2: override_dh_install_1
@@ -132,12 +136,13 @@
 override_dh_install_3: override_dh_install_2
 ifneq (,$(filter python-pyside-dbg, $(shell dh_listpackages)))
 	# Move the debug library to the correct package.
-	$(shell rename 's/(debian\/libpyside${LIBPYSIDE_SOVERSION}\/)(.*)-dbg\.so(.*)$$/debian\/python-pyside-dbg\/$$2-dbg.so$$3/' \
-	              debian/libpyside${LIBPYSIDE_SOVERSION}/usr/lib/*-dbg.so*)
+	$(shell mkdir -p debian/python-pyside-dbg/usr/lib/${DEB_HOST_MULTIARCH}/ ; \
+		rename 's/(debian\/libpyside${LIBPYSIDE_SOVERSION}\/)(.*)-dbg\.so(.*)$$/debian\/python-pyside-dbg\/$$2-dbg.so$$3/' \
+	              debian/libpyside${LIBPYSIDE_SOVERSION}/usr/lib/${DEB_HOST_MULTIARCH}/*-dbg.so*)
 	# Move the debug cmake files to the correct package
-	$(shell mkdir -p debian/python-pyside-dbg/usr/lib/cmake/`basename debian/libpyside-dev/usr/lib/cmake/PySide-*`; \
+	$(shell mkdir -p debian/python-pyside-dbg/usr/lib/${DEB_HOST_MULTIARCH}/cmake/`basename debian/libpyside-dev/usr/lib/${DEB_HOST_MULTIARCH}/cmake/PySide-*`; \
 	        rename 's/(debian\/libpyside-dev\/)(.*)-dbg\.cmake/debian\/python-pyside-dbg\/$$2-dbg.cmake/'\
-	              debian/libpyside-dev/usr/lib/cmake/PySide-*/*-dbg.cmake)
+	              debian/libpyside-dev/usr/lib/${DEB_HOST_MULTIARCH}/cmake/PySide-*/*-dbg.cmake)
 endif
 
 override_dh_gencontrol:

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


