[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-4-50-g12883a8
The following commit has been merged in the debian-experimental-3.5 branch:
commit 25cff8fca2eb2b7679e7507f454c1044158e378c
Author: Rene Engelhard <rene@debian.org>
Date: Fri Oct 21 08:45:43 2011 +0000
fix install with rhino disabled
diff --git a/patches/rhino-build-optional.diff b/patches/rhino-build-optional.diff
index 763e384..a53d32d 100644
--- a/patches/rhino-build-optional.diff
+++ b/patches/rhino-build-optional.diff
@@ -42,6 +42,25 @@ index 2bd4c61..f874898 100644
-tc scripting : filter oovbaapi vbahelper bridges DESKTOP:rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
+tc scripting : filter oovbaapi vbahelper bridges DESKTOP:rdbmaker vcl xmlscript basic sfx2 RHINO:rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
tc scripting\prj nmake - all tc1_prj NULL
+--- libreoffice-3.5.0/scp2/source/ooo/file_ooo.scp
++++ libreoffice-3.5.0/scp2/source/ooo/file_ooo.scp
+@@ -701,13 +701,15 @@ File gid_File_Scripts_Java
+ ARCHIVE_TXT_FILE_BODY;
+ Name = "ScriptsJava.zip";
+ End
+-#endif
+
++#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
+ File gid_File_Scripts_Javascript
+ Dir = gid_Dir_Share_Scripts;
+ ARCHIVE_TXT_FILE_BODY;
+ Name = "ScriptsJavaScript.zip";
+ End
++#endif
++#endif
+
+ // new user interface configuration files
+ File gid_File_Share_Config_Sofficecfg_uiconfig_Zip
--- libreoffice-3.5.0/tail_build/prj/build.lst-old 2011-10-20 22:44:37.000000000 +0000
+++ libreoffice-3.5.0/tail_build/prj/build.lst 2011-10-20 22:44:49.000000000 +0000
@@ -1,2 +1,2 @@
--
LibreOffice packaging repository
Reply to: