[Python-modules-commits] r17594 - in packages/pyside/trunk/debian (rules)

[odyx at users.alioth.debian.org]

    Date: Friday, June 24, 2011 @ 10:27:28
  Author: odyx
Revision: 17594

Include the PySideConfig snippets for the debug flavours

1) debian/rules: move them to debian/tmp to get them installed by libpyside-dev.install.
2) debian/rules: move them from libpyside-dev back to python-pyside-dbg, while making sure the directory exists.

Note: This has always been broken.

This fixes the PySide-Mobility build.

Modified:
  packages/pyside/trunk/debian/rules

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2011-06-24 10:27:00 UTC (rev 17593)
+++ packages/pyside/trunk/debian/rules	2011-06-24 10:27:28 UTC (rev 17594)
@@ -104,6 +104,9 @@
 	             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*)
+	# 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)
 	# Setup the default version symbolic links
 	$(shell ln -s libpyside-python${DEFAULT_PY}.so.${LIBPYSIDE_SOVERSION} \
 	             debian/tmp/usr/lib/libpyside${LIBPYSIDE_SOVERSION}.so)
@@ -118,8 +121,9 @@
 	$(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*)
 	# Move the debug cmake files to the correct package
-	$(shell rename 's/(debian\/libpyside-dev\/)(.*)-dbg\.cmake/debian\/python-pyside-dbg\/$$2-dbg.cmake/'\
-	              debian/tmp-dbg/usr/lib/cmake/PySide-*/*-dbg.cmake)
+	$(shell mkdir -p debian/python-pyside-dbg/usr/lib/cmake/`basename debian/libpyside-dev/usr/lib/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)
 
 override_dh_gencontrol:
 	debian/dh_pycmakedeps --modules-root=PySide/