r45500 - in /packages/nlopt/trunk/debian: changelog control patches/04-python-includes.patch patches/series

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

Author: trophime-guest
Date: Tue Jan  8 08:30:50 2013
New Revision: 45500

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45500
Log:
fix #697638 and #697168

Added:
    packages/nlopt/trunk/debian/patches/04-python-includes.patch
Modified:
    packages/nlopt/trunk/debian/changelog
    packages/nlopt/trunk/debian/control
    packages/nlopt/trunk/debian/patches/series

Modified: packages/nlopt/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/changelog?rev=45500&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/changelog (original)
+++ packages/nlopt/trunk/debian/changelog Tue Jan  8 08:30:50 2013
@@ -1,3 +1,13 @@
+nlopt (2.3+dfsg-2) UNRELEASED; urgency=low
+
+  [Tim Gardner]
+  * Add 04-python-includes.patch to detect correct include python paths (Closes: #697638)
+
+  * debian/control
+     change sections for octave-nlopt and libnlopt0 (Closes: #697168)
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Tue, 08 Jan 2013 08:56:48 +0100
+
 nlopt (2.3+dfsg-1) unstable; urgency=low
 
   [ Christophe Trophime ]

Modified: packages/nlopt/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/control?rev=45500&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/control (original)
+++ packages/nlopt/trunk/debian/control Tue Jan  8 08:30:50 2013
@@ -85,6 +85,7 @@
 
 Package: octave-nlopt
 Architecture: any
+Section: math
 Depends: libnlopt0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, ${octave:Depends}
 Description: nonlinear optimization library -- GNU Octave package
  NLopt is a free/open-source library for nonlinear optimization, providing

Added: 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=45500&op=file
==============================================================================
--- packages/nlopt/trunk/debian/patches/04-python-includes.patch (added)
+++ packages/nlopt/trunk/debian/patches/04-python-includes.patch Tue Jan  8 08:30:50 2013
@@ -1,0 +1,20 @@
+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]) 

Modified: packages/nlopt/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/series?rev=45500&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/patches/series (original)
+++ packages/nlopt/trunk/debian/patches/series Tue Jan  8 08:30:50 2013
@@ -3,3 +3,4 @@
 01_manpage_fixes.patch
 02_spelling_fixes.patch
 03_guile_fix_deprecated_calls.patch
+04-python-includes.patch