[Python-modules-commits] r25896 - in packages/shiboken/trunk/debian (rules)

[odyx at users.alioth.debian.org]

    Date: Wednesday, September 18, 2013 @ 18:23:48
  Author: odyx
Revision: 25896

Correct the default python suffix for python3, make sure cmake's default is python2's

Parse the version as part of the replacement.

Modified:
  packages/shiboken/trunk/debian/rules

Modified: packages/shiboken/trunk/debian/rules
===================================================================
--- packages/shiboken/trunk/debian/rules	2013-09-18 18:23:35 UTC (rev 25895)
+++ packages/shiboken/trunk/debian/rules	2013-09-18 18:23:48 UTC (rev 25896)
@@ -75,7 +75,7 @@
 	-DPython_ADDITIONAL_VERSIONS=$* \
 	-DPYTHON3_EXECUTABLE=/usr/bin/python$*m \
 	-DPYTHON3_DBG_EXECUTABLE=/usr/bin/python$*dm \
-	-DDEFAULT_PYTHON_SUFFIX=-python${DEFAULT_PY3}
+	-DDEFAULT_PYTHON_SUFFIX=.cpython-$(subst .,,${DEFAULT_PY3})m
 
 #### BUILD ####
 
@@ -161,6 +161,8 @@
 	# Make sure the pkg-config is the default's
 	install -D -m 644 build-${DEFAULT_PY}/data/shiboken.pc \
 			debian/libshiboken-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/shiboken.pc
+	# Make sure the cmake file is Python2's default
+	install -D -m 644 build-${DEFAULT_PY}/data/ShibokenConfig.cmake debian/libshiboken-dev/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Shiboken-$(shell grep 'set(PACKAGE_VERSION ' build-${DEFAULT_PY}/data/ShibokenConfigVersion.cmake | sed -e 's/.*PACKAGE_VERSION \(.*\))/\1/g')/ShibokenConfig.cmake
 endif
 ifneq (,$(filter shiboken-dbg, $(shell dh_listpackages)))
 	ln -sf libshiboken-python${DEFAULT_PY}-dbg.so \