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

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

    Date: Monday, February 14, 2011 @ 16:50:33
  Author: odyx-guest
Revision: 15688

Make the libpyside SOVERSION configurable in debian/rules.

Modified:
  packages/pyside/trunk/debian/rules

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2011-02-14 16:50:21 UTC (rev 15687)
+++ packages/pyside/trunk/debian/rules	2011-02-14 16:50:33 UTC (rev 15688)
@@ -6,6 +6,7 @@
 # Python versions
 PYVERSIONS=$(shell pyversions -v -r)
 DEFAULT_PY=$(shell pyversions -v -d)
+LIBPYSIDE_SOVERSION=1.0
 
 #### CONFIGURE ####
 
@@ -19,6 +20,7 @@
 	-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' -)
 
@@ -29,6 +31,7 @@
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
 	-DCMAKE_SKIP_RPATH=true \
 	-DCMAKE_USE_PYTHON_VERSION="$*" \
+	-DUSE_XVFB=true \
 	-DLIBPYSIDE_POSTFIX=$(shell echo -py$* | sed -e 's/\.//g' -) \
 	-DSHIBOKEN_POSTFIX=$(shell echo -py$* | sed -e 's/\.//g' -)
 
@@ -60,12 +63,10 @@
 override_dh_auto_test: $(PYVERSIONS:%=override_dh_auto_test_dbg-%) $(PYVERSIONS:%=override_dh_auto_test-%)
 
 override_dh_auto_test_dbg-%:
-	# Run tests in fake X Server in a non-blocking way
-	- xvfb-run -a -s -noreset dh_auto_test --builddirectory=build-$*-dbg
+	- dh_auto_test --builddirectory=build-$*-dbg
 
 override_dh_auto_test-%:
-	# Run tests in fake X Server in a non-blocking way
-	- xvfb-run -a -s -noreset dh_auto_test --builddirectory=build-$*
+	- dh_auto_test --builddirectory=build-$*
 
 #### CLEAN ####
 override_dh_auto_clean:
@@ -84,9 +85,9 @@
 	$(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.0.4 \
-	             debian/tmp/usr/lib/libpyside0.4.so)
-	$(shell ln -s libpyside0.4.so debian/tmp/usr/lib/libpyside.so)
+	$(shell ln -s libpyside`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`.so.${LIBPYSIDE_SOVERSION} \
+	             debian/tmp/usr/lib/libpyside${LIBPYSIDE_SOVERSION}.so)
+	$(shell ln -s libpyside${LIBPYSIDE_SOVERSION}.so debian/tmp/usr/lib/libpyside.so)
 
 override_dh_install_2: override_dh_install_1
 	# Do the legacy install for the rest
@@ -94,8 +95,8 @@
 
 override_dh_install_3: override_dh_install_2
 	# Move the debug library to the correct package.
-	$(shell rename 's/(debian\/libpyside0.4\/)(.*)_d\.so(.*)$$/debian\/python-pyside-dbg\/$$2_d.so$$3/' \
-	              debian/libpyside0.4/usr/lib/*_d.so*)
+	$(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*)
 
 override_dh_gencontrol:
 	debian/dh_pycmakedeps --modules-root=PySide/