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

Tue Jun 9 21:56:09 UTC 2009

Date: Tuesday, June 9, 2009 @ 21:56:09
  Author: shlomme
Revision: 8761

remove outdated packages

Added:
  packages/python-qt4/trunk/debian/pyuic4
Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/control
  packages/python-qt4/trunk/debian/rules

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

--- packages/python-qt4/trunk/debian/changelog	2009-06-09 20:32:10 UTC (rev 8760)
+++ packages/python-qt4/trunk/debian/changelog	2009-06-09 21:56:09 UTC (rev 8761)
@@ -4,7 +4,7 @@
   * debian/python-qt4.install
     - Install QtScriptTools module
   * debian/rules
-    - Handle missing dbus modules for Python 2.6
+    - Don't try to install 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
@@ -15,8 +15,12 @@
     - Updated
   * debian/control
     - Build-dependencies and dependencies bumped to sip 4.8
+    - Removed python-qt4-common, not needed anymore because
+      python-qt4-dev does not ship Python files anymore
+  * debian/pyuic4
+    - Added simple wrapper script for pyuic4
 
- -- Torsten Marek <shlomme at debian.org>  Sat, 06 Jun 2009 20:40:59 +0200
+ -- Torsten Marek <shlomme at debian.org>  Tue, 09 Jun 2009 23:54:50 +0200
 
 python-qt4 (4.4.4-6) unstable; urgency=medium
 

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2009-06-09 20:32:10 UTC (rev 8760)
+++ packages/python-qt4/trunk/debian/control	2009-06-09 21:56:09 UTC (rev 8761)
@@ -13,9 +13,9 @@
 Package: python-qt4
 Architecture: any
 Provides: ${python:Provides}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-sip4 (>= 4.8), python-sip4 (<< 4.9), python-elementtree | python (>= 2.5), python-qt4-common (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-sip4 (>= 4.8), python-sip4 (<< 4.9), python-elementtree | python (>= 2.5)
 Suggests: python-qt4-dbg
-Replaces: python-qt4-dev (<< 4.4.4-3~)
+Replaces: python-qt4-dev (<< 4.4.4-3~), python-qt4-common
 Description: Python bindings for Qt4
  PyQt4 exposes the Qt4 API to Python. The following modules are supported:
   * QtCore
@@ -122,21 +122,13 @@
 
 Package: python-qt4-dev
 Architecture: all
-Depends: ${python:Depends}, python-sip4-dev, python-qt4-common (= ${source:Version})
+Depends: ${python:Depends}, python-sip4-dev
 Replaces: python-qt4 (<< 4.3)
 Description: Development files for PyQt4
  This package contains the source SIP files from which the Python 
  bindings for Qt4 are created. They are needed for building PyQt4
  as well as creating bindings for own Qt4 widgets written in C++.
 
-Package: python-qt4-common
-Architecture: all
-Depends: ${python:Depends}
-Conflicts: python-qt4 (<< 4.3-3)
-Description: Shared files for PyQt4
- This package contains files that are shared between python-qt4
- and python-qt4-dev.
-
 Package: python-qt4-doc
 Architecture: all
 Section: doc

Added: packages/python-qt4/trunk/debian/pyuic4
===================================================================
--- packages/python-qt4/trunk/debian/pyuic4	                        (rev 0)
+++ packages/python-qt4/trunk/debian/pyuic4	2009-06-09 21:56:09 UTC (rev 8761)
@@ -0,0 +1,3 @@
+#!/usr/bin/env python
+# there's no main function, so just import the module
+import PyQt4.uic.pyuic

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2009-06-09 20:32:10 UTC (rev 8760)
+++ packages/python-qt4/trunk/debian/rules	2009-06-09 21:56:09 UTC (rev 8761)
@@ -87,21 +87,13 @@
 	$(MAKE) -C dbg-build-$*
 	touch $@
 
-install-indep: configure install-indep-pre $(PYTHONS:%=install-indep-%)
-	dh_install -i
-
-install-indep-pre:
+install-indep: configure
 	dh_testdir
 	dh_testroot
 	dh_clean -k -i
 	dh_installdirs -i
+	dh_install -i
 
-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:
@@ -111,7 +103,6 @@
 	dh_installdirs -a
 	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
 
@@ -136,13 +127,12 @@
 	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
+	if [ -e $(d_qt4_dbg)$(call py_dbusmoddir,$*)/qt.so ]; then \
+		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;\
+	fi
 
 
 install-arch-end:
@@ -168,10 +158,8 @@
 	#FIXME - copying the file to /usr/bin is not the best way,
 	# 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/*/*-packages/PyQt4/uic/pyuic.py
+	cp debian/pyuic4 debian/pyqt4-dev-tools/usr/bin/pyuic4
 
-
 clean: clean-patched unpatch
 clean-patched: 
 	dh_testdir


