[Python-modules-commits] r26116 - in packages/pyqt5/trunk/debian (changelog rules)

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

    Date: Wednesday, October 9, 2013 @ 14:29:57
  Author: mitya57-guest
Revision: 26116

Build QML plugin only for the default Python version.

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

Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog	2013-10-09 08:42:57 UTC (rev 26115)
+++ packages/pyqt5/trunk/debian/changelog	2013-10-09 14:29:57 UTC (rev 26116)
@@ -13,6 +13,7 @@
     as they contain non-free jquery version (and we can't build jquery
     resource file when jquery is not in tarball) (closes: #722990).
   * Update debian/watch to use dversionmangle.
+  * Build QML plugin only for the default Python version.
 
  -- Scott Kitterman <scott at kitterman.com>  Fri, 23 Aug 2013 23:22:12 -0400
 

Modified: packages/pyqt5/trunk/debian/rules
===================================================================
--- packages/pyqt5/trunk/debian/rules	2013-10-09 08:42:57 UTC (rev 26115)
+++ packages/pyqt5/trunk/debian/rules	2013-10-09 14:29:57 UTC (rev 26116)
@@ -10,8 +10,6 @@
 upstream_dfsg_version = $(firstword $(subst -, ,$(debian_version)))
 upstream_version = $(subst ~,,$(firstword $(subst +, ,$(debian_version))))
 
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
 export QMAKESPEC=/usr/share/qt5/mkspecs/linux-g++
 
 CFLAGS=
@@ -63,7 +61,7 @@
 			-m $(shell python$*-config --configdir) \
 			-d /usr/lib/python$*/dist-packages \
 			--dbus /usr/include/dbus-1.0 \
-			$(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin) 
+			$(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin --no-qml-plugin)
 	touch $@
 
 dbg-build-%/configure-stamp:
@@ -74,7 +72,7 @@
 			-m $(shell python$*-dbg-config --configdir) \
 			-l /usr/include/python$*$(if $(filter 3.2, $*),dmu,dm) \
 			-d /usr/lib/python$*/dist-packages \
-			--no-designer-plugin
+			--no-designer-plugin --no-qml-plugin
 	touch $@
 
 
@@ -160,9 +158,6 @@
 	mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtQml.so \
 	   $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtQuick.so \
 		debian/python3-pyqt5.qtquick-dbg/usr/lib/python3.$*/dist-packages/PyQt5
-	mkdir -p debian/python3-pyqt5.qtquick-dbg/usr/lib/$(DEB_BUILD_GNU_TYPE)/qt5/plugins/PyQt5
-	mv $(d3_qt5_dbg)/usr/lib/*/qt5/plugins/PyQt5/* \
-		debian/python3-pyqt5.qtquick-dbg/usr/lib/$(DEB_BUILD_GNU_TYPE)/qt5/plugins/PyQt5/
 
 clean:
 	dh_testdir