r45519 - in /packages/nlopt/trunk/debian/patches: 04-python-includes.patch configure.patch swig.patch

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Mon Jan 14 15:46:05 2013
New Revision: 45519

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45519
Log:
update patch following DEPS3

Modified:
    packages/nlopt/trunk/debian/patches/04-python-includes.patch
    packages/nlopt/trunk/debian/patches/configure.patch
    packages/nlopt/trunk/debian/patches/swig.patch

Modified: packages/nlopt/trunk/debian/patches/04-python-includes.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/04-python-includes.patch?rev=45519&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/patches/04-python-includes.patch (original)
+++ packages/nlopt/trunk/debian/patches/04-python-includes.patch Mon Jan 14 15:46:05 2013
@@ -1,20 +1,21 @@
-diff -Nru nlopt-2.3+dfsg/debian/patches/04-python-includes.patch nlopt-2.3+dfsg/debian/patches/04-python-includes.patch
---- nlopt-2.3+dfsg/debian/patches/04-python-includes.patch	1969-12-31 17:00:00.000000000 -0700
-+++ nlopt-2.3+dfsg/debian/patches/04-python-includes.patch	2013-01-07 13:11:54.000000000 -0700
-@@ -0,0 +1,16 @@
-+Index: nlopt-2.3+dfsg/configure.ac
-+===================================================================
-+--- nlopt-2.3+dfsg.orig/configure.ac	2013-01-07 13:10:33.142903763 -0700
-++++ nlopt-2.3+dfsg/configure.ac	2013-01-07 13:11:44.192255658 -0700
-+@@ -163,9 +163,9 @@
-+ AM_PATH_PYTHON([],[have_python=yes],[have_python=no])
-+ if test $have_python = yes; then
-+   AC_MSG_CHECKING([for Python include directory])
-+-  pinc=`echo "import distutils.sysconfig; print distutils.sysconfig.get_python_inc()" | $PYTHON - 2>/dev/null`
-++  pinc="`$PYTHON-config --includes`"
-+   AC_MSG_RESULT([${pinc:-unknown}])
-+-  test -n "$pinc" && PYTHON_INCLUDES="-I$pinc"
-++  test -n "$pinc" && PYTHON_INCLUDES="$pinc"
-+   save_CPPFLAGS=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-+   AC_CHECK_HEADER([Python.h], [], [AC_MSG_WARN([disabling Python wrappers]) 
+Description: Detect Python includes paths using '$PYTHON-config --includes'
+ This patch fixes an Ubuntu FTBS in Raring and will likely be
+ important as Python versions increase (and include paths change). 
+Author: Tim Gardner <tim.gardner at canonical.com>
+
+Index: nlopt-2.3+dfsg/configure.ac
+===================================================================
+--- nlopt-2.3+dfsg.orig/configure.ac	2013-01-07 13:10:33.142903763 -0700
++++ nlopt-2.3+dfsg/configure.ac	2013-01-07 13:11:44.192255658 -0700
+@@ -163,9 +163,9 @@
+ AM_PATH_PYTHON([],[have_python=yes],[have_python=no])
+ if test $have_python = yes; then
+   AC_MSG_CHECKING([for Python include directory])
+-  pinc=`echo "import distutils.sysconfig; print distutils.sysconfig.get_python_inc()" | $PYTHON - 2>/dev/null`
++  pinc="`$PYTHON-config --includes`"
+   AC_MSG_RESULT([${pinc:-unknown}])
+-  test -n "$pinc" && PYTHON_INCLUDES="-I$pinc"
++  test -n "$pinc" && PYTHON_INCLUDES="$pinc"
+   save_CPPFLAGS=$CPPFLAGS
+   CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+   AC_CHECK_HEADER([Python.h], [], [AC_MSG_WARN([disabling Python wrappers]) 

Modified: packages/nlopt/trunk/debian/patches/configure.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/configure.patch?rev=45519&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/patches/configure.patch (original)
+++ packages/nlopt/trunk/debian/patches/configure.patch Mon Jan 14 15:46:05 2013
@@ -1,3 +1,6 @@
+Description: update configure script
+Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+
 Index: nlopt-2.2.1/configure.ac
 ===================================================================
 --- nlopt-2.2.1.orig/configure.ac	2011-01-20 10:55:46.000000000 +0100

Modified: packages/nlopt/trunk/debian/patches/swig.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/swig.patch?rev=45519&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/patches/swig.patch (original)
+++ packages/nlopt/trunk/debian/patches/swig.patch Mon Jan 14 15:46:05 2013
@@ -1,3 +1,6 @@
+Description: fixes FTBS when building with multiples python versions
+Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+
 Index: nlopt-2.2.4/swig/Makefile.am
 ===================================================================
 --- nlopt-2.2.4.orig/swig/Makefile.am	2011-06-17 15:34:42.000000000 +0200