[SCM] LibreOffice packaging repository branch, ubuntu-saucy-4.1, updated. libreoffice_4.1.0_beta1-2-287-g58523f8
The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit 68468c95f1806c18c413a3775e1bccc14ef0cd96
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri May 31 17:11:12 2013 +0200
go for hsqldb 1.8.0
diff --git a/changelog b/changelog
index f9c18f2..9c6b434 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.0.2-0ubuntu4) saucy; urgency=low
+
+ * force hsqldb-1.8.0 in configure.ac
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 31 May 2013 17:10:05 +0200
+
libreoffice (1:4.0.2-0ubuntu3) saucy; urgency=low
* cherry-pick from Debian:
diff --git a/patches/go-for-hsqldb-1.8.diff b/patches/go-for-hsqldb-1.8.diff
new file mode 100644
index 0000000..e96ddbb
--- /dev/null
+++ b/patches/go-for-hsqldb-1.8.diff
@@ -0,0 +1,25 @@
+From 24c8531ad16540386ca2b6de37de69d83549e96a Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Fri, 31 May 2013 17:08:26 +0200
+Subject: [PATCH] go for hsqldb 1.8
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c561981..127ce45 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7585,7 +7585,7 @@ if test "$with_system_hsqldb" = "yes"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_HSQLDB=YES
+ if test -z $HSQLDB_JAR; then
+- HSQLDB_JAR=/usr/share/java/hsqldb.jar
++ HSQLDB_JAR=/usr/share/java/hsqldb1.8.0.jar
+ fi
+ AC_CHECK_FILE($HSQLDB_JAR, [],
+ [AC_MSG_ERROR(hsqldb.jar not found.)], [])
+--
+1.8.1.2
+
diff --git a/patches/series b/patches/series
index 80f06d0..cb6b0e5 100644
--- a/patches/series
+++ b/patches/series
@@ -36,3 +36,4 @@ lp-780399-sessioninstaller-for-remaining-java-wizards.diff
3-b62048701cea5024383e19314592f2edcd9810fd.patch
4-faf72664d11deaa570a0f8c7e702ff07bf5914c8.patch
lp-1182170-disable-XMLImport-subsequentcheck-on-sauc.diff
+go-for-hsqldb-1.8.diff
--
LibreOffice packaging repository
Reply to: