[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, experimental, updated. debian/4.1.18-dfsg-2-30-g1c54801

[Felix Geyer]

The following commit has been merged in the experimental branch:
commit 7218241199e41b098624b458d1ea987f2369c1d3
Author: Felix Geyer <fgeyer at debian.org>
Date:   Thu Mar 7 00:51:39 2013 +0100

    Fix python variable names and values in 36-python-multiarch.patch.

diff --git a/debian/patches/36-python-multiarch.patch b/debian/patches/36-python-multiarch.patch
index 8b18b9a..2fd02b8 100644
--- a/debian/patches/36-python-multiarch.patch
+++ b/debian/patches/36-python-multiarch.patch
@@ -1,5 +1,5 @@
 Description: Fix detection of python in multiarch paths using pkg-config.
-Author: Rico Tzschichholz <ricotz at ubuntu.com>
+Author: Rico Tzschichholz <ricotz at ubuntu.com>, Felix Geyer <fgeyer at debian.org>
 
 --- a/configure
 +++ b/configure
@@ -41,10 +41,10 @@ Author: Rico Tzschichholz <ricotz at ubuntu.com>
        cnf_append "VBOX_WITH_PYTHON"     "1"
 -      cnf_append "VBOX_PATH_PYTHON_INC" "$p/include/$d"
 -      cnf_append "VBOX_LIB_PYTHON"      "$p/$b/lib$d.so"
-+      cnf_append "VBOX_PATH_PYTHON_INC" "$PYTHON_CXX_CFLAGS"
-+      cnf_append "VBOX_LIB_PYTHON"      "$PYTHON_CXX_LIBS"
-+      cnf_append "VBOX_PYTHON"$d"_INC"  "$PYTHON_CXX_CFLAGS"
-+      cnf_append "VBOX_PYTHON"$d"_LIBS" "$PYTHON_CXX_LIBS"
++      cnf_append "VBOX_PYTHONDEF_INC" "`strip_I $PYTHON_CXX_CFLAGS`"
++      cnf_append "VBOX_PYTHONDEF_LIBS"      "$PYTHON_CXX_LIBS"
++      cnf_append "VBOX_PYTHON`echo $d | sed 's/\.//'`_INC"  "`strip_I $PYTHON_CXX_CFLAGS`"
++      cnf_append "VBOX_PYTHON`echo $d | sed 's/\.//'`_LIBS" "$PYTHON_CXX_LIBS"
      else
        log_failure "Python not working"
        fail

-- 
virtualbox Debian packaging