bin/distro-install-file-lists | 4 ++--
setup_native/source/packinfo/packinfo_extensions.txt | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit fb0238d276e5835dbb316a6f4ae383988ed62aee
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Wed Aug 14 11:02:19 2013 +0200
Unbreak Windows build
Change-Id: Ibeed303ca4b8812cf7deafa1d1ad06f59a73cf8d
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index ce67667..24cac1d 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -86,7 +86,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
done
# it is not a real extension; it used to be in the main package...
- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Javascript
$FILELISTSDIR/common_list.txt
+ merge_flists gid_Module_Optional_Extensions_Script_Provider_For_JS
$FILELISTSDIR/common_list.txt
if test "$SPLIT_APP_MODULES" = "YES" ; then
merge_flists gid_Module_Prg_Base_Bin $FILELISTSDIR/base_list.txt
@@ -275,7 +275,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
if test "z$OOO_VENDOR" = "zSUSE" ; then
# officebean subpackage
- test -f
$DESTDIR/gid_Module_Optional_Extensions_Script_Provider_For_Beanshell && cp
$DESTDIR/gid_Module_Optional_Extensions_Script_Provider_For_Beanshell
officebean_list.txt || :
+ test -f $DESTDIR/gid_Module_Optional_Extensions_Script_Provider_For_BS
&& cp $DESTDIR/gid_Module_Optional_Extensions_Script_Provider_For_BS
officebean_list.txt || :
mv_file_between_flists officebean_list.txt common_list.txt
$INSTALLDIR/program/classes/officebean.jar
mv_file_between_flists officebean_list.txt common_list.txt
$INSTALLDIR/program/libofficebean.so
add_used_directories officebean_list.txt common_list.txt
diff --git a/setup_native/source/packinfo/packinfo_extensions.txt
b/setup_native/source/packinfo/packinfo_extensions.txt
index ab36739..7392b6e 100644
--- a/setup_native/source/packinfo/packinfo_extensions.txt
+++ b/setup_native/source/packinfo/packinfo_extensions.txt
@@ -245,7 +245,7 @@ packageversion = "%PACKAGEVERSION"
End
Start
-module = "gid_Module_Optional_Extensions_Script_Provider_For_Beanshell"
+module = "gid_Module_Optional_Extensions_Script_Provider_For_BS"
solarispackagename =
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-beanshell-script-provider"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01
(Name="Core module for %PRODUCTNAME %PRODUCTVERSION"),
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for
%PRODUCTNAME %PRODUCTVERSION"),
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for
%PRODUCTNAME %PRODUCTVERSION"),
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for
%PRODUCTNAME %PRODUCTVERSION"),
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for
%PRODUCTNAME %PRODUCTVERSION"),
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for
%PRODUCTNAME %PRODUCTVERSION"),
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for
%PRODUCTNAME %PRODUCTVERSION")"
packagename =
"%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-beanshell-script-provider"
@@ -260,7 +260,7 @@ packageversion = "%PACKAGEVERSION"
End
Start
-module = "gid_Module_Optional_Extensions_Script_Provider_For_Javascript"
+module = "gid_Module_Optional_Extensions_Script_Provider_For_JS"
solarispackagename =
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-javascript-script-provider"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01
(Name="Core module for %PRODUCTNAME %PRODUCTVERSION"),
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for
%PRODUCTNAME %PRODUCTVERSION"),
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for
%PRODUCTNAME %PRODUCTVERSION"),
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for
%PRODUCTNAME %PRODUCTVERSION"),
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for
%PRODUCTNAME %PRODUCTVERSION"),
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for
%PRODUCTNAME %PRODUCTVERSION"),
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for
%PRODUCTNAME %PRODUCTVERSION")"
packagename =
"%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-javascript-script-provider"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
