[Python-modules-commits] r21486 - in packages/python-qt4/trunk/debian (7 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Wed May 2 04:19:46 UTC 2012
Date: Wednesday, May 2, 2012 @ 04:19:38
Author: kitterman
Revision: 21486
* Bump standards version to 3.9.3 without further change
* Upload to unstable for qt4-x11 multiarch transition
* Fix dbus related PyQt application crashes (LP: #334757)
- Add debian/patches/dbus.patch from upstream
* Do not compress .qml, .xpm, .mng, .qss., and .xbel file types as well as
examples/animation/stickman/animations/chilling so examples in
python4-qt-doc will run (Closes: #657205, #657211)
* Add debian/README.Debian to python4-qt-doc to explain how to run examples
Added:
packages/python-qt4/trunk/debian/README.Debian
packages/python-qt4/trunk/debian/patches/dbus.patch
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/control
packages/python-qt4/trunk/debian/patches/series
packages/python-qt4/trunk/debian/python-qt4-doc.examples
packages/python-qt4/trunk/debian/rules
Added: packages/python-qt4/trunk/debian/README.Debian
===================================================================
--- packages/python-qt4/trunk/debian/README.Debian (rev 0)
+++ packages/python-qt4/trunk/debian/README.Debian 2012-05-02 04:19:38 UTC (rev 21486)
@@ -0,0 +1,5 @@
+There are a number of examples shipped in the python-qt4-doc package. In order
+to run them, you will need to copy them from
+/usr/share/doc/python-qt4-doc/examples to a location where you have write
+priviledges. After copying them, you can excecute demos/qtdemo/qtdemo.py and
+it will provide a graphical mechanism to run the various demos.
Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog 2012-05-02 02:07:28 UTC (rev 21485)
+++ packages/python-qt4/trunk/debian/changelog 2012-05-02 04:19:38 UTC (rev 21486)
@@ -1,10 +1,19 @@
python-qt4 (4.9.1-3) UNRELEASED; urgency=low
+ * Upload to unstable for qt4-x11 multiarch transition
+ * Fix dbus related PyQt application crashes (LP: #334757)
+ - Add debian/patches/dbus.patch from upstream
+ * Do not compress .qml, .xpm, .mng, .qss., and .xbel file types as well as
+ examples/animation/stickman/animations/chilling so examples in
+ python4-qt-doc will run (Closes: #657205, #657211)
+ * Add debian/README.Debian to python4-qt-doc to explain how to run examples
* Fix debian/rules PYTHONS definition to include all supported python3
versions
- * Fix debian/copyright to mention both GPL versions 2 and 3 (LP: #955004)
+ * Fix debian/copyright to mention both GPL versions 2 and 3
+ (Closes: #602721) (LP: #955004)
+ * Bump standards version to 3.9.3 without further change
- -- Scott Kitterman <scott at kitterman.com> Wed, 14 Mar 2012 09:22:15 -0400
+ -- Scott Kitterman <scott at kitterman.com> Sat, 14 Apr 2012 16:12:34 -0400
python-qt4 (4.9.1-2) experimental; urgency=low
Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control 2012-05-02 02:07:28 UTC (rev 21485)
+++ packages/python-qt4/trunk/debian/control 2012-05-02 04:19:38 UTC (rev 21486)
@@ -29,7 +29,7 @@
python3-sip-dev (>= 4.13.1-3~),
python-sphinx (>= 1.0.7+dfsg-1~)
Build-Conflicts: python-xml, python-xml-dbg
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
X-Python-Version: >= 2.4
Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-qt4/trunk/
Added: packages/python-qt4/trunk/debian/patches/dbus.patch
===================================================================
--- packages/python-qt4/trunk/debian/patches/dbus.patch (rev 0)
+++ packages/python-qt4/trunk/debian/patches/dbus.patch 2012-05-02 04:19:38 UTC (rev 21486)
@@ -0,0 +1,78 @@
+Patch from upstream to fix dbus related crashes in PyQt applications like
+PyKDE.
+
+diff -r ec219159004e dbus/dbus.cpp
+--- a/dbus/dbus.cpp Sat Apr 14 14:56:28 2012 +0100
++++ b/dbus/dbus.cpp Sat Apr 14 18:14:47 2012 +0100
+@@ -1,7 +1,7 @@
+ // This is the SIP interface definition for the Qt support for the standard
+ // Python DBus bindings.
+ //
+-// Copyright (c) 2012 Phil Thompson
++// Copyright (c) 2012 Riverbank Computing Limited
+ //
+ // Licensed under the Academic Free License version 2.1
+ //
+@@ -271,7 +271,11 @@
+ {
+ watcher.read->setEnabled(false);
+ dbus_watch_handle(watcher.watch, DBUS_WATCH_READABLE);
+- watcher.read->setEnabled(true);
++
++ // The notifier could have just been destroyed.
++ if (watcher.read)
++ watcher.read->setEnabled(true);
++
+ break;
+ }
+
+@@ -295,7 +299,11 @@
+ {
+ watcher.write->setEnabled(false);
+ dbus_watch_handle(watcher.watch, DBUS_WATCH_WRITABLE);
+- watcher.write->setEnabled(true);
++
++ // The notifier could have just been destroyed.
++ if (watcher.write)
++ watcher.write->setEnabled(true);
++
+ break;
+ }
+
+diff -r ec219159004e dbus/helper.h
+--- a/dbus/helper.h Sat Apr 14 14:56:28 2012 +0100
++++ b/dbus/helper.h Sat Apr 14 18:14:47 2012 +0100
+@@ -1,7 +1,7 @@
+ // This is the declaration of the helper class for the Qt specific support for
+ // the standard Python DBus bindings.
+ //
+-// Copyright (c) 2007 Phil Thompson
++// Copyright (c) 2012 Riverbank Computing Limited
+ //
+ // Licensed under the Academic Free License version 2.1
+ //
+@@ -24,11 +24,12 @@
+ #include <QList>
+ #include <QMultiHash>
+ #include <QObject>
++#include <QPointer>
++#include <QSocketNotifier>
+
+ #include <dbus/dbus.h>
+
+
+-class QSocketNotifier;
+ class QTimerEvent;
+
+
+@@ -42,8 +43,8 @@
+ Watcher() : watch(0), read(0), write(0) {}
+
+ DBusWatch *watch;
+- QSocketNotifier *read;
+- QSocketNotifier *write;
++ QPointer<QSocketNotifier> read;
++ QPointer<QSocketNotifier> write;
+ };
+
+ typedef QMultiHash<int, Watcher> Watchers;
Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series 2012-05-02 02:07:28 UTC (rev 21485)
+++ packages/python-qt4/trunk/debian/patches/series 2012-05-02 04:19:38 UTC (rev 21486)
@@ -2,3 +2,4 @@
debian_configure_changes.diff
fix_qthelp_ftbfs.diff
fix_the_QAssitant_ftbfs.diff
+dbus.patch
Modified: packages/python-qt4/trunk/debian/python-qt4-doc.examples
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-doc.examples 2012-05-02 02:07:28 UTC (rev 21485)
+++ packages/python-qt4/trunk/debian/python-qt4-doc.examples 2012-05-02 04:19:38 UTC (rev 21486)
@@ -1 +1,2 @@
examples/*
+debian/README.Debian
Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules 2012-05-02 02:07:28 UTC (rev 21485)
+++ packages/python-qt4/trunk/debian/rules 2012-05-02 04:19:38 UTC (rev 21486)
@@ -249,7 +249,7 @@
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_compress -X.py -X.bmp -X.ui -X.sql -X.xml -X.qml -X.xpm -X.mng -X.qss. -X.xbel -Xchilling
dh_installdeb
dh_shlibdeps
dh_gencontrol
More information about the Python-modules-commits
mailing list