The following commit has been merged in the debian-experimental-3.5 branch:
commit ee7b69fd1f04faed32595004b0aa5bac3b77a219
Author: Rene Engelhard <[email protected]>
Date: Fri Oct 21 00:42:30 2011 +0200
update more patches
diff --git a/patches/bsh-hardcode-path.diff b/patches/bsh-hardcode-path.diff
deleted file mode 100644
index bcc250e..0000000
--- a/patches/bsh-hardcode-path.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- libreoffice-3.5.0/scripting/java/build.xml 2011-06-28 11:11:12.000000000
+0000
-+++ libreoffice-3.5.0/scripting/java/build.xml-old 2011-06-28
11:10:53.000000000 +0000
-@@ -52,7 +52,7 @@
- <pathelement location="${solar.jar}/juh.jar"/>
- <pathelement location="${solar.jar}/java_uno.jar"/>
- <pathelement location="${solar.jar}/ridl.jar"/>
-- <pathelement location="${env.BSH_JAR}"/>
-+ <pathelement location="/usr/share/java/bsh.jar"/>
- <pathelement location="${jardir}"/>
- </path>
-
diff --git a/patches/update-debian-opt.diff b/patches/debian-opt.diff
similarity index 100%
rename from patches/update-debian-opt.diff
rename to patches/debian-opt.diff
diff --git a/patches/disable-rhino.diff b/patches/rhino-build-optional.diff
similarity index 100%
rename from patches/disable-rhino.diff
rename to patches/rhino-build-optional.diff
--
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]
