[Python-modules-commits] r20422 - in packages/python-qt4/trunk/debian (4 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Sun Feb 12 21:40:45 UTC 2012
Date: Sunday, February 12, 2012 @ 21:40:44
Author: kitterman
Revision: 20422
* Adjust install path in debian/python-qt4.install for multiarched qt4-x11
and bump minimum build-dep version to 4:4.8.0-1~
* Use python3-dbus.mainloop.qt/dbg binary names instead of
python3-pyqt4-dbus since that matches Python policy, last experimental
upload was in error
- Remove duplicate files from the new dbus packages in debian/rules
* Build python3-dbus.mainloop.qt/-dbg packages with experimental python3
port of dbus-python
- Add packages to debian/control
- Add python3-dbus and python3-dbus-dbg to build-depends
- Adjust debian/rules to support python3-dbus.mainloop.qt-dbg
- Provide path to dbus-python.h using --dbus option in configure since in
Python 3, the build system can't find it
* Add missing build-depends on qtmobility-dev, python-dbus-dev, and
libicu-dev
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/control
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 2012-02-12 21:40:12 UTC (rev 20421)
+++ packages/python-qt4/trunk/debian/changelog 2012-02-12 21:40:44 UTC (rev 20422)
@@ -1,3 +1,21 @@
+python-qt4 (4.9.1-2) experimental; urgency=low
+
+ * Adjust install path in debian/python-qt4.install for multiarched qt4-x11
+ and bump minimum build-dep version to 4:4.8.0-1~
+ * Use python3-dbus.mainloop.qt/dbg binary names instead of
+ python3-pyqt4-dbus since that matches Python policy, last experimental
+ upload was in error
+ - Remove duplicate files from the new dbus packages in debian/rules
+ * Build python3-dbus.mainloop.qt/-dbg packages with experimental python3
+ port of dbus-python
+ - Add packages to debian/control
+ - Add python3-dbus and python3-dbus-dbg to build-depends
+ - Adjust debian/rules to support python3-dbus.mainloop.qt-dbg
+ - Provide path to dbus-python.h using --dbus option in configure since in
+ Python 3, the build system can't find it
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 12 Feb 2012 11:33:50 -0500
+
python-qt4 (4.9.1-1) unstable; urgency=low
* Drop experimental options (multiarch qt4-x11 path and python3-pyqt4-dbus)
@@ -20,7 +38,8 @@
[ Scott Kitterman ]
* Add myself to uploaders
- * Add missing build-depends on qtmobility-dev and libicu-dev
+ * Add missing build-depends on qtmobility-dev, python-dbus-dev, and
+ libicu-dev
* Feedback changes from Ubuntu
* Adjust install path in debian/python-qt4.install for multiarched qt4-x11
and bump minimum build-dep version to 4:4.8.0-1~
Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control 2012-02-12 21:40:12 UTC (rev 20421)
+++ packages/python-qt4/trunk/debian/control 2012-02-12 21:40:44 UTC (rev 20422)
@@ -10,7 +10,7 @@
libicu-dev,
libdbus-1-dev (>= 1.0.2),
libphonon-dev (>= 4:4.2.0-2),
- libqt4-dev (>= 4:4.7.0),
+ libqt4-dev (>= 4:4.8.0-1~),
libqt4-opengl-dev,
libqtassistantclient-dev,
libqtwebkit-dev,
@@ -20,6 +20,9 @@
python3-all-dev,
python-dbus (>= 0.84.0-2),
python-dbus-dbg,
+ python3-dbus,
+ python3-dbus-dbg,
+ python-dbus-dev,
python-sip-dbg,
python-sip-dev (>= 4.13.1),
python3-sip-dbg,
@@ -198,33 +201,33 @@
.
This package contains the extensions built for the Python debug interpreter.
-#Package: python3-pyqt4-dbus
-#Architecture: any
-#Provides: ${python3:Provides}
-#Depends: python3-dbus,
-# ${misc:Depends},
-# ${python3:Depends},
-# ${shlibs:Depends}
-#Description: DBus Support for PyQt4 with Python 3
-# The DBus module of PyQt4 provides integration of PyQt4 applications
-# with the DBus main loop for Python 3
-#
-#Package: python3-pyqt4-dbus-dbg
-#Architecture: any
-#Priority: extra
-#Section: debug
-#Provides: ${python3:Provides}
-#Depends: python3-dbg,
-# python3-dbus-dbg,
-# python3-pyqt4-dbus (= ${binary:Version}),
-# ${misc:Depends},
-# ${shlibs:Depends}
-#Description: DBus Support for PyQt4 (debug extensions for Python 3)
-# The DBus module of PyQt4 provides integration of PyQt4 applications
-# with the DBus main loop for Python 3
-# .
-# This package contains the extensions built for the Python debug interpreter.
-#
+Package: python3-dbus.mainloop.qt
+Architecture: any
+Provides: ${python3:Provides}
+Depends: python3-dbus,
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
+Description: DBus Support for PyQt4 with Python 3
+ The DBus module of PyQt4 provides integration of PyQt4 applications
+ with the DBus main loop for Python 3
+
+Package: python3-dbus.mainloop.qt-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Provides: ${python3:Provides}
+Depends: python3-dbg,
+ python3-dbus-dbg,
+ python3-dbus.mainloop.qt (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: DBus Support for PyQt4 (debug extensions for Python 3)
+ The DBus module of PyQt4 provides integration of PyQt4 applications
+ with the DBus main loop for Python 3
+ .
+ This package contains the extensions built for the Python debug interpreter.
+
Package: python-qt4-gl
Architecture: any
Provides: ${python:Provides}
Modified: packages/python-qt4/trunk/debian/python-qt4.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4.install 2012-02-12 21:40:12 UTC (rev 20421)
+++ packages/python-qt4/trunk/debian/python-qt4.install 2012-02-12 21:40:44 UTC (rev 20422)
@@ -17,4 +17,4 @@
usr/lib/python2*/*-packages/PyQt4/__init__.py
usr/lib/python2*/*-packages/PyQt4/pyqtconfig.py
usr/lib/python2*/*-packages/PyQt4/uic/*
-usr/lib/qt4/*
+usr/lib/*/qt4/*
Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules 2012-02-12 21:40:12 UTC (rev 20421)
+++ packages/python-qt4/trunk/debian/rules 2012-02-12 21:40:44 UTC (rev 20422)
@@ -13,7 +13,7 @@
endif
py_dbusmoddir = $(shell python$(1) -c 'import dbus.mainloop; print dbus.mainloop.__path__[0]')
-#py3_dbusmoddir = $(shell python3 -c 'import dbus.mainloop; print(dbus.mainloop.__path__[0])')
+py3_dbusmoddir = $(shell python3 -c 'import dbus.mainloop; print(dbus.mainloop.__path__[0])')
export QMAKESPEC=linux-g++
@@ -105,7 +105,7 @@
dh_installdirs -a
sed -i -e '/strip/ d' $(CURDIR)/build-$(DEFAULT_PYTHON)/designer/Makefile
rm -f $(CURDIR)/debian/python-qt4-dbus.install
- rm -f $(CURDIR)/debian/python3-pyqt4-dbus.install
+ rm -f $(CURDIR)/debian/python3-dbus.mainloop.qt.install
# This is needed to enforce that the install-arch-% rules are
# not run in parallel. Both rules install into the same directory,
# and therefore might try to access the same files at the same time.
@@ -131,7 +131,7 @@
# probably like ipython handles it.
cp debian/pyuic4 debian/pyqt4-dev-tools/usr/bin/pyuic4
-d3_qt4_dbg = debian/python3-pyqt4-dbg
+d3_qt4_dbg = debian/python3-dbus.mainloop.qt
install-arch-3.%:
$(MAKE) -C build-3.$* install \
@@ -154,12 +154,12 @@
mv $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/phonon.so \
debian/python3-pyqt4.phonon-dbg/usr/lib/python3.$*/dist-packages/PyQt4
-# if [ -e $(d3_qt4_dbg)$(call py3_dbusmoddir,$*)/qt.so ]; then \
-# mkdir -p debian/python3-pyqt4-dbus-dbg/$(call py3_dbusmoddir,$*);\
-# mv $(d3_qt4_dbg)$(call py3_dbusmoddir,$*)/qt.so \
-# debian/python3-pyqt4-dbus-dbg$(call py3_dbusmoddir,$*);\
-# echo '$(call py3_dbusmoddir,$*)/*' >> $(CURDIR)/debian/python3-pyqt4-dbus.install;\
-# fi
+ if [ -e $(d3_qt4_dbg)$(call py3_dbusmoddir,$*)/qt.so ]; then \
+ mkdir -p debian/python3-dbus.mainloop.qt-dbg/$(call py3_dbusmoddir,$*);\
+ mv $(d3_qt4_dbg)$(call py3_dbusmoddir,$*)/qt.so \
+ debian/python3-dbus.mainloop.qt-dbg$(call py3_dbusmoddir,$*);\
+ echo '$(call py3_dbusmoddir,$*)/*' >> $(CURDIR)/debian/python3-dbus.mainloop.qt.install;\
+ fi
d_qt4_dbg = debian/python-qt4-dbg
@@ -220,7 +220,7 @@
DH_OPTIONS= dh_strip -ppyqt4-dev-tools
set -e; \
for p in python-qt4 python3-pyqt4 \
- python-qt4-dbus \
+ python-qt4-dbus python3-dbus.mainloop.qt \
python-qt4-gl \
python-qt4-sql python3-pyqt4.qtsql \
python-qt4-phonon python3-pyqt4.phonon \
@@ -242,6 +242,12 @@
rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/share/sip
rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/lib/python3/dist-packages/PyQt4/uic
rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/lib/python3/dist-packages/dbus/mainloop/
+ rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt/usr/bin
+ rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt/usr/share/sip
+ rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt/usr/lib/python3/dist-packages/PyQt4
+ rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt-dbg/usr/lib/debug/usr/bin
+ rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt-dbg/usr/lib/debug/usr/lib/python3/dist-packages/PyQt4
+
dh_fixperms
dh_compress -X.py -X.bmp -X.ui -X.sql -X.xml
dh_installdeb
More information about the Python-modules-commits
mailing list