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

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Jan 29 15:47:49 2009
New Revision: 18299

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18299
Log:
* 65_bogus-python-includes.patch: patch from Loïc Minier. Don’t 
  override PYTHON_INCLUDES, already set by AM_CHECK_PYTHON_HEADERS.
  Closes: #512345.
* 70_autoconf.patch: refreshed.

Added:
    desktop/experimental/pygtk/debian/patches/65_bogus-python-includes.patch
Modified:
    desktop/experimental/pygtk/debian/changelog
    desktop/experimental/pygtk/debian/patches/70_autoconf.patch
    desktop/experimental/pygtk/debian/patches/series

Modified: desktop/experimental/pygtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/changelog?rev=18299&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/changelog (original)
+++ desktop/experimental/pygtk/debian/changelog Thu Jan 29 15:47:49 2009
@@ -1,5 +1,6 @@
 pygtk (2.13.0-3) UNRELEASED; urgency=low
 
+  [ Loic Minier ]
   * Pass PYTHON to $(MAKE) runs for robustness in case of timestamp skews; see
     #509192; thanks Colin Watson for the original patch.
   * Don't purge /usr/share/doc/python-gtk2-doc/examples/demos during first
@@ -12,6 +13,12 @@
   * Don't strip python-gtk2-dbg.
   * Rework install rules and dependencies completely to avoid .PHONY implicit
     targets.
+
+  [ Josselin Mouette ]
+  * 65_bogus-python-includes.patch: patch from Loïc Minier. Don’t 
+    override PYTHON_INCLUDES, already set by AM_CHECK_PYTHON_HEADERS.
+    Closes: #512345.
+  * 70_autoconf.patch: refreshed.
 
  -- Loic Minier <lool at dooz.org>  Fri, 19 Dec 2008 15:15:52 +0100
 

Added: desktop/experimental/pygtk/debian/patches/65_bogus-python-includes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/patches/65_bogus-python-includes.patch?rev=18299&op=file
==============================================================================
--- desktop/experimental/pygtk/debian/patches/65_bogus-python-includes.patch (added)
+++ desktop/experimental/pygtk/debian/patches/65_bogus-python-includes.patch Thu Jan 29 15:47:49 2009
@@ -1,0 +1,16 @@
+Debian #512345
+GNOME #556130
+LP #282320
+
+Index: pygtk-2.13.0/configure.ac
+===================================================================
+--- pygtk-2.13.0.orig/configure.ac	2009-01-29 16:44:31.502757066 +0100
++++ pygtk-2.13.0/configure.ac	2009-01-29 16:44:51.538252988 +0100
+@@ -79,7 +79,6 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(c
+ 
+ AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h])
+ 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"
+ AC_TRY_COMPILE([#include <Python.h>],

Modified: desktop/experimental/pygtk/debian/patches/70_autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/patches/70_autoconf.patch?rev=18299&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/patches/70_autoconf.patch (original)
+++ desktop/experimental/pygtk/debian/patches/70_autoconf.patch Thu Jan 29 15:47:49 2009
@@ -1,8 +1,16 @@
 Index: pygtk-2.13.0/configure
 ===================================================================
---- pygtk-2.13.0.orig/configure	2008-11-12 18:05:27.582994347 +0100
-+++ pygtk-2.13.0/configure	2008-11-12 18:05:32.287485211 +0100
-@@ -12539,10 +12539,11 @@ fi
+--- 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
  
  if test "x$enable_numpy" != xno; then
    save_CPPFLAGS="$CPPFLAGS"
@@ -18,7 +26,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -12553,7 +12554,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -12553,7 +12553,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <Python.h>
  
@@ -27,7 +35,7 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
-@@ -12572,19 +12573,19 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -12572,19 +12572,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
@@ -52,7 +60,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_NUMPY
-@@ -12593,7 +12594,7 @@ _ACEOF
+@@ -12593,7 +12593,7 @@ _ACEOF
  fi
  
  

Modified: desktop/experimental/pygtk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/patches/series?rev=18299&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/patches/series (original)
+++ desktop/experimental/pygtk/debian/patches/series Thu Jan 29 15:47:49 2009
@@ -2,4 +2,5 @@
 02_numpy.patch
 03_testsuite_filechooser.patch
 60_pygtk-wakeupfd-fix.patch
+65_bogus-python-includes.patch
 70_autoconf.patch