r21272 - in /desktop/unstable/pygtk/debian: changelog control control.in patches/02_numpy.patch patches/10_maintainer_mode.patch patches/60_pygtk-wakeupfd-fix.patch patches/70_autotools.patch patches/series
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Mon Sep 7 14:31:26 UTC 2009
Author: pochu
Date: Mon Sep 7 14:31:25 2009
New Revision: 21272
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21272
Log:
* New upstream release.
- Bump libgtk2.0-dev and python-gobject-dev build dependencies.
- debian/patches/02_numpy.patch:
+ Removed, fixed upstream.
- debian/patches/10_maintainer_mode.patch,
debian/patches/70_autotools.patch:
+ Removed, no longer needed.
- debian/patches/60_pygtk-wakeupfd-fix.patch:
+ Updated for the new version.
Removed:
desktop/unstable/pygtk/debian/patches/02_numpy.patch
desktop/unstable/pygtk/debian/patches/10_maintainer_mode.patch
desktop/unstable/pygtk/debian/patches/70_autotools.patch
Modified:
desktop/unstable/pygtk/debian/changelog
desktop/unstable/pygtk/debian/control
desktop/unstable/pygtk/debian/control.in
desktop/unstable/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch
desktop/unstable/pygtk/debian/patches/series
Modified: desktop/unstable/pygtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/changelog?rev=21272&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/changelog [utf-8] (original)
+++ desktop/unstable/pygtk/debian/changelog [utf-8] Mon Sep 7 14:31:25 2009
@@ -1,3 +1,17 @@
+pygtk (2.16.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - Bump libgtk2.0-dev and python-gobject-dev build dependencies.
+ - debian/patches/02_numpy.patch:
+ + Removed, fixed upstream.
+ - debian/patches/10_maintainer_mode.patch,
+ debian/patches/70_autotools.patch:
+ + Removed, no longer needed.
+ - debian/patches/60_pygtk-wakeupfd-fix.patch:
+ + Updated for the new version.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Mon, 07 Sep 2009 14:42:26 +0200
+
pygtk (2.14.1-3) unstable; urgency=low
[ Josselin Mouette ]
Modified: desktop/unstable/pygtk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/control?rev=21272&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/control [utf-8] (original)
+++ desktop/unstable/pygtk/debian/control [utf-8] Mon Sep 7 14:31:25 2009
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
Uploaders: Torsten Landschoff <torsten at debian.org>,
- Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
+ Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
Build-Depends: debhelper (>= 5),
python-support (>= 0.7.6),
gnome-pkg-tools (>= 0.10),
@@ -14,14 +14,14 @@
python2.5-dev (>= 2.5.2-5),
python-all-dev (>= 2.5),
python-all-dbg,
- libgtk2.0-dev (>= 2.13.6),
+ libgtk2.0-dev (>= 2.16.0),
libglib2.0-dev (>= 2.8.0),
libpango1.0-dev (>= 1.16.0),
libatk1.0-dev (>= 1.12.0),
libglade2-dev (>= 2.5.0),
python-numpy-dbg (>= 1:1.0.4-1~),
python-cairo-dev (>= 1.0.2),
- python-gobject-dev (>= 2.15.3),
+ python-gobject-dev (>= 2.16.1),
xsltproc,
docbook-xsl,
autotools-dev,
Modified: desktop/unstable/pygtk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/control.in?rev=21272&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/control.in [utf-8] (original)
+++ desktop/unstable/pygtk/debian/control.in [utf-8] Mon Sep 7 14:31:25 2009
@@ -14,14 +14,14 @@
python2.5-dev (>= 2.5.2-5),
python-all-dev (>= 2.5),
python-all-dbg,
- libgtk2.0-dev (>= 2.13.6),
+ libgtk2.0-dev (>= 2.16.0),
libglib2.0-dev (>= 2.8.0),
libpango1.0-dev (>= 1.16.0),
libatk1.0-dev (>= 1.12.0),
libglade2-dev (>= 2.5.0),
python-numpy-dbg (>= 1:1.0.4-1~),
python-cairo-dev (>= 1.0.2),
- python-gobject-dev (>= 2.15.3),
+ python-gobject-dev (>= 2.16.1),
xsltproc,
docbook-xsl,
autotools-dev,
Modified: desktop/unstable/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch?rev=21272&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch [utf-8] (original)
+++ desktop/unstable/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch [utf-8] Mon Sep 7 14:31:25 2009
@@ -1,8 +1,6 @@
-Index: pygtk-2.13.0/gtk/gtk.override
-===================================================================
---- pygtk-2.13.0.orig/gtk/gtk.override 2008-11-12 17:59:15.427489178 +0100
-+++ pygtk-2.13.0/gtk/gtk.override 2008-11-12 17:59:19.103489690 +0100
-@@ -37,6 +37,8 @@ extern PyTypeObject PyGdkCairoContext_Ty
+--- a/gtk/gtk.override
++++ b/gtk/gtk.override
+@@ -36,6 +36,8 @@
#include "pygtk-private.h"
@@ -11,30 +9,20 @@
#define PYGTK_CONTAINER_FOREACH 0
#define PYGTK_CONTAINER_FORALL 1
#define countof(array) (sizeof(array)/sizeof(array[0]))
-@@ -1069,7 +1071,10 @@ static gboolean
- pygtk_main_watch_prepare(GSource *source,
- int *timeout)
- {
-+#ifdef HAVE_PYSIGNAL_SETWAKEUPFD
- PySignalWatchSource *real_source = (PySignalWatchSource *)source;
-+ int flag;
-+#endif
+@@ -1147,6 +1149,12 @@
+ real_source->fd.events = G_IO_IN | G_IO_HUP | G_IO_ERR;
+ g_source_add_poll(source, &real_source->fd);
- /* Python only invokes signal handlers from the main thread,
- * so if a thread other than the main thread receives the signal
-@@ -1103,6 +1108,11 @@ pygtk_main_watch_prepare(GSource *source
- real_source->fd.events = G_IO_IN | G_IO_HUP | G_IO_ERR;
- g_source_add_poll(source, &real_source->fd);
-
-+ /* Make the read end of the fd non blocking */
-+ flag = fcntl(real_source->fds[0], F_GETFL, 0);
-+ flag |= O_NONBLOCK;
-+ fcntl(real_source->fds[0], F_SETFL, flag);
++ int flag;
++ /* Make the read end of the fd non blocking */
++ flag = fcntl(real_source->fds[0], F_GETFL, 0);
++ flag |= O_NONBLOCK;
++ fcntl(real_source->fds[0], F_SETFL, flag);
+
- PySignal_SetWakeupFd(real_source->fds[1]);
-
+ PySignal_SetWakeupFd(real_source->fds[1]);
+ }
#else /* !HAVE_PYSIGNAL_SETWAKEUPFD */
-@@ -1122,8 +1132,18 @@ pygtk_main_watch_check(GSource *source)
+@@ -1166,8 +1174,18 @@
{
PyGILState_STATE state;
Modified: desktop/unstable/pygtk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/patches/series?rev=21272&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/patches/series [utf-8] (original)
+++ desktop/unstable/pygtk/debian/patches/series [utf-8] Mon Sep 7 14:31:25 2009
@@ -1,6 +1,3 @@
01_pygtk-demo.patch
-02_numpy.patch
03_testsuite_filechooser.patch
-10_maintainer_mode.patch
60_pygtk-wakeupfd-fix.patch
-70_autotools.patch
More information about the pkg-gnome-commits
mailing list