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

[odyx-guest at users.alioth.debian.org]

    Date: Monday, February 14, 2011 @ 16:54:28
  Author: odyx-guest
Revision: 15699

Update packaging to cope with ~beta4 (upstream adopted some patches)

Modified:
  packages/pyside/trunk/debian/rules

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2011-02-14 16:54:01 UTC (rev 15698)
+++ packages/pyside/trunk/debian/rules	2011-02-14 16:54:28 UTC (rev 15699)
@@ -23,10 +23,8 @@
 	-DCMAKE_BUILD_TYPE:STRING="Debug" \
 	-DCMAKE_SKIP_RPATH=true \
 	-DCMAKE_USE_PYTHON_VERSION="$*-dbg;$*_d;$*" \
-	-DCMAKE_DEBUG_POSTFIX=_d \
 	-DUSE_XVFB=true \
-	-DLIBPYSIDE_POSTFIX=$(shell echo -py$* | sed -e 's/\.//g' -) \
-	-DSHIBOKEN_POSTFIX=$(shell echo -py$*_d | sed -e 's/\.//g' -)
+	-DPYTHON_BASENAME=python$*-dbg
 
 override_dh_auto_configure-%:
 	mkdir -p build-$*
@@ -36,9 +34,8 @@
 	-DCMAKE_SKIP_RPATH=true \
 	-DCMAKE_USE_PYTHON_VERSION="$*" \
 	-DUSE_XVFB=true \
-	-DDEFAULT_PYSIDE_POSTFIX=$(shell echo -py${DEFAULT_PY} | sed -e 's/\.//g' -) \
-	-DLIBPYSIDE_POSTFIX=$(shell echo -py$* | sed -e 's/\.//g' -) \
-	-DSHIBOKEN_POSTFIX=$(shell echo -py$* | sed -e 's/\.//g' -)
+	-DPYTHON_BASENAME=python$* \
+	-DDEFAULT_PYTHON_BASENAME=python${DEFAULT_PY}
 
 #### BUILD ####
 
@@ -66,7 +63,7 @@
 	dh_makeshlibs
 
 override_dh_makeshlibs-%:
-	echo "libpyside`echo -py$* | sed -e 's/\.//g' -`.so.${LIBPYSIDE_SOVERSION} libpyside${LIBPYSIDE_SOVERSION} #MINVER#" > debian/libpyside${LIBPYSIDE_SOVERSION}.symbols-py$*
+	echo "libpyside-python$*.so.${LIBPYSIDE_SOVERSION} libpyside${LIBPYSIDE_SOVERSION} #MINVER#" > debian/libpyside${LIBPYSIDE_SOVERSION}.symbols-py$*
 	cat debian/libpyside${LIBPYSIDE_SOVERSION}.symbols.pristine >> debian/libpyside${LIBPYSIDE_SOVERSION}.symbols-py$*
 ifeq ($(g++-version-ge-4.5),yes)
 	# g++ version is >= 4.5, add related symbols
@@ -78,7 +75,7 @@
 
 #### STRIP ####
 override_dh_strip:
-	dh_strip --dbg-package=python-pyside-dbg --exclude=_d.so
+	dh_strip --dbg-package=python-pyside-dbg --exclude=-dbg.so --exclude=_d.so
 
 #### TEST ####
 override_dh_auto_test: $(PYVERSIONS:%=override_dh_auto_test_dbg-%) $(PYVERSIONS:%=override_dh_auto_test-%)
@@ -103,12 +100,12 @@
 
 override_dh_install_1:
 	# Move the debug .so's right in place
-	$(shell rename 's/(debian\/tmp-dbg\/)(.*)\.so(.*)$$/debian\/tmp\/$$2.so$$3/'\
+	$(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*)
 	# Setup the default version symbolic links
-	$(shell ln -s libpyside`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`.so.${LIBPYSIDE_SOVERSION} \
+	$(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)
 
@@ -118,11 +115,11 @@
 
 override_dh_install_3: override_dh_install_2
 	# Move the debug library to the correct package.
-	$(shell rename 's/(debian\/libpyside${LIBPYSIDE_SOVERSION}\/)(.*)_d\.so(.*)$$/debian\/python-pyside-dbg\/$$2_d.so$$3/' \
-	              debian/libpyside${LIBPYSIDE_SOVERSION}/usr/lib/*_d.so*)
+	$(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\/)(.*)_d\.cmake/debian\/python-pyside-dbg\/$$2_d.cmake/'\
-	              debian/tmp-dbg/usr/lib/cmake/PySide-*/*_d.cmake)
+	$(shell rename 's/(debian\/libpyside-dev\/)(.*)-dbg\.cmake/debian\/python-pyside-dbg\/$$2-dbg.cmake/'\
+	              debian/tmp-dbg/usr/lib/cmake/PySide-*/*-dbg.cmake)
 
 override_dh_gencontrol:
 	debian/dh_pycmakedeps --modules-root=PySide/