[Python-modules-commits] r8181 - in packages/python-qt4/trunk/debian (6 files)

bzed at users.alioth.debian.org bzed at users.alioth.debian.org
Tue Apr 7 19:42:44 UTC 2009 

    Date: Tuesday, April 7, 2009 @ 19:42:43
  Author: bzed
Revision: 8181

* NOT RELEASED YET
* debian/rules:
  - Prepare build-process for Python 2.6.
  - Install the python-qt4-dbus debug extensions properly again,
    they were forgotten during the migration to python-support.
* debian/*.install:
  - Handle *-package directories to support Python 2.6.

Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/python-qt4-gl.install
  packages/python-qt4/trunk/debian/python-qt4-phonon.install
  packages/python-qt4/trunk/debian/python-qt4-sql.install
  packages/python-qt4/trunk/debian/python-qt4.install
  packages/python-qt4/trunk/debian/rules

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2009-04-07 18:36:25 UTC (rev 8180)
+++ packages/python-qt4/trunk/debian/changelog	2009-04-07 19:42:43 UTC (rev 8181)
@@ -1,3 +1,15 @@
+python-qt4 (4.4.4-6) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * debian/rules:
+    - Prepare build-process for Python 2.6.
+    - Install the python-qt4-dbus debug extensions properly again,
+      they were forgotten during the migration to python-support.
+  * debian/*.install:
+    - Handle *-package directories to support Python 2.6.
+
+ -- Bernd Zeimetz <bzed at debian.org>  Tue, 07 Apr 2009 21:35:30 +0200
+
 python-qt4 (4.4.4-5) unstable; urgency=low
 
   * debian/control:

Modified: packages/python-qt4/trunk/debian/python-qt4-gl.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-gl.install	2009-04-07 18:36:25 UTC (rev 8180)
+++ packages/python-qt4/trunk/debian/python-qt4-gl.install	2009-04-07 19:42:43 UTC (rev 8181)
@@ -1 +1 @@
-usr/lib/python*/site-packages/PyQt4/QtOpenGL.so
+usr/lib/python*/*-packages/PyQt4/QtOpenGL.so

Modified: packages/python-qt4/trunk/debian/python-qt4-phonon.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-phonon.install	2009-04-07 18:36:25 UTC (rev 8180)
+++ packages/python-qt4/trunk/debian/python-qt4-phonon.install	2009-04-07 19:42:43 UTC (rev 8181)
@@ -1 +1 @@
-usr/lib/python*/site-packages/PyQt4/phonon.so
+usr/lib/python*/*-packages/PyQt4/phonon.so

Modified: packages/python-qt4/trunk/debian/python-qt4-sql.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-sql.install	2009-04-07 18:36:25 UTC (rev 8180)
+++ packages/python-qt4/trunk/debian/python-qt4-sql.install	2009-04-07 19:42:43 UTC (rev 8181)
@@ -1 +1 @@
-usr/lib/python*/site-packages/PyQt4/QtSql.so
+usr/lib/python*/*-packages/PyQt4/QtSql.so

Modified: packages/python-qt4/trunk/debian/python-qt4.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4.install	2009-04-07 18:36:25 UTC (rev 8180)
+++ packages/python-qt4/trunk/debian/python-qt4.install	2009-04-07 19:42:43 UTC (rev 8181)
@@ -1,16 +1,16 @@
-usr/lib/python*/site-packages/PyQt4/Qt.so
-usr/lib/python*/site-packages/PyQt4/QtAssistant.so
-usr/lib/python*/site-packages/PyQt4/QtCore.so
-usr/lib/python*/site-packages/PyQt4/QtDesigner.so
-usr/lib/python*/site-packages/PyQt4/QtGui.so
-usr/lib/python*/site-packages/PyQt4/QtHelp.so
-usr/lib/python*/site-packages/PyQt4/QtNetwork.so
-usr/lib/python*/site-packages/PyQt4/QtScript.so
-usr/lib/python*/site-packages/PyQt4/QtSvg.so
-usr/lib/python*/site-packages/PyQt4/QtTest.so
-usr/lib/python*/site-packages/PyQt4/QtWebKit.so
-usr/lib/python*/site-packages/PyQt4/QtXml.so
-usr/lib/python*/site-packages/PyQt4/QtXmlPatterns.so
-usr/lib/python*/site-packages/PyQt4/uic/
-usr/lib/python*/site-packages/PyQt4/pyqtconfig.py
+usr/lib/python*/*-packages/PyQt4/Qt.so
+usr/lib/python*/*-packages/PyQt4/QtAssistant.so
+usr/lib/python*/*-packages/PyQt4/QtCore.so
+usr/lib/python*/*-packages/PyQt4/QtDesigner.so
+usr/lib/python*/*-packages/PyQt4/QtGui.so
+usr/lib/python*/*-packages/PyQt4/QtHelp.so
+usr/lib/python*/*-packages/PyQt4/QtNetwork.so
+usr/lib/python*/*-packages/PyQt4/QtScript.so
+usr/lib/python*/*-packages/PyQt4/QtSvg.so
+usr/lib/python*/*-packages/PyQt4/QtTest.so
+usr/lib/python*/*-packages/PyQt4/QtWebKit.so
+usr/lib/python*/*-packages/PyQt4/QtXml.so
+usr/lib/python*/*-packages/PyQt4/QtXmlPatterns.so
+usr/lib/python*/*-packages/PyQt4/uic/
+usr/lib/python*/*-packages/PyQt4/pyqtconfig.py
 usr/lib/qt4/*

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2009-04-07 18:36:25 UTC (rev 8180)
+++ packages/python-qt4/trunk/debian/rules	2009-04-07 19:42:43 UTC (rev 8181)
@@ -6,6 +6,16 @@
 
 include /usr/share/dpatch/dpatch.make
 
+-include /usr/share/python/python.mk
+ifeq (,$(py_sitename))
+py_sitename = site-packages
+py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+py_sitename_sh = $(py_sitename)
+py_libdir_sh = $(py_libdir)
+endif
+
+py_dbusmoddir = $(shell python$(1) -c 'import dbus.mainloop; print dbus.mainloop.__path__[0]')
+
 export QMAKESPEC=linux-g++
 
 GCCVER := $(shell gcc -dumpversion | sed -e 's/.[0-9]$$//')
@@ -50,6 +60,7 @@
 			--confirm-license \
 			-q /usr/bin/qmake-qt4 -c \
 			-j $(SPLIT) -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}"
@@ -63,6 +74,7 @@
 			-q /usr/bin/qmake-qt4 -c \
 			-j $(SPLIT) -l /usr/include/python$*_d \
 			-m /usr/lib/python$*/config_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}"
