[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.1-4-5-gc89788c
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 8683de63c2ed84d0c5ec38457f84e3dbeae3969f
Author: Rene Engelhard <rene@debian.org>
Date: Tue Aug 9 21:42:58 2011 +0200
make disable-rhino.diff and bsh-hardcode-path.diff apply again
diff --git a/patches/bsh-hardcode-path.diff b/patches/bsh-hardcode-path.diff
index 5e56881..3678102 100644
--- a/patches/bsh-hardcode-path.diff
+++ b/patches/bsh-hardcode-path.diff
@@ -14,11 +14,8 @@
+
--- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old 2011-06-28 11:18:27.000000000 +0000
+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-28 11:18:39.000000000 +0000
-@@ -1501,6 +1501,7 @@
-
+@@ -1418,3 +1418,4 @@
+
[ TemporaryHacks ]
disable-rhino.diff
+bsh-hardcode-path.diff
-
- [ DebianBaseOnly ]
- packcomponents-remove-split-components.diff
diff --git a/patches/disable-rhino.diff b/patches/disable-rhino.diff
index 1a1961e..605f8d8 100644
--- a/patches/disable-rhino.diff
+++ b/patches/disable-rhino.diff
@@ -860,12 +860,10 @@
+ TXT_FILE_BODY;
--- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old 2011-06-28 11:17:59.000000000 +0000
+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-28 11:18:15.000000000 +0000
-@@ -1499,5 +1499,8 @@
- [ Gcc46 ]
- gcc4.6.0.diff
-
+@@ -1415,3 +1415,6 @@
+ sd_effects_styles.diff, pixie
+ symbols-20-august.diff, i#11167, jopsen
+ vEdit-13-August.diff, jopsen
++
+[ TemporaryHacks ]
+disable-rhino.diff
-+
- [ DebianBaseOnly ]
- packcomponents-remove-split-components.diff
--
LibreOffice packaging repository
Reply to: