[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-66-g921125b
The following commit has been merged in the debian-experimental-4.1 branch:
commit 921125bc24ec3e809d70fb98894c2b68d27dea83
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 12 11:40:17 2013 +0100
make wheezy-backports-python.diff apply again
diff --git a/patches/wheezy-backports-python.diff b/patches/wheezy-backports-python.diff
index 0e133ec..f4f6e1b 100644
--- a/patches/wheezy-backports-python.diff
+++ b/patches/wheezy-backports-python.diff
@@ -1,20 +1,22 @@
---- a/configure.ac-old 2013-02-14 22:36:09.220868022 +0100
-+++ b/configure.ac 2013-02-14 22:36:40.228867104 +0100
-@@ -7254,7 +7254,7 @@
- PYTHON_LIBS="-framework Python"
- else
- # This causes an error if no python command is found
-- AM_PATH_PYTHON([3.3])
-+ AM_PATH_PYTHON([2.6])
- fi
- elif test $enable_python = auto; then
- # We should not come here in a MSVC build, I think?
-@@ -7264,7 +7264,7 @@
-
- # This allows a lack of system Python 3.3 with no error, we check below for a system Python of
- # earlier version.
+diff --git a/configure.ac b/configure.ac
+index 0241d92..7e521ee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7310,7 +7318,7 @@ no|disable)
+ # Unset variables set by the above AM_PATH_PYTHON so that
+ # we actually do check anew.
+ unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON
- AM_PATH_PYTHON([3.3],, [:])
+ AM_PATH_PYTHON([2.6],, [:])
-
if test "$PYTHON" = :; then
+ AC_MSG_RESULT([internal])
enable_python=internal
+@@ -7367,7 +7375,7 @@ if test $enable_python = system; then
+ # we actually do check anew.
+ unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON
+ # This causes an error if no python command is found
+- AM_PATH_PYTHON([3.3])
++ AM_PATH_PYTHON([2.6])
+ python_include=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
+ python_version=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
+ python_libs=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBS'));"`
--
LibreOffice packaging repository
Reply to: