[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.1-1-31-gb10e81f
The following commit has been merged in the debian-experimental-3.7 branch:
commit b10e81fe9c48afa124959b491d2b8fec1d0da5af
Author: Rene Engelhard <rene@debian.org>
Date: Thu Sep 6 22:37:46 2012 +0200
unfuzzy debian-opt.diff; remove obsolete kfreebsd-add-missing-P_SEP.diff
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index 7750eeb..f8ed12e 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -2,14 +2,14 @@ diff --git a/configure.in b/configure.in
index c0b76f8..d10222f 100644
--- libreoffice-3.5.0/configure.in
+++ libreoffice-3.5.0/configure.in
-@@ -7936,6 +7936,13 @@ fi
- AC_SUBST(GMAKE_PARALLELISM)
- AC_SUBST(GMAKE_MODULE_PARALLELISM)
+@@ -12203,6 +12217,13 @@ fi
+ AC_MSG_RESULT([$CHECK_PARALLELISM])
+ AC_SUBST(CHECK_PARALLELISM)
+if test -x /usr/bin/dpkg-buildflags; then
-+ CDEFAULTOPT=`dpkg-buildflags --get CFLAGS 2>/dev/null | grep -E -o "\-O[[0-3]]"`
++ CDEFAULTOPT=`dpkg-buildflags --get CFLAGS 2>/dev/null | grep -E -o "\-O[[0-3]]"`
+else
-+ CDEFAULTOPT=-O2
++ CDEFAULTOPT=-O2
+fi
+AC_SUBST(CDEFAULTOPT)
+
diff --git a/patches/kfreebsd-add-missing-P_SEP.diff b/patches/kfreebsd-add-missing-P_SEP.diff
deleted file mode 100644
index f89dcb7..0000000
--- a/patches/kfreebsd-add-missing-P_SEP.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in-old 2012-08-23 22:22:17.023096695 +0200
-+++ b/configure.in 2012-08-23 22:22:48.827254399 +0200
-@@ -3126,6 +3126,8 @@
- GUIBASE=unx
- OS=LINUX
- RTL_OS=kFreeBSD
-+ P_SEP=:
-+
- case "$host_cpu" in
-
- i*86)
diff --git a/patches/series b/patches/series
index 0a54884..a62ebc9 100644
--- a/patches/series
+++ b/patches/series
@@ -26,5 +26,4 @@ pyuno-py3-module.diff
ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
#disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
-kfreebsd-add-missing-P_SEP.diff
disable-flaky-unoapi-tests.diff
--
LibreOffice packaging repository
Reply to: