r18921 - in /desktop/unstable/pygtk/debian: changelog patches/65_bogus-python-includes.patch patches/70_autoconf.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Mar  9 10:47:04 2009
New Revision: 18921

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18921
Log:
* New upstream release.
  + 65_bogus-python-includes.patch: removed, merged upstream.
  + 70_autoconf.patch: regenerated.

Removed:
    desktop/unstable/pygtk/debian/patches/65_bogus-python-includes.patch
Modified:
    desktop/unstable/pygtk/debian/changelog
    desktop/unstable/pygtk/debian/patches/70_autoconf.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=18921&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/changelog (original)
+++ desktop/unstable/pygtk/debian/changelog Mon Mar  9 10:47:04 2009
@@ -1,3 +1,11 @@
+pygtk (2.14.1-1) unstable; urgency=low
+
+  * New upstream release.
+    + 65_bogus-python-includes.patch: removed, merged upstream.
+    + 70_autoconf.patch: regenerated.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 09 Mar 2009 11:43:13 +0100
+
 pygtk (2.13.0-3) unstable; urgency=low
 
   [ Loic Minier ]

Modified: desktop/unstable/pygtk/debian/patches/70_autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/patches/70_autoconf.patch?rev=18921&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/patches/70_autoconf.patch (original)
+++ desktop/unstable/pygtk/debian/patches/70_autoconf.patch Mon Mar  9 10:47:04 2009
@@ -1,16 +1,8 @@
-Index: pygtk-2.13.0/configure
+Index: pygtk-2.14.1/configure
 ===================================================================
---- pygtk-2.13.0.orig/configure	2008-08-24 11:29:32.000000000 +0200
-+++ pygtk-2.13.0/configure	2009-01-29 16:45:41.742752163 +0100
-@@ -10748,7 +10748,6 @@ CPPFLAGS="$save_CPPFLAGS"
- { echo "$as_me:$LINENO: checking for PySignal_SetWakeupFd in Python.h" >&5
- echo $ECHO_N "checking for PySignal_SetWakeupFd in Python.h... $ECHO_C" >&6; }
- py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
--PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES"
- cat >conftest.$ac_ext <<_ACEOF
-@@ -12539,10 +12538,11 @@ fi
+--- pygtk-2.14.1.orig/configure	2009-03-06 00:09:17.000000000 +0100
++++ pygtk-2.14.1/configure	2009-03-09 11:45:34.749671706 +0100
+@@ -13441,10 +13441,11 @@ fi
  
  if test "x$enable_numpy" != xno; then
    save_CPPFLAGS="$CPPFLAGS"
@@ -26,7 +18,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -12553,7 +12553,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -13455,7 +13456,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <Python.h>
  
@@ -35,7 +27,7 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
-@@ -12572,19 +12572,19 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -13474,19 +13475,19 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
@@ -60,7 +52,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_NUMPY
-@@ -12593,7 +12593,7 @@ _ACEOF
+@@ -13495,7 +13496,7 @@ _ACEOF
  fi
  
  

Modified: desktop/unstable/pygtk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/patches/series?rev=18921&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/patches/series (original)
+++ desktop/unstable/pygtk/debian/patches/series Mon Mar  9 10:47:04 2009
@@ -2,5 +2,4 @@
 02_numpy.patch
 03_testsuite_filechooser.patch
 60_pygtk-wakeupfd-fix.patch
-65_bogus-python-includes.patch
 70_autoconf.patch