The following commit has been merged in the ubuntu-raring-4.0 branch:
commit fd0b7b9e0395670deb812f97c528cd4e27a4567f
Author: Bjoern Michaelsen <[email protected]>
Date: Thu Mar 28 09:42:39 2013 +0100
we have libservlet-3.0 already (Thanks Rico)
diff --git a/changelog b/changelog
index 1efc847..822e60f 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
libreoffice (1:4.0.2~rc2-0ubuntu1~raring1~ppa2) raring; urgency=low
* make -emailmerge B/R consistent
+ * we have libservlet-3.0 already
- -- Bjoern Michaelsen <[email protected]> Thu, 28 Mar 2013
09:38:30 +0100
+ -- Bjoern Michaelsen <[email protected]> Thu, 28 Mar 2013
09:41:07 +0100
libreoffice (1:4.0.2~rc2-0ubuntu1~raring1~ppa1) raring; urgency=low
diff --git a/patches/fix-internal-hsqldb-build.diff
b/patches/fix-internal-hsqldb-build.diff
index ed03511..2ea5fcb 100644
--- a/patches/fix-internal-hsqldb-build.diff
+++ b/patches/fix-internal-hsqldb-build.diff
@@ -18,7 +18,7 @@ diff -urN hsqldb.old/patches/use-system-servlet-api.jar.diff
hsqldb/patches/use-
+
${src}/org/hsqldb/util/SqlTool.java"
+ destdir="${basedir}/doc/src"
+- classpath="${basedir}/lib/servlet.jar;${basedir}/lib/junit.jar"
-++
classpath="/usr/share/java/servlet-api-2.5.jar;${basedir}/lib/junit.jar"
+++
classpath="/usr/share/java/servlet-api-3.0.jar;${basedir}/lib/junit.jar"
+ author="true"
+ version="false"
+ use="true"
@@ -27,7 +27,7 @@ diff -urN hsqldb.old/patches/use-system-servlet-api.jar.diff
hsqldb/patches/use-
+ sourcepath="${src}"
+ destdir="${basedir}/doc/src"
+- classpath="${basedir}/lib/servlet.jar;${basedir}/lib/junit.jar"
-++
classpath="/usr/share/java/servlet-api-2.5.jar;${basedir}/lib/junit.jar"
+++
classpath="/usr/share/java/servlet-api-3.0.jar;${basedir}/lib/junit.jar"
+ author="true"
+ version="false"
+ use="true"
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
