[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.1-1-28-gc709781
The following commit has been merged in the debian-experimental-3.7 branch:
commit 31420cf741058ac513d228fc320a0a877d196f5d
Author: Rene Engelhard <rene@debian.org>
Date: Thu Aug 23 22:57:06 2012 +0200
fix kFreeBSD Java builds
diff --git a/changelog b/changelog
index cb46910..e655387 100644
--- a/changelog
+++ b/changelog
@@ -10,6 +10,8 @@ libreoffice (1:3.6.1~rc2-1) UNRELEASED; urgency=low
* debian/patches/debian-debug.diff: patch new gb_SYMBOLS in unxgcc.mk to
make ENABLE_SYMBOLS=SMALL (-g1) working again..
+ * debian/patches/debian/patches/kfrebsd-add-missing-P_SEP.diff: fix Java build
+ on kfreebsd (non-broken CLASSPATH)
* src/2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2: remove
zlib-1.2.7/doc/rfc195{0,1,2}.txt (closes: #685133)
@@ -23,7 +25,7 @@ libreoffice (1:3.6.1~rc2-1) UNRELEASED; urgency=low
* debian/control.in:
- remove obsolete sharutils, po-debconf and wget | curl build-deps
- -- Rene Engelhard <rene@debian.org> Mon, 20 Aug 2012 18:33:08 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 23 Aug 2012 22:34:27 +0200
libreoffice (1:3.6.1~rc1-2) experimental; urgency=low
@@ -38,7 +40,6 @@ libreoffice (1:3.6.1~rc1-2) experimental; urgency=low
libreoffice (1:3.6.1~rc1-1) experimental; urgency=low
- [ Rene Engelhard ]
* new upstream release candidate
- fixes splashscreen location in multi-monitor setups
(closes: #657444, #431473)
diff --git a/patches/kfreebsd-add-missing-P_SEP.diff b/patches/kfreebsd-add-missing-P_SEP.diff
new file mode 100644
index 0000000..f89dcb7
--- /dev/null
+++ b/patches/kfreebsd-add-missing-P_SEP.diff
@@ -0,0 +1,11 @@
+--- 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 950bcc4..e4dcc49 100644
--- a/patches/series
+++ b/patches/series
@@ -26,3 +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
--
LibreOffice packaging repository
Reply to: