[Python-modules-commits] r8752 - in packages/python-qt4/trunk/debian (changelog rules)

Mon Jun 8 22:50:33 UTC 2009

Date: Monday, June 8, 2009 @ 22:50:28
  Author: shlomme
Revision: 8752

Finished preparation of new upstream release

Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/rules

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================

--- packages/python-qt4/trunk/debian/changelog	2009-06-08 21:33:24 UTC (rev 8751)
+++ packages/python-qt4/trunk/debian/changelog	2009-06-08 22:50:28 UTC (rev 8752)
@@ -1,6 +1,20 @@
-python-qt4 (4.5-1) UNRELEASED; urgency=low
+python-qt4 (4.5-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release (Closes: #486931, #480296, #520188)
+  * debian/python-qt4.install
+    - Install QtScriptTools module
+  * debian/rules
+    - Handle missing dbus modules for Python 2.6
+    - Share configuration options between debug and normal builds
+    - Do not link against libGL.so and libGLU.so
+  * debian/patches/01_configure.dpatch
+    - Updated for qpy support modules
+  * debian/patches/02_htmllinks.dpatch
+    - Updated
+  * debian/patches/04_widget-plugins_location.dpatch
+    - Updated
+  * debian/control
+    - Build-dependencies and dependencies bumped to sip 4.8
 
  -- Torsten Marek <shlomme at debian.org>  Sat, 06 Jun 2009 20:40:59 +0200
 

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2009-06-08 21:33:24 UTC (rev 8751)
+++ packages/python-qt4/trunk/debian/rules	2009-06-08 22:50:28 UTC (rev 8752)
@@ -42,39 +42,39 @@
 
 DEFAULT_PYTHON := $(shell pyversions -vd)
 
+# LIBS_* is unset to avoid linking to too many libraries
+# STRIP is unset to let stripping be handled by dh_strip
+SHARED_CONFIGURE_OPTIONS=--confirm-license \
+	-q /usr/bin/qmake-qt4 -c -j $(SPLIT) \
+	LIBDIR_QT=/usr/lib STRIP="" MOC=moc-qt4 \
+	LIBS_OPENGL="" LIBS_X11="" LIBS_THREAD="" \
+	LFLAGS="" CXXFLAGS_RELEASE="${CXXFLAGS}" LFLAGS_RELEASE="${LDFLAGS}"
+
+
 .PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
 
 configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
 
 build-%/configure-stamp: patch-stamp
 	dh_testdir
-	# LIBS_* is unset to avoid linking to too many libraries
-	# STRIP is unset to let stripping be handled by dh_strip
 	mkdir -p build-$*
-	cd build-$* && python$* ../configure.py \
-			--confirm-license \
-			-q /usr/bin/qmake-qt4 -c \
-			-j $(SPLIT) -m /usr/lib/python$*/config \
+	cd build-$* && python$* ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
+			-m /usr/lib/python$*/config \
 			-d /usr/lib/python$*/$(call py_sitename, $*) \
-			$(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin) \
-			LIBDIR_QT=/usr/lib LIBS_X11="" LIBS_THREAD="" \
-			LFLAGS="" CXXFLAGS_RELEASE="${CXXFLAGS}" STRIP="" MOC=moc-qt4 LFLAGS_RELEASE="${LDFLAGS}"
+			$(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin) 
 	touch $@
 
 dbg-build-%/configure-stamp: patch-stamp
 	dh_testdir
 	mkdir -p dbg-build-$*
-	cd dbg-build-$* && python$*-dbg ../configure.py \
-			--confirm-license \
-			-q /usr/bin/qmake-qt4 -c \
-			-j $(SPLIT) -l /usr/include/python$*_d \
+	cd dbg-build-$* && python$*-dbg ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
 			-m /usr/lib/python$*/config_d \
+			-l /usr/include/python$*_d \
 			-d /usr/lib/python$*/$(call py_sitename, $*) \
-			$(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin) \
-			LIBDIR_QT=/usr/lib LIBS_X11="" LIBS_THREAD="" \
-			LFLAGS="" CXXFLAGS_RELEASE="${CXXFLAGS}" STRIP="" MOC=moc-qt4 LFLAGS_RELEASE="${LDFLAGS}"
+			--no-designer-plugin
 	touch $@
 
+
 build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
 
 build-%/build-stamp: build-%/configure-stamp
@@ -109,18 +109,21 @@
 	dh_testroot
 	dh_clean -k -a
 	dh_installdirs -a
-#	no stripping, please, we are a family bar
 	sed -i -e '/strip/ d' $(CURDIR)/designer/Makefile
 	rm -f $(CURDIR)/debian/python-qt4-dbus.install
 	touch $(CURDIR)/debian/python-qt4-dbus.install
 
 d_qt4_dbg = debian/python-qt4-dbg
- 
+
 install-arch-%:
 	$(MAKE) -C build-$* install \
 		INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
 
 	$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/$(d_qt4_dbg)
+
+	# remove the Python 3 port for now
+	rm -r $(CURDIR)/debian/tmp/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/uic/port_v3
+
 	mv $(d_qt4_dbg)/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/pyqtconfig.py \
 		$(d_qt4_dbg)/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/pyqtconfig_d.py
 	mkdir -p debian/python-qt4-gl-dbg/usr/lib/python$*/$(call py_sitename,$*)/PyQt4
@@ -129,16 +132,19 @@
 	mkdir -p debian/python-qt4-sql-dbg/usr/lib/python$*/$(call py_sitename,$*)/PyQt4
 	mv $(d_qt4_dbg)/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/QtSql.so \
 		debian/python-qt4-sql-dbg/usr/lib/python$*/$(call py_sitename,$*)/PyQt4
-	mkdir -p debian/python-qt4-dbus-dbg/$(call py_dbusmoddir,$*)
-	mv $(d_qt4_dbg)$(call py_dbusmoddir,$*)/qt.so \
-		debian/python-qt4-dbus-dbg$(call py_dbusmoddir,$*)
 	mkdir -p debian/python-qt4-phonon-dbg/usr/lib/python$*/$(call py_sitename,$*)/PyQt4
 	mv $(d_qt4_dbg)/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/phonon.so \
 		debian/python-qt4-phonon-dbg/usr/lib/python$*/$(call py_sitename,$*)/PyQt4
 
+	DBUS_MODDIR=$(call py_dbusmoddir,$*)
+ifneq (,${DBUS_MODDIR})
+	mkdir -p debian/python-qt4-dbus-dbg/$(call py_dbusmoddir,$*)
+	mv $(d_qt4_dbg)$(call py_dbusmoddir,$*)/qt.so \
+		debian/python-qt4-dbus-dbg$(call py_dbusmoddir,$*)
 	echo '$(call py_dbusmoddir,$*)/*' >> $(CURDIR)/debian/python-qt4-dbus.install
+endif
 
- 
+
 install-arch-end:
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
 
@@ -171,7 +177,6 @@
 	dh_testdir
 	dh_testroot
 	-cd designer && make distclean
-	-cd qpy/QtDesigner && make distclean
 	rm -f designer/python.pro designer/Makefile *-stamp
 	rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) sip/Qt
 	rm -f $(CURDIR)/debian/python-qt4-dbus.install


