[Python-modules-commits] r15674 - in packages/shiboken/trunk/debian (rules shiboken-dbg.install)

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

    Date: Monday, February 14, 2011 @ 15:28:19
  Author: odyx-guest
Revision: 15674

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

Modified:
  packages/shiboken/trunk/debian/rules
  packages/shiboken/trunk/debian/shiboken-dbg.install

Modified: packages/shiboken/trunk/debian/rules
===================================================================
--- packages/shiboken/trunk/debian/rules	2011-02-14 15:27:32 UTC (rev 15673)
+++ packages/shiboken/trunk/debian/rules	2011-02-14 15:28:19 UTC (rev 15674)
@@ -21,7 +21,6 @@
 	-DCMAKE_BUILD_TYPE:STRING="Debug" \
 	-DCMAKE_SKIP_RPATH=true \
 	-DCMAKE_USE_PYTHON_VERSION="$*-dbg;$*_d;$*" \
-	-DCMAKE_DEBUG_POSTFIX=$(shell echo -py$*_d | sed -e 's/\.//g' -)
 
 override_dh_auto_configure-%:
 	mkdir -p build-$*
@@ -29,8 +28,7 @@
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
 	-DCMAKE_SKIP_RPATH=true \
 	-DCMAKE_USE_PYTHON_VERSION=$* \
-	-DDEFAULT_SHIBOKEN_POSTFIX=$(shell echo -py${DEFAULT_PY} | sed -e 's/\.//g' -) \
-	-DCMAKE_RELEASE_POSTFIX=$(shell echo -py$* | sed -e 's/\.//g' -)
+	-DDEFAULT_PYTHON_BASENAME=python${DEFAULT_PY}
 
 #### BUILD ####
 
@@ -57,7 +55,7 @@
 
 #### STRIP ####
 override_dh_strip:
-	dh_strip --dbg-package=shiboken-dbg --exclude=_d.so
+	dh_strip --dbg-package=shiboken-dbg --exclude=-dbg.so
 
 #### TEST ####
 
@@ -71,24 +69,24 @@
 
 prepare_debug_test-%:
 	# Prepare the convenience symlinks for the tests
-	$(shell ln -s libother`echo -py$* | sed -e 's/\.//g' -`_d.so \
+	$(shell ln -s libother-python$*-dbg.so \
 	   build-$*-dbg/tests/libother/libother.so )
-	$(shell ln -s libsample`echo -py$* | sed -e 's/\.//g' -`_d.so \
+	$(shell ln -s libsample-python$*-dbg.so \
 	   build-$*-dbg/tests/libsample/libsample.so )
-	$(shell ln -s other`echo -py$* | sed -e 's/\.//g' -`_d.so \
+	$(shell ln -s other-python$*-dbg.so \
 	   build-$*-dbg/tests/otherbinding/other.so )
-	$(shell ln -s sample`echo -py$* | sed -e 's/\.//g' -`_d.so \
+	$(shell ln -s sample-python$*-dbg.so \
 	   build-$*-dbg/tests/samplebinding/sample.so )
 
 prepare_test-%:
 	# Prepare the convenience symlinks for the tests
-	$(shell ln -s libother`echo -py$* | sed -e 's/\.//g' -`.so \
+	$(shell ln -s libother-python$*.so \
 	   build-$*/tests/libother/libother.so )
-	$(shell ln -s libsample`echo -py$* | sed -e 's/\.//g' -`.so \
+	$(shell ln -s libsample-python$*.so \
 	   build-$*/tests/libsample/libsample.so )
-	$(shell ln -s other`echo -py$* | sed -e 's/\.//g' -`.so \
+	$(shell ln -s other-python$*.so \
 	   build-$*/tests/otherbinding/other.so )
-	$(shell ln -s sample`echo -py$* | sed -e 's/\.//g' -`.so \
+	$(shell ln -s sample-python$*.so \
 	   build-$*/tests/samplebinding/sample.so )
 
 #### CLEAN ####
@@ -111,15 +109,10 @@
 
 override_dh_install_done: override_dh_install_real
 	# Setup the default version symbolic links
-	$(shell ln -sf shiboken_generator`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`.so \
-	               debian/shiboken/usr/lib/generatorrunner/shiboken_generator.so )
-	$(shell ln -sf libshiboken`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`.so \
+	$(shell ln -sf libshiboken-python${DEFAULT_PY}.so \
 	               debian/libshiboken-dev/usr/lib/libshiboken.so )
-	# Setup the debug default version symbolic links
-	$(shell ln -sf shiboken_generator`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`_d.so \
-	               debian/shiboken-dbg/usr/lib/generatorrunner/shiboken_generator_d.so )
-	$(shell ln -sf libshiboken`echo -py${DEFAULT_PY} | sed -e 's/\.//g' -`_d.so \
-	               debian/shiboken-dbg/usr/lib/libshiboken_d.so )
+	$(shell ln -sf libshiboken-python${DEFAULT_PY}-dbg.so \
+	               debian/shiboken-dbg/usr/lib/libshiboken-dbg.so )
 
 #### Shared libs ####
 override_dh_makeshlibs: $(PYVERSIONS:%=override_dh_makeshlibs-%)
@@ -128,7 +121,7 @@
 	dh_makeshlibs -Nshiboken
 
 override_dh_makeshlibs-%:
-	echo "libshiboken`echo -py$* | sed -e 's/\.//g' -`.so.1.0 libshiboken1.0 #MINVER#" > debian/libshiboken1.0.symbols-py$*
+	echo "libshiboken-python$*.so.1.0 libshiboken1.0 #MINVER#" > debian/libshiboken1.0.symbols-py$*
 	cat debian/libshiboken1.0.symbols.pristine >> debian/libshiboken1.0.symbols-py$*
 ifeq ($(g++-version-ge-4.5),yes)
 	# g++ version is >= 4.5, add related symbols

Modified: packages/shiboken/trunk/debian/shiboken-dbg.install
===================================================================
--- packages/shiboken/trunk/debian/shiboken-dbg.install	2011-02-14 15:27:32 UTC (rev 15673)
+++ packages/shiboken/trunk/debian/shiboken-dbg.install	2011-02-14 15:28:19 UTC (rev 15674)
@@ -1,3 +1,2 @@
 usr/lib/*.so*
-usr/lib/generatorrunner/*.so
-usr/lib/cmake/*/*_d.cmake
+usr/lib/cmake/*/*-dbg.cmake