@@ -80,48 +92,59 @@
 	$(MAKE) -C dbg-build-$*
 	touch $@
 
-install-indep: configure
+install-indep: configure install-indep-pre $(PYTHONS:%=install-indep-%)
+	dh_install -i
+
+install-indep-pre:
 	dh_testdir
 	dh_testroot
 	dh_clean -k -i
 	dh_installdirs -i
-	for version in ${PYTHONS};\
-	do\
-		mkdir -p debian/python-qt4-dev/usr/lib/python$$version/site-packages/PyQt4;\
-		mkdir -p debian/python-qt4-common/usr/lib/python$$version/site-packages/PyQt4;\
-		install -m 644 -o root -g root __init__.py debian/python-qt4-common/usr/lib/python$$version/site-packages/PyQt4;\
-	done
-	dh_install -i
 
-install-arch: build
+install-indep-%:
+	mkdir -p debian/python-qt4-dev/usr/lib/python$*/$(call py_sitename,$*)/PyQt4
+	mkdir -p debian/python-qt4-common/usr/lib/python$*/$(call py_sitename,$*)/PyQt4
+	install -m 644 -o root -g root __init__.py \
+		debian/python-qt4-common/usr/lib/python$*/$(call py_sitename,$*)/PyQt4
+
+install-arch: build install-arch-pre $(PYTHONS:%=install-arch-%) install-arch-end
+
+install-arch-pre:
 	dh_testdir
 	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
-	for v in ${PYTHONS}; do \
-		$(MAKE) -C build-$$v install \
-			INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp; \
-	done
+	rm -f $(CURDIR)/debian/python-qt4-dbus.install
+	touch $(CURDIR)/debian/python-qt4-dbus.install
 
-	set -e; \
-	d=debian/python-qt4-dbg; \
-	for v in ${PYTHONS}; do \
-		$(MAKE) -C dbg-build-$$v install DESTDIR=$(CURDIR)/$$d; \
-		mv $$d/usr/lib/python$$v/site-packages/PyQt4/pyqtconfig.py \
-			$$d/usr/lib/python$$v/site-packages/PyQt4/pyqtconfig_d.py; \
-		mkdir -p debian/python-qt4-gl-dbg/usr/lib/python$$v/site-packages/PyQt4;\
-		mv $$d/usr/lib/python$$v/site-packages/PyQt4/QtOpenGL.so debian/python-qt4-gl-dbg/usr/lib/python$$v/site-packages/PyQt4;\
-		mkdir -p debian/python-qt4-sql-dbg/usr/lib/python$$v/site-packages/PyQt4;\
-		mv $$d/usr/lib/python$$v/site-packages/PyQt4/QtSql.so debian/python-qt4-sql-dbg/usr/lib/python$$v/site-packages/PyQt4;\
-		mkdir -p debian/python-qt4-phonon-dbg/usr/lib/python$$v/site-packages/PyQt4;\
-		mv $$d/usr/lib/python$$v/site-packages/PyQt4/phonon.so debian/python-qt4-phonon-dbg/usr/lib/python$$v/site-packages/PyQt4;\
-	done
+d_qt4_dbg = debian/python-qt4-dbg
+ 
+install-arch-%:
+	$(MAKE) -C build-$* install \
+		INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
 
-	#create python-qt4-dbus.install on the fly.
-	find $(CURDIR)/debian/tmp -type d -name mainloop | sed 's,^.*/tmp/,,;s,$$,/*,' \
-	    > $(CURDIR)/debian/python-qt4-dbus.install
+	$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/$(d_qt4_dbg)
+	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
+	mv $(d_qt4_dbg)/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/QtOpenGL.so \
+		debian/python-qt4-gl-dbg/usr/lib/python$*/$(call py_sitename,$*)/PyQt4
+	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
+
+	echo '$(call py_dbusmoddir,$*)/*' >> $(CURDIR)/debian/python-qt4-dbus.install
+
+ 
+install-arch-end:
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
 
 	for i in $$(find debian/python-*-dbg -name '*.so'); do \
@@ -137,7 +160,7 @@
 	# it should be imported properly instead.
 	# probably like ipython handles it.
 	cp pyuic/uic/pyuic.py debian/pyqt4-dev-tools/usr/bin/pyuic4
-	rm debian/*/usr/lib/*/site-packages/PyQt4/uic/pyuic.py
+	rm debian/*/usr/lib/*/*-packages/PyQt4/uic/pyuic.py
 
 
 clean: clean-patched unpatch

More information about the Python-modules-commits mailing list