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

[kitterman at users.alioth.debian.org]

    Date: Saturday, October 3, 2015 @ 22:59:08
  Author: kitterman
Revision: 34483

* Team upload.
* Update debian/rules to use shiboken multiarch triplet names for python3.5
  (Closes: #793669)
  - Thanks to Iain Laine for the patch

Modified:
  packages/pyside/trunk/debian/changelog
  packages/pyside/trunk/debian/rules

Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog	2015-10-03 19:55:16 UTC (rev 34482)
+++ packages/pyside/trunk/debian/changelog	2015-10-03 22:59:08 UTC (rev 34483)
@@ -1,3 +1,12 @@
+pyside (1.2.2-2) unstable; urgency=medium
+
+  * Team upload.
+  * Update debian/rules to use shiboken multiarch triplet names for python3.5
+    (Closes: #793669)
+    - Thanks to Iain Laine for the patch
+
+ -- Scott Kitterman <scott at kitterman.com>  Sat, 03 Oct 2015 11:32:31 -0400
+
 pyside (1.2.2-1) unstable; urgency=medium
 
   * New 1.2.2 upstream release 

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2015-10-03 19:55:16 UTC (rev 34482)
+++ packages/pyside/trunk/debian/rules	2015-10-03 22:59:08 UTC (rev 34483)
@@ -17,6 +17,12 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+# the python version we are being called on atm, in the form "34" (for 3.4)
+PYVER=$(subst .,,$*)
+# python ≥ 3.5 append the multiarch triplet to module names (in particular this
+# is reflected in ShibokenConfig.cmake)
+PYMODULESUFFIX=$(if $(shell test $(PYVER) -ge 35 && echo "yes"),"-$(DEB_HOST_MULTIARCH)","")
+
 ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
 	BD_DEBUG           = python-all-dbg (>= 2.6.6-3~), python3-all-dbg, shiboken-dbg (>= 1.2.2),
 endif
@@ -89,14 +95,14 @@
 	dh_auto_configure -a --builddirectory=build-$*-dbg -- \
 	$(CMAKE_COMMON_OPTIONS) \
 	-DCMAKE_BUILD_TYPE:STRING="Debug" \
-	-DPYTHON_SUFFIX=.cpython-$(subst .,,$*)dm
+	-DPYTHON_SUFFIX=.cpython-$(PYVER)dm$(PYMODULESUFFIX)
 
 override_dh_auto_configure_3-%:
 	mkdir -p build-$*
 	dh_auto_configure -a --builddirectory=build-$* -- \
 	$(CMAKE_COMMON_OPTIONS) \
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
-	-DPYTHON_SUFFIX=.cpython-$(subst .,,$*)m \
+	-DPYTHON_SUFFIX=.cpython-$(PYVER)m$(PYMODULESUFFIX) \
 	-DDEFAULT_PYTHON_BASENAME=-python${DEFAULT_PY}
 
 #### BUILD ####