r16167 - in /desktop/unstable/pygtk/debian: changelog control control.in patches/50_wakeupfd-curruption.patch patches/60_pygtk-wakeupfd-fix.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Jun  3 22:11:29 2008
New Revision: 16167

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16167
Log:
* Revert 2.12.1-4 upload, re-add the fix, as anyway wakeupfd is used 
  since python now supports it.
* 50_wakeupfd-curruption.patch: fix memory corruption that occurs 
  when using the wakeupfd API, and makes pygtk mostly unusable on 
  some arches.

Added:
    desktop/unstable/pygtk/debian/patches/50_wakeupfd-curruption.patch
    desktop/unstable/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch
      - copied unchanged from r16048, desktop/unstable/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch
Modified:
    desktop/unstable/pygtk/debian/changelog
    desktop/unstable/pygtk/debian/control
    desktop/unstable/pygtk/debian/control.in

Modified: desktop/unstable/pygtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/changelog?rev=16167&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/changelog (original)
+++ desktop/unstable/pygtk/debian/changelog Tue Jun  3 22:11:29 2008
@@ -1,3 +1,13 @@
+pygtk (2.12.1-5) unstable; urgency=low
+
+  * Revert 2.12.1-4 upload, re-add the fix, as anyway wakeupfd is used 
+    since python now supports it.
+  * 50_wakeupfd-curruption.patch: fix memory corruption that occurs 
+    when using the wakeupfd API, and makes pygtk mostly unusable on 
+    some arches.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 03 Jun 2008 23:08:31 +0200
+
 pygtk (2.12.1-4) unstable; urgency=low
 
   * Also add an explicit python2.5 (>= 2.5.2-5) dep; closes: #481977.

Modified: desktop/unstable/pygtk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/control?rev=16167&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/control (original)
+++ desktop/unstable/pygtk/debian/control Tue Jun  3 22:11:29 2008
@@ -8,6 +8,7 @@
                python-support (>= 0.7.6),
                gnome-pkg-tools (>= 0.10),
                cdbs,
+               python2.5-dev (>= 2.5.2-5),
                python-all-dev (>= 2.3.5-11),
                libgtk2.0-dev (>= 2.12.0),
                libglib2.0-dev (>= 2.8.0),
@@ -26,6 +27,7 @@
 Package: python-gtk2
 Architecture: any
 Depends: ${python:Depends},
+         python2.5 (>= 2.5.2-5),
          ${shlibs:Depends},
          ${misc:Depends}
 Python-Depends: python-numeric (>= 24.2-3),
@@ -54,6 +56,7 @@
          python-gtk2 (>= ${source:Version}),
          libglib2.0-dev (>= 2.8),
          libgtk2.0-dev (>= 2.12.0),
+         python2.5-dev (>= 2.5.2-5),
          python-dev,
          python-gobject-dev (>= 2.14.0)
 Recommends: python-gtk2-doc

Modified: desktop/unstable/pygtk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/control.in?rev=16167&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/control.in (original)
+++ desktop/unstable/pygtk/debian/control.in Tue Jun  3 22:11:29 2008
@@ -8,6 +8,7 @@
                python-support (>= 0.7.6),
                gnome-pkg-tools (>= 0.10),
                cdbs,
+               python2.5-dev (>= 2.5.2-5),
                python-all-dev (>= 2.3.5-11),
                libgtk2.0-dev (>= 2.12.0),
                libglib2.0-dev (>= 2.8.0),
@@ -26,6 +27,7 @@
 Package: python-gtk2
 Architecture: any
 Depends: ${python:Depends},
+         python2.5 (>= 2.5.2-5),
          ${shlibs:Depends},
          ${misc:Depends}
 Python-Depends: python-numeric (>= 24.2-3),
@@ -54,6 +56,7 @@
          python-gtk2 (>= ${source:Version}),
          libglib2.0-dev (>= 2.8),
          libgtk2.0-dev (>= 2.12.0),
+         python2.5-dev (>= 2.5.2-5),
          python-dev,
          python-gobject-dev (>= 2.14.0)
 Recommends: python-gtk2-doc

Added: desktop/unstable/pygtk/debian/patches/50_wakeupfd-curruption.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/patches/50_wakeupfd-curruption.patch?rev=16167&op=file
==============================================================================
--- desktop/unstable/pygtk/debian/patches/50_wakeupfd-curruption.patch (added)
+++ desktop/unstable/pygtk/debian/patches/50_wakeupfd-curruption.patch Tue Jun  3 22:11:29 2008
@@ -1,0 +1,11 @@
+--- gtk/gtk.override.orig	2008-06-03 23:38:47.998186781 +0200
++++ gtk/gtk.override	2008-06-03 23:45:37.202189454 +0200
+@@ -1168,7 +1168,7 @@
+ static GSource *
+ pygtk_main_watch_new(void)
+ {
+-    return g_source_new(&pygtk_main_watch_funcs, sizeof(GSource));
++    return g_source_new(&pygtk_main_watch_funcs, sizeof(PySignalWatchSource));
+ }
+ 
+