[Libreoffice-commits] .: scp2/source setup_native/source
scp2/source/ooo/windowscustomaction_ooo.scp |9 ++
setup_native/source/win32/customactions/sellang/exports.dxp |1
setup_native/source/win32/customactions/sellang/makefile.mk |3
setup_native/source/win32/customactions/sellang/sorttree.cxx | 37 +++
4 files changed, 49 insertions(+), 1 deletion(-)
New commits:
commit 39bb77fd667f9d9fdaf374f3934b6eec7b7dc57a
Author: Andras Timar ati...@suse.com
Date: Tue Apr 24 21:51:33 2012 +0200
fdo#46355 sort SelectionTree control of Custom Setup with a custom action
Although Microsoft says that SelectionTree control can publish a control
event only on Windows Server 2003 and above, the custom action seems to
be working under a fully patched Windows XP SP3. Maybe it fails silently
on older Windows XPs, not to mention Windows 2000. I did not test those.
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp
b/scp2/source/ooo/windowscustomaction_ooo.scp
index 70197b7..51cfda1 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -474,6 +474,15 @@ WindowsCustomAction gid_Customaction_SelectLanguage
Assignment1 = (ControlEvent, SetupType, Next, DoAction,
SelectLanguage, 1, 1);
End
+WindowsCustomAction gid_Customaction_SortTree
+Name = SortTree;
+Typ = 321;
+Source = sellangmsi.dll;
+Target = SortTree;
+Inbinarytable = 1;
+Assignment1 = (ControlEvent, CustomSetup, Tree, DoAction,
SortTree, 1, 1);
+End
+
WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties
Name = RebaseLibrariesOnProperties;
Typ = 65;
diff --git a/setup_native/source/win32/customactions/sellang/exports.dxp
b/setup_native/source/win32/customactions/sellang/exports.dxp
index cc6dd8d..c8a622e 100644
--- a/setup_native/source/win32/customactions/sellang/exports.dxp
+++ b/setup_native/source/win32/customactions/sellang/exports.dxp
@@ -1 +1,2 @@
SelectLanguage
+SortTree
diff --git a/setup_native/source/win32/customactions/sellang/makefile.mk
b/setup_native/source/win32/customactions/sellang/makefile.mk
index ffad814..862653e 100644
--- a/setup_native/source/win32/customactions/sellang/makefile.mk
+++ b/setup_native/source/win32/customactions/sellang/makefile.mk
@@ -49,7 +49,8 @@ CFLAGS+=-D_STLP_USE_STATIC_LIB
UWINAPILIB=
SLOFILES = \
-$(SLO)$/sellang.obj
+$(SLO)/sellang.obj \
+$(SLO)/sorttree.obj
SHL1STDLIBS= \
$(KERNEL32LIB)\
diff --git a/setup_native/source/win32/customactions/sellang/sorttree.cxx
b/setup_native/source/win32/customactions/sellang/sorttree.cxx
new file mode 100644
index 000..25c6c6d
--- /dev/null
+++ b/setup_native/source/win32/customactions/sellang/sorttree.cxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Copyright 2012 LibreOffice contributors.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifdef _MSC_VER
+#pragma warning(push, 1) /* disable warnings within system headers */
+#endif
+#define WIN32_LEAN_AND_MEAN
+#include windows.h
+#include msiquery.h
+#include commctrl.h
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+extern C UINT __stdcall SortTree(MSIHANDLE)
+{
+// Sort items (languages) in SelectionTree control, fdo#46355
+
+HWND hwndMSI = FindWindow(TEXT(MsiDialogCloseClass), NULL);
+HWND hwndTV = FindWindowEx(hwndMSI, NULL, TEXT(SysTreeView32), NULL);
+HTREEITEM treeRoot = TreeView_GetRoot(hwndTV);
+HTREEITEM optional = TreeView_GetNextSibling(hwndTV, treeRoot);
+HTREEITEM dicts = TreeView_GetChild(hwndTV, optional);
+TreeView_SortChildren(hwndTV, dicts, TRUE);
+HTREEITEM langs = TreeView_GetNextSibling(hwndTV, optional);
+TreeView_SortChildren(hwndTV, langs, TRUE);
+
+ return ERROR_SUCCESS;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/mingw_dlls.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c08e789d3a6449e4abf946b77894a72aedd1dc53 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Mar 19 09:52:31 2012 +0100 Copy/paste typo diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp index 8a3098f..6d50c32 100644 --- a/scp2/source/ooo/mingw_dlls.scp +++ b/scp2/source/ooo/mingw_dlls.scp @@ -51,7 +51,7 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL ) MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, MINGW_LIBXSLT_DLL ) #endif #ifdef NEEDS_MINGW_ICONV_DLL -MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, MINGW_ICONV_DLL ) +MINGW_DLL( gid_Brand_File_Lib_Mingw_Iconv, MINGW_ICONV_DLL ) #endif #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/onlineupdate/file_onlineupdate.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0138d85a6f9cb33a943d43e715fd2a34edb6011d Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Mar 7 13:53:39 2012 +0100 fix library name diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp index 7c60bcc..63d1968 100644 --- a/scp2/source/onlineupdate/file_onlineupdate.scp +++ b/scp2/source/onlineupdate/file_onlineupdate.scp @@ -31,7 +31,7 @@ File gid_File_Lib_Updchk BIN_FILE_BODY; Styles = (PACKED); Dir = gid_Brand_Dir_Program; -Name = updchk.dll; +Name = SPECIAL_NAME(updchk); ComponentCondition=ISCHECKFORPRODUCTUPDATES=1; End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source solenv/inc
scp2/source/ooo/module_helppack.ulf | 10 -- scp2/source/ooo/module_langpack.ulf | 10 -- solenv/inc/langlist.mk |1 + 3 files changed, 17 insertions(+), 4 deletions(-) New commits: commit 05bc9c87a896f58de27accf5a06c04b22a2a74e3 Author: Andras Timar ati...@suse.com Date: Tue Mar 6 11:57:45 2012 +0100 Add Bengali (India) UI translation diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf index 18ac86e..269054e 100644 --- a/scp2/source/ooo/module_helppack.ulf +++ b/scp2/source/ooo/module_helppack.ulf @@ -254,10 +254,16 @@ en-US = Northern Sotho en-US = Installs Northern Sotho help in %PRODUCTNAME %PRODUCTVERSION [STR_NAME_MODULE_HELPPACK_BN] -en-US = Bengali +en-US = Bengali (Bangladesh) [STR_DESC_MODULE_HELPPACK_BN] -en-US = Installs Bengali help in %PRODUCTNAME %PRODUCTVERSION +en-US = Installs Bengali (Bangladesh) help in %PRODUCTNAME %PRODUCTVERSION + +[STR_NAME_MODULE_HELPPACK_BN_IN] +en-US = Bengali (India) + +[STR_DESC_MODULE_HELPPACK_BN_IN] +en-US = Installs Bengali (India) help in %PRODUCTNAME %PRODUCTVERSION [STR_NAME_MODULE_HELPPACK_OR] en-US = Oriya diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index 086033f..fa598e9 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -260,10 +260,16 @@ en-US = Northern Sotho en-US = Installs the Northern Sotho user interface [STR_NAME_MODULE_LANGPACK_BN] -en-US = Bengali +en-US = Bengali (Bangladesh) [STR_DESC_MODULE_LANGPACK_BN] -en-US = Installs the Bengali user interface +en-US = Installs the Bengali (Bangladesh) user interface + +[STR_NAME_MODULE_LANGPACK_BN_IN] +en-US = Bengali (India) + +[STR_DESC_MODULE_LANGPACK_BN] +en-US = Installs the Bengali (India) user interface [STR_NAME_MODULE_LANGPACK_OR] en-US = Oriya diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk index 67515a8..5ba2dc8 100644 --- a/solenv/inc/langlist.mk +++ b/solenv/inc/langlist.mk @@ -34,6 +34,7 @@ ast \ be \ bg \ bn \ +bn-IN \ bo \ br \ brx \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source sysui/desktop
scp2/source/ooo/common_brand.scp | 10 ++
sysui/desktop/freedesktop/freedesktop-menus.spec |1 +
sysui/desktop/menus/calc.desktop |2 +-
sysui/desktop/menus/draw.desktop |2 +-
sysui/desktop/menus/impress.desktop |2 +-
sysui/desktop/menus/writer.desktop |2 +-
sysui/desktop/menus/xsltfilter.desktop |9 +
sysui/desktop/share/launcher_genericname.ulf |3 +++
sysui/desktop/share/makefile.mk |2 +-
sysui/desktop/suse/suse-menus.spec |1 +
10 files changed, 29 insertions(+), 5 deletions(-)
New commits:
commit 4564f9c207ab53c70a199a2dbcc0d8f155211256
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 6 12:39:07 2012 +
Resolves: rhbz#799525 put flat odf mimetypes in xsltfilter.desktop
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 69c0a71..4c594df 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -98,6 +98,7 @@ Module gid_Module_Root_Brand
gid_Brand_File_Share_Xdg_QStart,
gid_Brand_File_Share_Xdg_StartCenter,
gid_Brand_File_Share_Xdg_Writer,
+ gid_Brand_File_Share_Xdg_XsltFilter,
gid_Brand_File_Txt_Package,
gid_License_Txt,
git_License_Odt,
@@ -791,6 +792,15 @@ File gid_Brand_File_Share_Xdg_BinFilter
End
#endif
+#if defined UNX ! defined MACOSX
+File gid_Brand_File_Share_Xdg_XsltFilter
+TXT_FILE_BODY;
+Dir = gid_Brand_Dir_Share_Xdg;
+Name = xsltfilter.desktop;
+Styles = (PACKED,SCPZIP_REPLACE);
+End
+#endif
+
// Profiles
Profile gid_Brand_Profile_Bootstrap_Ini
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec
b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 78a33ae..039bdc2 100755
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -387,6 +387,7 @@ done
/usr/share/applications/%unixfilename-startcenter.desktop
/usr/share/applications/%unixfilename-javafilter.desktop
/usr/share/applications/%unixfilename-binfilter.desktop
+/usr/share/applications/%unixfilename-xsltfilter.desktop
/usr/share/icons/gnome/*/apps/*png
/usr/share/icons/gnome/*/mimetypes/*png
/usr/share/icons/hicolor/*/apps/*png
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index c8899cd..b4c0385 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -5,7 +5,7 @@ Icon=calc
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets;
Exec=${UNIXBASISROOTNAME} --calc %U
-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;
+MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;
Name=%PRODUCTNAME Calc
GenericName=Spreadsheet
Comment=Perform calculations, analyze information and manage lists in
spreadsheets by using Calc.
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 67ad422..231f320 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -5,7 +5,7 @@ Icon=draw
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing;
Exec=${UNIXBASISROOTNAME} --draw %U
-MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;
+MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;
Name=%PRODUCTNAME Draw
GenericName=Drawing Program
Comment=Create and edit drawings, flow charts, and logos by using Draw.
diff --git
[Libreoffice-commits] .: scp2/source
scp2/source/onlineupdate/file_onlineupdate.scp |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit 5ce699f0c82d5bfd629c22be0747bbe3b851a9fd Author: Andras Timar ati...@suse.com Date: Tue Mar 6 16:10:25 2012 +0100 fdo#46508 use ISCHECKFORPRODUCTUPDATES property for online update ISCHECKFORPRODUCTUPDATES is a de-facto standard for enabling or disabling Online Update feature. We had this property but it was unused for a long time. Now LibreOffice can be installed with msiexec /i LibOversion.msi ISCHECKFORPRODUCTUPDATES=0 in order to disable Online Update feature. diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp index 526e6eb..7c60bcc 100644 --- a/scp2/source/onlineupdate/file_onlineupdate.scp +++ b/scp2/source/onlineupdate/file_onlineupdate.scp @@ -27,13 +27,20 @@ #include macros.inc -SPECIAL_LIB_FILE( gid_File_Lib_Updchk , updchk ) +File gid_File_Lib_Updchk +BIN_FILE_BODY; +Styles = (PACKED); +Dir = gid_Brand_Dir_Program; +Name = updchk.dll; +ComponentCondition=ISCHECKFORPRODUCTUPDATES=1; +End File gid_File_Share_Registry_Onlineupdate_Xcd TXT_FILE_BODY; Styles = (PACKED); Dir = gid_Brand_Dir_Share_Registry; Name = onlineupdate.xcd; +ComponentCondition=ISCHECKFORPRODUCTUPDATES=1; End #if defined LINUX || defined SOLARIS ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/common_brand.scp |2 +-
scp2/source/ooo/registryitem_ooo.scp |8
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 06dd0fda38f07a74ba8469542ed4afe93b47ee9c
Author: Andras Timar ati...@suse.com
Date: Fri Feb 24 11:46:39 2012 +0100
fdo#46377 BASISINSTALLLOCATION = INSTALLLOCATION
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 6ded2c4..69c0a71 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1396,7 +1396,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Basisinstall
Section = Bootstrap;
Order = 4;
Key = BASISINSTALLLOCATION;
-Value = [INSTALLLOCATION]Basis\\;
+Value = [INSTALLLOCATION];
Inifiletablekey = BasisInstallLocation;
Inifiletableaction = 1;
Styles = (INIFILETABLE);
diff --git a/scp2/source/ooo/registryitem_ooo.scp
b/scp2/source/ooo/registryitem_ooo.scp
index 5bc40d6..803f979 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -334,7 +334,7 @@ RegistryItem
gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
Subkey =
Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE;
ModuleID = gid_Module_Root;
Name = BASISINSTALLLOCATION;
- Value = [INSTALLLOCATION]Basis\\;
+ Value = [INSTALLLOCATION];
Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
@@ -343,7 +343,7 @@ RegistryItem
gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
Subkey =
Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE;
ModuleID = gid_Module_Root;
Name = BASISINSTALLLOCATION;
- Value = [INSTALLLOCATION]Basis\\;
+ Value = [INSTALLLOCATION];
Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
@@ -352,7 +352,7 @@ RegistryItem
gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
Subkey = Software\LibreOffice\${REGISTRYLAYERNAME}\Basis\%PRODUCTVERSION;
ModuleID = gid_Module_Root;
Name = BASISINSTALLLOCATION;
- Value = [INSTALLLOCATION]Basis\\;
+ Value = [INSTALLLOCATION];
Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_PRODUCTVERSION);
End
@@ -361,7 +361,7 @@ RegistryItem
gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstal
Subkey =
Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION;
ModuleID = gid_Module_Root;
Name = BASISINSTALLLOCATION;
- Value = [INSTALLLOCATION]Basis\\;
+ Value = [INSTALLLOCATION];
Styles = (ALWAYS_REQUIRED);
End
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/winexplorerext/registryitem_winexplorerext.scp | 24 ++---
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 2786c354ce4f7ff215fffe83ef242ee3b411fb13
Author: Andras Timar ati...@suse.com
Date: Fri Feb 17 12:58:37 2012 +0100
fdo#46167 fix path of shell extension dll in registry
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index c7def3e..32a5ef8 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -35,8 +35,8 @@ RegistryItem
gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\shlxthdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
End
RegistryItem
gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
@@ -58,8 +58,8 @@ RegistryItem
gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\shlxthdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
End
RegistryItem
gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
@@ -90,8 +90,8 @@ RegistryItem
gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\shlxthdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
End
RegistryItem
gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
@@ -122,8 +122,8 @@ RegistryItem
gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
ModuleID = gid_Module_Root;
Subkey = CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32;
Styles = (X64); // Values: X64 / X64_ONLY
-Value = [INSTALLLOCATION]shlxthdl\ooofilt.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\ooofilt_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\ooofilt.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll;
End
RegistryItem
gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
@@ -163,8 +163,8 @@ RegistryItem
gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\shlxthdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
End
RegistryItem
gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
@@ -197,8 +197,8 @@ RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer
ComponentCondition = VersionNT = 600;
Styles = (X64);
Subkey = CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\propertyhdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\propertyhdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\propertyhdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll;
End
RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/python/file_python.scp |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit 2ea723e8ce4077c7efa957d278637c4d9f32cf14 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Feb 6 15:51:52 2012 +0100 Revert Mac OS X uses .dylib and not .so for python modules. This reverts commit b53a86a5676d5bcb88ed6e3ac524a3560e713c22. Conflicts: scp2/source/python/file_python.scp I assume that the file *shall* be named .so on Mac OS X after all, and that it actually being named .dylib was a mistake introduced with a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe and reverted with 0b1be1ce0e0ac7b34c4b73d53f4bf32ec5df7290. diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index cdcd744..194394d 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -284,14 +284,10 @@ End #ifdef UNX +// pyuno.so even on Mac OS X, because it is a python module File gid_File_Pyuno LIB_FILE_BODY; -#ifdef MACOSX -// note: Mac OS X use .dylib, even for python modules -Name = pyuno.dylib; -#else Name = pyuno.so; -#endif Dir = gid_Brand_Dir_Program; Styles = (PACKED); End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/xsltfilter/module_xsltfilter.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fe5640594eea2637b720f7311eed0c4f218a6893 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Feb 2 11:42:01 2012 +0100 Chose xslt filters for default install, not for minimal though diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp index 7854ce7..a3206b0 100644 --- a/scp2/source/xsltfilter/module_xsltfilter.scp +++ b/scp2/source/xsltfilter/module_xsltfilter.scp @@ -45,6 +45,6 @@ Module gid_Module_Optional_Xsltfiltersamples gid_File_Xsl_Export_Xhtml_Table, gid_File_Share_Registry_Xsltfilter_Xcd ); Minimal = NO; -Default = NO; +Default = YES; Styles = ( ); End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/base/file_base.scp |3 --- 1 file changed, 3 deletions(-) New commits: commit d9ebbe3e5f0beb31364df524b9136958012558cf Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Jan 27 08:01:09 2012 +0100 Disable Adabas UI *installation*, too diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index d54b5e1..59b0f74 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -57,9 +57,6 @@ STD_RES_FILE( gid_File_Res_Dbp, dbp) STD_LIB_FILE( gid_File_Lib_Dbu, dbu ) STD_RES_FILE( gid_File_Res_Dbu, dbu) -STD_LIB_FILE( gid_File_Lib_Adabasui, adabasui ) -STD_RES_FILE( gid_File_Res_Adabasui, adabasui) - STD_RES_FILE( gid_File_Res_Cnr, cnr) STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl) STD_RES_FILE( gid_File_Res_Sdberr, sdberr) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/file_font_ooo.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 966a5340e08b68f4ff00633f8de075654feb9c13 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Jan 14 17:31:56 2012 +0100 scp2: typo: Serif - Sans diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index fef7b3b..104f32c 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -101,7 +101,7 @@ STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic #ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular) STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic) -STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif Bold) +STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Sans Bold) STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic) #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/common_brand.scp |2 +- scp2/source/ooo/file_ooo.scp |2 +- scp2/source/ooo/makefile.mk |4 3 files changed, 6 insertions(+), 2 deletions(-) New commits: commit aa7e105677017059ab84c4f3bd38b6a511637395 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jan 13 16:02:03 2012 +0100 scp2: install nsplugin only in case it's build diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 04131ec..ed8f3b6 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -643,7 +643,7 @@ File gid_Brand_File_Bin_Libxml2 End #endif -#if !defined WITHOUT_MOZILLA (!defined UNX || defined ENABLE_GTK) +#if !defined WITHOUT_MOZILLA defined ENABLE_NSPLUGIN File gid_Brand_File_Lib_Npsoplugin BIN_FILE_BODY; Name = SPECIAL_NAME(npsoplugin); diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 4876614..5263c11 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -110,7 +110,7 @@ End #ifndef WITHOUT_MOZILLA -#if !defined(UNX) || defined(ENABLE_GTK) +#ifdef ENABLE_NSPLUGIN File gid_File_Exe_Nsplugin BIN_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 96bcb5f..87cc67c 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -66,6 +66,10 @@ SCPDEFS+=-DENABLE_GTK3 .ENDIF .ENDIF # $(GUI)==UNX +.IF $(ENABLE_NSPLUGIN) == YES +SCPDEFS+=-DENABLE_NSPLUGIN +.ENDIF + .IF $(MERGELIBS) == TRUE SCPDEFS+=-DMERGELIBS .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source scp2/util
scp2/source/ooo/makefile.mk |1 scp2/source/ooo/vc_redist.scp | 60 -- scp2/util/makefile.mk |1 3 files changed, 62 deletions(-) New commits: commit 7a3ef2719eb68d2862354181ca5a906129569a57 Author: Andras Timar ati...@suse.com Date: Fri Jan 6 19:33:42 2012 +0100 remove vc_redist from scp2 diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 96bcb5f..c5443e9 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -343,7 +343,6 @@ PARFILES +=\ folder_ooo.par \ folderitem_ooo.par \ registryitem_ooo.par \ -vc_redist.par \ mingw_dlls.par \ windowscustomaction_ooo.par .ENDIF diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp deleted file mode 100644 index a01f891..000 --- a/scp2/source/ooo/vc_redist.scp +++ /dev/null @@ -1,60 +0,0 @@ -/* -* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * http://www.openoffice.org/license.html - * for a copy of the LGPLv3 License. - * -/ - -#include macros.inc - -#if defined(WITH_VC_REDIST) - -MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86 -Feature = gm_Root; -Name = Microsoft_VC90_CRT_x86.msm; -RootDir = TARGETDIR; -End - -MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86 -Feature = gm_Root; -Name = policy_9_0_Microsoft_VC90_CRT_x86.msm; -RootDir = TARGETDIR; -End - -#if defined(BUILD_X64) - -MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86_x64 -Feature = gm_Root; -Name = Microsoft_VC90_CRT_x86_x64.msm; -RootDir = TARGETDIR; -End - -MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64 -Feature = gm_Root; -Name = policy_9_0_Microsoft_VC90_CRT_x86_x64.msm; -RootDir = TARGETDIR; -End - -#endif - -#endif diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 9af2c3a..42e026d 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -148,7 +148,6 @@ SCP1FILES += \ folder_ooo.par\ folderitem_ooo.par\ windowscustomaction_ooo.par \ - vc_redist.par \ mingw_dlls.par\ registryitem_writer.par \ folderitem_writer.par \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source scp2/util
scp2/source/ooo/makefile.mk |1 scp2/source/ooo/vc_redist.scp | 60 ++ scp2/util/makefile.mk |1 3 files changed, 62 insertions(+) New commits: commit c586383617e7b9f2a0e24db8aaf1e1fd560bdbc4 Author: Andras Timar ati...@suse.com Date: Fri Jan 6 19:36:54 2012 +0100 Revert remove vc_redist from scp2 This reverts commit 7a3ef2719eb68d2862354181ca5a906129569a57. Eh, better to stop for now... diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index c5443e9..96bcb5f 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -343,6 +343,7 @@ PARFILES +=\ folder_ooo.par \ folderitem_ooo.par \ registryitem_ooo.par \ +vc_redist.par \ mingw_dlls.par \ windowscustomaction_ooo.par .ENDIF diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp new file mode 100644 index 000..a01f891 --- /dev/null +++ b/scp2/source/ooo/vc_redist.scp @@ -0,0 +1,60 @@ +/* +* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * http://www.openoffice.org/license.html + * for a copy of the LGPLv3 License. + * +/ + +#include macros.inc + +#if defined(WITH_VC_REDIST) + +MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86 +Feature = gm_Root; +Name = Microsoft_VC90_CRT_x86.msm; +RootDir = TARGETDIR; +End + +MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86 +Feature = gm_Root; +Name = policy_9_0_Microsoft_VC90_CRT_x86.msm; +RootDir = TARGETDIR; +End + +#if defined(BUILD_X64) + +MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86_x64 +Feature = gm_Root; +Name = Microsoft_VC90_CRT_x86_x64.msm; +RootDir = TARGETDIR; +End + +MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64 +Feature = gm_Root; +Name = policy_9_0_Microsoft_VC90_CRT_x86_x64.msm; +RootDir = TARGETDIR; +End + +#endif + +#endif diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 42e026d..9af2c3a 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -148,6 +148,7 @@ SCP1FILES += \ folder_ooo.par\ folderitem_ooo.par\ windowscustomaction_ooo.par \ + vc_redist.par \ mingw_dlls.par\ registryitem_writer.par \ folderitem_writer.par \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/ure.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f31656f18ac39db28aa047a43338457f09804915 Author: Jan Holesovsky ke...@suse.cz Date: Thu Dec 22 14:40:01 2011 +0100 The packaging was missing uno_cppuhelpergcc33.dll on MinGW. diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 09d27aa..58d8ec0 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -192,7 +192,7 @@ File gid_File_Dl_Cppuhelper LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; #if defined WNT !defined _MSC // Hack for not gbuild'ified cppuhelper on MinGW: -Name = uno_cppuhelpergcc33.dll +Name = uno_cppuhelpergcc33.dll; #else Name = SCP2_URE_DL_UNO_COMID_VER(cppuhelper, 3); #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/gnome/module_gnome.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bacf1f9d7be4030b292e4f586654907601b9e4ed Author: Rene Engelhard r...@debian.org Date: Tue Dec 20 05:39:09 2011 +0100 evoab is gid_File_Lib_Evoab since long(er), not gid_File_Lib_Evoab_2 diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 8b84916..88a2926 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -41,7 +41,7 @@ Module gid_Module_Optional_Gnome XpdCheckSolaris = SUNWgnome-vfs; #endif Files = ( - gid_File_Lib_Evoab_2, + gid_File_Lib_Evoab, gid_File_Lib_Fps_Gnome, gid_File_Lib_Vclplug_Gtk, #ifdef ENABLE_GTK3 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/graphicfilter/module_graphicfilter.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 90e94d06bc6123687bcf47eaf4e03959491adef2 Author: Rene Engelhard r...@debian.org Date: Fri Dec 16 17:51:33 2011 +0100 actually add gid_File_Lib_VisioImport to gid_Module_Optional_Grfflt diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index 5b6dffb..984b247 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -34,5 +34,5 @@ Module gid_Module_Optional_Grfflt ParentID = gid_Module_Optional; Default = YES; Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport, -gid_File_Share_Registry_Graphicfilter_Xcd); +gid_File_Lib_VisioImport, gid_File_Share_Registry_Graphicfilter_Xcd); End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/ure.scp |4 1 file changed, 4 insertions(+) New commits: commit 35c6f50eab69968fb02512fe0e89800f52702efd Author: Stephan Bergmann sberg...@redhat.com Date: Thu Dec 15 15:08:33 2011 +0100 Potential fix for gbuild salhelper on MinGW problem. diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index aece726..18df366 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -252,7 +252,11 @@ End File gid_File_Dl_Salhelper LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; +#if defined WNT !defined _MSC // Hack for gbuild'ified salhelper on MinGW: +Name = uno_salhelpergcc3.dll +#else Name = SCP2_URE_DL_UNO_COMID_VER(salhelper, 3); +#endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = 879B80E0-F6E1-4931-8EE6-7CF867CB6AA5; End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/module_ooo.ulf |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit fd5ffcf656216c00fd0149a844c9da5c73813835 Author: Andras Timar ati...@suse.com Date: Tue Dec 13 15:19:31 2011 +0100 add grammar checker to descriptions diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf index e357244..8d0ddf6 100644 --- a/scp2/source/ooo/module_ooo.ulf +++ b/scp2/source/ooo/module_ooo.ulf @@ -119,7 +119,7 @@ en-US = German (Austria, Germany, Switzerland) spelling dictionaries, hyphenati en-US = English [STR_DESC_MODULE_EXTENSION_DICTIONARY_EN] -en-US = English (Australia, Canada, South Africa, UK, USA) spelling dictionaries, hyphenation rules, and thesaurus +en-US = English spelling dictionaries, hyphenation rules, thesaurus, and grammar checker [STR_NAME_MODULE_EXTENSION_DICTIONARY_EL] en-US = Greek @@ -179,7 +179,7 @@ en-US = Hindi spelling dictionary en-US = Hungarian [STR_DESC_MODULE_EXTENSION_DICTIONARY_HU] -en-US = Hungarian spelling dictionary, hyphenation rules, and thesaurus +en-US = Hungarian spelling dictionary, hyphenation rules, thesaurus, and grammar checker [STR_NAME_MODULE_EXTENSION_DICTIONARY_HR] en-US = Croatian ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source setup_native/source
scp2/source/ooo/common_brand.scp|5 + scp2/source/ooo/file_ooo.scp|9 + scp2/source/ooo/module_ooo.scp | 13 - scp2/source/ooo/module_ooo.ulf |6 ++ setup_native/source/packinfo/packinfo_office.txt| 16 setup_native/source/packinfo/spellchecker_selection.txt |2 +- 6 files changed, 49 insertions(+), 2 deletions(-) New commits: commit 9cb0e7af9d5d123a6e0cb933fb43d0f53ab4b904 Author: Andras Timar ati...@suse.com Date: Thu Dec 8 13:33:17 2011 +0100 add Aragonese spelling dictionary diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 203f148..cf0a577 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -197,6 +197,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Af DosName = dict-af; End +Directory gid_Brand_Dir_Share_Extensions_Dict_An +ParentID = gid_Brand_Dir_Share_Extensions; +DosName = dict-an; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Ar ParentID = gid_Brand_Dir_Share_Extensions; DosName = dict-ar; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index b4630a6..b87b7fa 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1313,6 +1313,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_An + Dir = gid_Brand_Dir_Share_Extensions_Dict_An; + Name = dict-an.oxt; + Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Ar Dir = gid_Brand_Dir_Share_Extensions_Dict_Ar; Name = dict-ar.oxt; diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index 473a026..5b76205 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -60,13 +60,24 @@ Module gid_Module_Root_Extension_Dictionary_Af MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AF ); Files = (gid_File_Extension_Dictionary_Af); InstallOrder = 2000; -Sortkey = 510; +Sortkey = 500; Spellcheckerlanguage = af; PackageInfo = packinfo_office.txt; ParentID = gid_Module_Dictionaries; Styles = (); End +Module gid_Module_Root_Extension_Dictionary_An +MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AN ); +Files = (gid_File_Extension_Dictionary_An); +InstallOrder = 2000; +Sortkey = 510; +Spellcheckerlanguage = an; +PackageInfo = packinfo_office.txt; +ParentID = gid_Module_Dictionaries; +Styles = (); +End + Module gid_Module_Root_Extension_Dictionary_Ar MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AR ); Files = (gid_File_Extension_Dictionary_Ar); diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf index 4573c89..7fbb685 100644 --- a/scp2/source/ooo/module_ooo.ulf +++ b/scp2/source/ooo/module_ooo.ulf @@ -55,6 +55,12 @@ en-US = Afrikaans [STR_DESC_MODULE_EXTENSION_DICTIONARY_AF] en-US = Afrikaans spelling dictionary, and hyphenation rules +[STR_NAME_MODULE_EXTENSION_DICTIONARY_AN] +en-US = Aragonese + +[STR_DESC_MODULE_EXTENSION_DICTIONARY_AN] +en-US = Aragonese spelling dictionary + [STR_NAME_MODULE_EXTENSION_DICTIONARY_AR] en-US = Arabic diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index 10b23b4..f7166f1 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -462,6 +462,22 @@ packageversion = %PACKAGEVERSION End Start +module = gid_Module_Root_Extension_Dictionary_An +script = shellscripts_extensions.txt +solarispackagename = %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-an +solarisrequires = %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION +packagename = %UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-an +requires = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION +linuxpatchrequires = +copyright = 2011 Santiago Paricio, Juan Pablo Martinez +solariscopyright = solariscopyrightfile +vendor = The Document
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/file_ooo.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cfde907284666e34e9048925ca8c68bb06077127 Author: Michael Stahl mst...@redhat.com Date: Tue Dec 6 15:56:56 2011 +0100 scp2: evidently fax.zip was renamed to pyfax.zip diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 3f63f49..b4630a6 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -478,7 +478,7 @@ End File gid_File_Wizards_Fax Dir = gid_Dir_Wizards_Fax; ARCHIVE_TXT_FILE_BODY; -Name = fax.zip; +Name = pyfax.zip; End #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/file_library_ooo.scp |2 -- scp2/source/ooo/file_resource_ooo.scp |1 - 2 files changed, 3 deletions(-) New commits: commit 8d9216f289deb14d140a13dbf570b99819d4f8bc Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Dec 6 16:42:48 2011 +0100 Unbreak the packaging diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 8169eef..ef75e8c 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1182,8 +1182,6 @@ STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx) SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1) -STD_LIB_FILE( gid_File_Lib_Sts , sts) - STD_LIB_FILE( gid_File_Lib_Svl, svl ) STD_LIB_FILE( gid_File_Lib_Svtools, svt ) diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index 40aaa6f..6a23a9f 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -82,7 +82,6 @@ STD_RES_FILE( gid_File_Res_Spa, spa ) #endif -STD_RES_FILE( gid_File_Res_Stt, stt ) STD_RES_FILE( gid_File_Res_Sb, sb ) STD_RES_FILE( gid_File_Res_Svl, svl ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/smoketest/smoketest.scp | 13 + 1 file changed, 13 insertions(+) New commits: commit ccad45fef484065ae303825a179326542f01b063 Author: Petr Mladek pmla...@suse.cz Date: Fri Dec 2 17:09:03 2011 +0100 define missing directories for smoketest on MAC note that the smoketest is not packaged for MAC at this stage diff --git a/scp2/source/smoketest/smoketest.scp b/scp2/source/smoketest/smoketest.scp index aaed44f..9465b87 100644 --- a/scp2/source/smoketest/smoketest.scp +++ b/scp2/source/smoketest/smoketest.scp @@ -55,6 +55,19 @@ Directory gid_Test_Dir_Brand_Root #endif Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE); End + +Directory gid_Test_Dir_Bundle +ParentID = PD_PROGDIR; +HostName = %PRODUCTNAME.app; +LangPackHostName = %PRODUCTNAME Language Pack.app; +PatchHostName = %PRODUCTNAME Patch.app; +End + +Directory gid_Test_Dir_Bundle_Contents +ParentID = gid_Test_Dir_Bundle; +HostName = Contents; +Styles = (OFFICEDIRECTORY); +End #endif Directory gid_Test_Brand_Dir_Program ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/smoketest/smoketest.scp |2 ++ 1 file changed, 2 insertions(+) New commits: commit a28635374613e556a0093c242823ea90a3704f74 Author: Petr Mladek pmla...@suse.cz Date: Fri Dec 2 21:26:53 2011 +0100 another attempt to define test dirs on MAC sigh, it is hard to fix build on MAC without MAC diff --git a/scp2/source/smoketest/smoketest.scp b/scp2/source/smoketest/smoketest.scp index 9465b87..5105681 100644 --- a/scp2/source/smoketest/smoketest.scp +++ b/scp2/source/smoketest/smoketest.scp @@ -55,7 +55,9 @@ Directory gid_Test_Dir_Brand_Root #endif Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE); End +#endif +#if MACOSX Directory gid_Test_Dir_Bundle ParentID = PD_PROGDIR; HostName = %PRODUCTNAME.app; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/smoketest/smoketest.scp |4 1 file changed, 4 insertions(+) New commits: commit d0f4bb87900c9a7cb59bba1660566e4a68d505a0 Author: Andras Timar ati...@suse.com Date: Thu Dec 1 23:45:26 2011 +0100 fix gid_Test_Dir_Common_Ure parent for MAC OS diff --git a/scp2/source/smoketest/smoketest.scp b/scp2/source/smoketest/smoketest.scp index dc4f6d3..aaed44f 100644 --- a/scp2/source/smoketest/smoketest.scp +++ b/scp2/source/smoketest/smoketest.scp @@ -82,7 +82,11 @@ Directory gid_Test_Brand_Dir_Share_Test End Directory gid_Test_Dir_Common_Ure +#if defined MACOSX +ParentID = gid_Test_Dir_Bundle_Contents; +#else ParentID = gid_Test_Dir_Brand_Root; +#endif HostName = ure; Styles = (UREDIRECTORY); End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/extensions/module_extensions_sun_templates.ulf | 630 - 1 file changed, 630 deletions(-) New commits: commit 05a29e5a642ca53a21532a3c25ab79db7b40b49c Author: Lior Kaplan kaplanl...@gmail.com Date: Sat Nov 26 23:08:50 2011 +0200 Clean languages not defined on sun_supported_langs variable in configure.in diff --git a/scp2/source/extensions/module_extensions_sun_templates.ulf b/scp2/source/extensions/module_extensions_sun_templates.ulf index e54f8ba..3ee830e 100644 --- a/scp2/source/extensions/module_extensions_sun_templates.ulf +++ b/scp2/source/extensions/module_extensions_sun_templates.ulf @@ -58,638 +58,8 @@ en-US = Spanish [STR_DESC_MODULE_LANGPACK_ES] en-US = Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION -[STR_NAME_MODULE_LANGPACK_SV] -en-US = Swedish - -[STR_DESC_MODULE_LANGPACK_SV] -en-US = Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_PT] -en-US = Portuguese - -[STR_DESC_MODULE_LANGPACK_PT] -en-US = Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_PT_BR] -en-US = Portuguese (Brazil) - -[STR_DESC_MODULE_LANGPACK_PT_BR] -en-US = Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_JA] -en-US = Japanese - -[STR_DESC_MODULE_LANGPACK_JA] -en-US = Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_KO] -en-US = Korean - -[STR_DESC_MODULE_LANGPACK_KO] -en-US = Installs Korean support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_ZH_CN] -en-US = Chinese (simplified) - -[STR_DESC_MODULE_LANGPACK_ZH_CN] -en-US = Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_ZH_TW] -en-US = Chinese (traditional) - -[STR_DESC_MODULE_LANGPACK_ZH_TW] -en-US = Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_NL] -en-US = Dutch - -[STR_DESC_MODULE_LANGPACK_NL] -en-US = Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION - [STR_NAME_MODULE_LANGPACK_HU] en-US = Hungarian [STR_DESC_MODULE_LANGPACK_HU] en-US = Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_PL] -en-US = Polish - -[STR_DESC_MODULE_LANGPACK_PL] -en-US = Installs Polish support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_RU] -en-US = Russian - -[STR_DESC_MODULE_LANGPACK_RU] -en-US = Installs Russian support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_TR] -en-US = Turkish - -[STR_DESC_MODULE_LANGPACK_TR] -en-US = Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_EL] -en-US = Greek - -[STR_DESC_MODULE_LANGPACK_EL] -en-US = Installs Greek support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_TH] -en-US = Thai - -[STR_DESC_MODULE_LANGPACK_TH] -en-US = Installs Thai support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_CS] -en-US = Czech - -[STR_DESC_MODULE_LANGPACK_CS] -en-US = Installs Czech support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_SK] -en-US = Slovak - -[STR_DESC_MODULE_LANGPACK_SK] -en-US = Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_HR] -en-US = Croatian - -[STR_DESC_MODULE_LANGPACK_HR] -en-US = Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_ET] -en-US = Estonian - -[STR_DESC_MODULE_LANGPACK_ET] -en-US = Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_VI] -en-US = Vietnamese - -[STR_DESC_MODULE_LANGPACK_VI] -en-US = Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_BG] -en-US = Bulgarian - -[STR_DESC_MODULE_LANGPACK_BG] -en-US = Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_KM] -en-US = Khmer - -[STR_DESC_MODULE_LANGPACK_KM] -en-US = Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_PA_IN] -en-US = Punjabi - -[STR_DESC_MODULE_LANGPACK_PA_IN] -en-US = Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_GU_IN] -en-US = Gujarati - -[STR_DESC_MODULE_LANGPACK_GU_IN] -en-US = Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_TA] -en-US = Tamil - -[STR_DESC_MODULE_LANGPACK_TA] -en-US = Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_TA_IN] -en-US = Tamil - -[STR_DESC_MODULE_LANGPACK_TA_IN] -en-US = Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_HI] -en-US = Hindi - -[STR_DESC_MODULE_LANGPACK_HI] -en-US = Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_HI_IN] -en-US = Hindi - -[STR_DESC_MODULE_LANGPACK_HI_IN] -en-US = Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION - -[STR_NAME_MODULE_LANGPACK_ST] -en-US = Southern Sotho (Sutu) - -[STR_DESC_MODULE_LANGPACK_ST] -en-US =
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/module_ooo.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1221e6a9e44f080b8e5fc5d3fdf3a708b6e382ab Author: Petr Mladek pmla...@suse.cz Date: Fri Nov 25 17:55:04 2011 +0100 correctly install Latvian dictionary the typo caused that the Latvian dictionary was included into core01 package and broke langpacks diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index 196c1c2..8afa37d 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -300,7 +300,7 @@ End Module gid_Module_Root_Extension_Dictionary_Lv MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LV ); -Files = (gid_File_Extension_Dictionary_Lt); +Files = (gid_File_Extension_Dictionary_Lv); InstallOrder = 2000; Sortkey = 635; Spellcheckerlanguage = lv; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source setup_native/source
scp2/source/ooo/common_brand.scp| 20 + scp2/source/ooo/file_ooo.scp| 36 + scp2/source/ooo/module_ooo.scp | 48 +++- scp2/source/ooo/module_ooo.ulf | 24 ++ setup_native/source/packinfo/packinfo_office.txt| 64 setup_native/source/packinfo/spellchecker_selection.txt |4 + 6 files changed, 194 insertions(+), 2 deletions(-) New commits: commit 2e366cbdedd542e2324684f4b8b2517dbfcd7f59 Author: Andras Timar ati...@suse.com Date: Fri Nov 25 23:24:18 2011 +0100 add Belarusian, Greek, Scottish Gaelic, and Telugu dictionaries diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 791eb6d..203f148 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -202,6 +202,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Ar DosName = dict-ar; End +Directory gid_Brand_Dir_Share_Extensions_Dict_Be +ParentID = gid_Brand_Dir_Share_Extensions; +DosName = dict-be; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Bg ParentID = gid_Brand_Dir_Share_Extensions; DosName = dict-bg; @@ -242,6 +247,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_En DosName = dict-en; End +Directory gid_Brand_Dir_Share_Extensions_Dict_El +ParentID = gid_Brand_Dir_Share_Extensions; +DosName = dict-el; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Es ParentID = gid_Brand_Dir_Share_Extensions; DosName = dict-es; @@ -257,6 +267,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Fr DosName = dict-fr; End +Directory gid_Brand_Dir_Share_Extensions_Dict_Gd +ParentID = gid_Brand_Dir_Share_Extensions; +DosName = dict-gd; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Gl ParentID = gid_Brand_Dir_Share_Extensions; DosName = dict-gl; @@ -377,6 +392,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Sw DosName = dict-sw; End +Directory gid_Brand_Dir_Share_Extensions_Dict_Te +ParentID = gid_Brand_Dir_Share_Extensions; +DosName = dict-te; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Th ParentID = gid_Brand_Dir_Share_Extensions; DosName = dict-th; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index b53c69d..adce11d 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1304,6 +1304,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Be + Dir = gid_Brand_Dir_Share_Extensions_Dict_Be; + Name = dict-be.oxt; + Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Bg Dir = gid_Brand_Dir_Share_Extensions_Dict_Bg; Name = dict-bg.oxt; @@ -1376,6 +1385,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_El + Dir = gid_Brand_Dir_Share_Extensions_Dict_El; + Name = dict-el.oxt; + Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Es Dir = gid_Brand_Dir_Share_Extensions_Dict_Es; Name = dict-es.oxt; @@ -1403,6 +1421,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Gd + Dir = gid_Brand_Dir_Share_Extensions_Dict_Gd; + Name = dict-gd.oxt; + Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Gl Dir = gid_Brand_Dir_Share_Extensions_Dict_Gl; Name = dict-gl.oxt; @@ -1619,6 +1646,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Te + Dir = gid_Brand_Dir_Share_Extensions_Dict_Te; + Name = dict-te.oxt; + Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Th Dir = gid_Brand_Dir_Share_Extensions_Dict_Th; Name = dict-th.oxt; diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index 8afa37d..473a026 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -78,11 +78,22 @@ Module gid_Module_Root_Extension_Dictionary_Ar Styles = (); End +Module gid_Module_Root_Extension_Dictionary_Be +MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BE ); +Files = (gid_File_Extension_Dictionary_Be); +InstallOrder = 2000; +Sortkey = 512; +Spellcheckerlanguage = be; +PackageInfo = packinfo_office.txt; +ParentID = gid_Module_Dictionaries; +Styles = (); +End + Module gid_Module_Root_Extension_Dictionary_Bg MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BG ); Files = (gid_File_Extension_Dictionary_Bg); InstallOrder =
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/folderitem_ooo.scp |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 43353984e883d932e8fdaf3a25cc3d9bfc839dd0 Author: Andras Timar ati...@suse.com Date: Thu Nov 24 18:43:11 2011 +0100 Desktop launcher w/o version number for silent MSI version diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp index 7381735..e1a25e9 100644 --- a/scp2/source/ooo/folderitem_ooo.scp +++ b/scp2/source/ooo/folderitem_ooo.scp @@ -45,7 +45,11 @@ FolderItem gid_Folderitem_Soffice End FolderItem gid_Folderitem_Soffice_Desktop +#ifdef ENABLE_SILENT_MSI +Name = %PRODUCTNAME; +#else Name = %PRODUCTNAME %PRODUCTVERSION; +#endif ModuleID = gid_Module_Root; FolderID = PREDEFINED_DESKTOP; FileID = gid_Brand_File_Bin_Soffice; @@ -54,7 +58,7 @@ FolderItem gid_Folderitem_Soffice_Desktop ComponentIDFile = gid_Brand_File_Desktophelper_Txt; WkDir = gid_Brand_Dir_Program; Parameter = ; - Styles = (NOWEB,NON_ADVERTISED,USE_HELPER_FILENAME); +Styles = (NOWEB,NON_ADVERTISED,USE_HELPER_FILENAME); ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE); ComponentCondition = CREATEDESKTOPLINK=1; End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/common_brand.scp |6 ++ 1 file changed, 6 insertions(+) New commits: commit 92181d3e510fb0ef09d5688cc0eade4ad2743f76 Author: Andras Timar ati...@suse.com Date: Wed Nov 23 13:40:17 2011 +0100 create this dir so uninstall can remove it diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 7630602..791eb6d 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -414,6 +414,12 @@ Directory gid_Brand_Dir_Share_Uno_Packages_Cache Styles = (CREATE); End +Directory gid_Brand_Dir_Share_Uno_Packages_Cache_Uno_Packages +ParentID = gid_Brand_Dir_Share_Uno_Packages_Cache; +DosName = uno_packages; +Styles = (CREATE); +End + Directory gid_Brand_Dir_Share_Registry ParentID = gid_Brand_Dir_Share; DosName = registry; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source solenv/bin
scp2/source/ooo/folderitem_ooo.scp |4
solenv/bin/modules/installer/windows/shortcut.pm |2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit d9f7b43af4db6352239dd706d8920e02114b0510
Author: Andras Timar ati...@suse.com
Date: Mon Nov 21 22:18:20 2011 +0100
if silent MSI, put LibreOffice starter icon to Program menu folder
diff --git a/scp2/source/ooo/folderitem_ooo.scp
b/scp2/source/ooo/folderitem_ooo.scp
index 3c41948..7381735 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -30,7 +30,11 @@
FolderItem gid_Folderitem_Soffice
Name = %PRODUCTNAME;
ModuleID = gid_Module_Root;
+#ifdef ENABLE_SILENT_MSI
+FolderID = PREDEFINED_STARTMENU;
+#else
FolderID = gid_Folder_Staroffice51;
+#endif
FileID = gid_Brand_File_Bin_Soffice;
IconFile = gid_Brand_File_Bin_Soffice;
IconID = 0;
diff --git a/solenv/bin/modules/installer/windows/shortcut.pm
b/solenv/bin/modules/installer/windows/shortcut.pm
index cb62a0a..6c73f77 100644
--- a/solenv/bin/modules/installer/windows/shortcut.pm
+++ b/solenv/bin/modules/installer/windows/shortcut.pm
@@ -375,7 +375,7 @@ sub get_folderitem_directory
if ( $shortcut-{'FolderID'} eq PREDEFINED_STARTMENU )
{
-$directory = $installer::globals::startmenufolder;
+$directory = $installer::globals::programmenufolder;
}
# saving the directory in the folderitems collector
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/python/module_python.ulf |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b338e513f77d469f9ba252220db164cf3cb5bcea Author: Andras Timar ati...@suse.com Date: Sat Nov 19 22:42:24 2011 +0100 change URL pointing to openoffice.org domain - fdo#39734 diff --git a/scp2/source/python/module_python.ulf b/scp2/source/python/module_python.ulf index 2303dcd..400c25e 100644 --- a/scp2/source/python/module_python.ulf +++ b/scp2/source/python/module_python.ulf @@ -29,4 +29,4 @@ en-US = Python-UNO Bridge [STR_DESC_MODULE_OPTIONAL_PYTHON] -en-US = Adds the ability to automate %PRODUCTNAME with the python scripting language. See http://udk.openoffice.org/python/python-bridge.html for a complete documentation. +en-US = Adds the ability to automate %PRODUCTNAME with the Python scripting language. See https://wiki.documentfoundation.org/Development/PyUno for a complete documentation. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/accessories/module_accessories.scp |3 +++ 1 file changed, 3 insertions(+) New commits: commit bd3ad390fe76cf0594165233a8304a8f7c96ca77 Author: Andras Timar ati...@suse.com Date: Tue Nov 15 12:02:12 2011 +0100 don't list Accessories category when it is empty fdo#37135 diff --git a/scp2/source/accessories/module_accessories.scp b/scp2/source/accessories/module_accessories.scp index ded4717..ef5d390 100644 --- a/scp2/source/accessories/module_accessories.scp +++ b/scp2/source/accessories/module_accessories.scp @@ -28,6 +28,8 @@ #include macros.inc +#if defined(WITH_EXTRA_FONT) || defined(WITH_EXTRA_GALLERY) || defined(WITH_EXTRA_SAMPLE) || defined(WITH_EXTRA_TEMPLATE) + Module gid_Module_Optional_Accessories ParentID = gid_Module_Optional; Files = ( @@ -38,3 +40,4 @@ Module gid_Module_Optional_Accessories MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES); End +#endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/ure.scp | 57
1 file changed, 57 deletions(-)
New commits:
commit de56b0f22d774bb44419560376ba8029bb4cc661
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 9 14:46:30 2011 +0100
Removed unused URE version ini file.
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 6b30619..50298ab 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -1165,63 +1165,6 @@ Module gid_Module_Root_Ure_Hidden
gid_Unixlink_File_Dl_Libxml2);
End
-// Profile version.ini
-
-Profile gid_Profile_Version_Ini_Ure
-ModuleID = gid_Module_Root_Ure_Hidden;
-Name = PROFILENAME(version);
-Dir = gid_Dir_Ure_Bin;
-Styles = ();
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Buildid
-ProfileID = gid_Profile_Version_Ini_Ure;
-ModuleID = gid_Module_Root_Ure_Hidden;
-Section = Version;
-Key = buildid;
-Value = buildid;
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Productsource
-ProfileID = gid_Profile_Version_Ini_Ure;
-ModuleID = gid_Module_Root_Ure_Hidden;
-Section = Version;
-Key = ProductSource;
-Value = sourceid;
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Productmajor
-ProfileID = gid_Profile_Version_Ini_Ure;
-ModuleID = gid_Module_Root_Ure_Hidden;
-Section = Version;
-Key = ProductMajor;
-Value = productmajor;
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Productminor
-ProfileID = gid_Profile_Version_Ini_Ure;
-ModuleID = gid_Module_Root_Ure_Hidden;
-Section = Version;
-Key = ProductMinor;
-Value = productminor;
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Productbuildid
-ProfileID = gid_Profile_Version_Ini_Ure;
-ModuleID = gid_Module_Root_Ure_Hidden;
-Section = Version;
-Key = ProductBuildid;
-Value = productbuildid;
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Ooobaseversion
-ProfileID = gid_Profile_Version_Ini_Ure;
-ModuleID = gid_Module_Root_Ure_Hidden;
-Section = Version;
-Key = OOOBaseVersion;
-Value = ${OOOBASEVERSION};
-End
-
// Windows Registry:
RegistryItem gid_Regitem_Path
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source setup_native/prj setup_native/source solenv/bin
scp2/source/ooo/scpaction_ooo.scp |1 +
setup_native/prj/d.lst |1 +
setup_native/source/mac/ooo/DS_Store_Dev|binary
solenv/bin/make_installer.pl|1 +
solenv/bin/modules/installer/scriptitems.pm | 15 +++
5 files changed, 18 insertions(+)
New commits:
commit dab79744767c05fd5268866937e225b74e658cea
Author: Thorsten Behrens tbehr...@suse.com
Date: Thu Nov 3 18:57:23 2011 +0100
Give Mac master builds a nice background .dmg image, too
Added a new DevVersionCopy action to scp2, that fires if PRODUCTNAME
equals LibO-dev - in that case, we use the DS_Store_Dev one.
diff --git a/scp2/source/ooo/scpaction_ooo.scp
b/scp2/source/ooo/scpaction_ooo.scp
index dba0ce7..8dccba2 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -291,6 +291,7 @@ End
ScpAction scp_Copy_Ds_Store
Copy = DS_Store;
+DevVersionCopy = DS_Store_Dev;
LangPackCopy = DS_Store_Langpack;
PatchCopy = DS_Store_Patch;
Name = .DS_Store;
diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst
index 71290f1..6e8cae9 100644
--- a/setup_native/prj/d.lst
+++ b/setup_native/prj/d.lst
@@ -31,6 +31,7 @@ mkdir: %_DEST%\bin\osolsmf
..\source\mac\Info.plist.langpack %_DEST%\bin\Info.plist.langpack
..\source\mac\ooo\osxdndinstall.png %_DEST%\bin\osl\osxdndinstall.png
..\source\mac\ooo\DS_Store %_DEST%\bin\osl\DS_Store
+..\source\mac\ooo\DS_Store_Dev %_DEST%\bin\osl\DS_Store_Dev
..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin\osl\DS_Store_Langpack
..\source\java\javaversion.dat %_DEST%\bin\javaversion.dat
..\source\java\javaversion2.dat %_DEST%\bin\javaversion2.dat
diff --git a/setup_native/source/mac/ooo/DS_Store_Dev
b/setup_native/source/mac/ooo/DS_Store_Dev
new file mode 100644
index 000..2a6fcf9
Binary files /dev/null and b/setup_native/source/mac/ooo/DS_Store_Dev differ
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 10dac77..3fa31f5 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -487,6 +487,7 @@ if (( ! $allvariableshashref-{'XPDINSTALLER'} ) || ( !
$installer::globals::isx
if ( $installer::globals::languagepack ) {
installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref);
}
if ( $installer::globals::helppack ) {
installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref);
}
+if ( $allvariables-{'PRODUCTNAME'} eq LibO-dev ) {
installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref);
}
if ( $installer::globals::patch ) {
installer::scriptitems::use_patch_copy_scpaction($scpactionsinproductarrayref);
}
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir . productscpactions1b.log,
$scpactionsinproductarrayref); }
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index 9189b10..96bdec9 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -620,6 +620,21 @@ sub use_langpack_copy_scpaction
}
+# Using different HostName for dev builds
+
+
+sub use_devversion_copy_scpaction
+{
+my ($scpactionsref) = @_;
+
+for ( my $i = 0; $i = $#{$scpactionsref}; $i++ )
+{
+my $onescpaction = ${$scpactionsref}[$i];
+if (( $onescpaction-{'DevVersionCopy'} ) (
$onescpaction-{'DevVersionCopy'} ne )) { $onescpaction-{'Copy'} =
$onescpaction-{'DevVersionCopy'}; }
+}
+}
+
+
# Using different HostName for language packs
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source solenv/bin
scp2/source/python/module_python.scp | 21 +
solenv/bin/make_installer.pl |3 ++-
2 files changed, 23 insertions(+), 1 deletion(-)
New commits:
commit 055995086474821207313bacabe50bd9b9d7774c
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 1 11:14:16 2011 +0100
Made ooinstall more deterministic, fixed Mac OS X Python module
dependencies.
diff --git a/scp2/source/python/module_python.scp
b/scp2/source/python/module_python.scp
index d80bc16..32f0dc8 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -34,7 +34,28 @@ Module gid_Module_Optional_Pyuno
MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
ParentID = gid_Module_Optional;
Sortkey = 750;
+Dirs = (gid_Dir_PythonFramework,
+gid_Dir_PythonFramework_Versions,
+gid_Dir_PythonFramework_Versions_ver,
+gid_Dir_PythonFramework_Versions_ver_bin,
+gid_Dir_PythonFramework_Versions_ver_lib,
+gid_Dir_PythonFramework_Versions_ver_lib_pythonver,
+gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config);
Files =
(gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
+Unixlinks = (gid_Unixlink_Python_Headers,
+ gid_Unixlink_Python_Resources,
+ gid_Unixlink_Python_Versions_Current,
+ gid_Unixlink_Python_Versions_ver_Headers,
+ gid_Unixlink_Python_OOoPython,
+ gid_Unixlink_Python_bin_idle,
+ gid_Unixlink_Python_bin_pydoc,
+ gid_Unixlink_Python_bin_python_real,
+ gid_Unixlink_Python_bin_python,
+ gid_Unixlink_Python_bin_pythonconfig,
+ gid_Unixlink_Python_bin_pythonw_real,
+ gid_Unixlink_Python_bin_pythonw,
+ gid_Unixlink_Python_bin_smtpdpy,
+ gid_Unixlink_Python_libpython);
Minimal = NO;
Default = YES;
Styles = ( );
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index fd1df27..10dac77 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1309,7 +1309,8 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
my $found_epm = 0;
# shuffle array to reduce parallel packaging process in pool
-installer::worker::shuffle_array($packages);
+installer::worker::shuffle_array($packages)
+unless $installer::globals::simple;
# iterating over all packages
for ( my $k = 0; $k = $#{$packages}; $k++ )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/common_brand.scp | 24
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 1635f66a3dd35c5bf34143956940ec44fda751c2
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Oct 31 23:47:02 2011 +0100
Moved CONFIGURATION_LAYERS from soffice to fundamental ini.
...so that unopkg uses it, too.
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index d9baffa..9b75f36 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -927,18 +927,6 @@ ProfileItem gid_Brand_Profileitem_Soffice_Startlang
End
#endif
-ProfileItem gid_Brand_Profileitem_Soffice_ConfigurationLayers
-ProfileID = gid_Brand_Profile_Soffice_Ini;
-ModuleID = gid_Module_Root_Brand;
-Section = Bootstrap;
-Key = CONFIGURATION_LAYERS;
-Value = xcsxcu:${BRAND_BASE_DIR}/share/registry
module:${BRAND_BASE_DIR}/share/registry/modules
res:${BRAND_BASE_DIR}/share/registry bundledext:${${BRAND_BASE_DIR}/program/
PROFILENAME(uno)
:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
sharedext:${${BRAND_BASE_DIR}/program/ PROFILENAME(uno)
:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
xcsxcu:${${BRAND_BASE_DIR}/program/ PROFILENAME(uno)
:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry
userext:${${BRAND_BASE_DIR}/program/ PROFILENAME(uno)
:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
user:${$BRAND_BASE_DIR/program/ PROFILENAME(bootstrap)
:UserInstallation}/user/registrymodifications.xcu;
-// xcsxcu:${${BRAND_BASE_DIR}/program/PROFILENAME(uno)
-// :UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.
-// configuration.PackageRegistryBackend/registry can be dropped once
-// old UserInstallation format can no longer exist (probably OOo 4)
-End
-
ProfileItem gid_Brand_Profileitem_Version_Buildid
ProfileID = gid_Brand_Profile_Version_Ini;
ModuleID = gid_Module_Root_Brand;
@@ -1256,6 +1244,18 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Lib_Dir
#endif
End
+ProfileItem gid_Brand_Profileitem_Fundamental_Configuration_Layers
+ProfileID = gid_Brand_Profile_Fundamental_Ini;
+ModuleID = gid_Module_Root_Brand;
+Section = Bootstrap;
+Key = CONFIGURATION_LAYERS;
+Value = xcsxcu:${BRAND_BASE_DIR}/share/registry
module:${BRAND_BASE_DIR}/share/registry/modules
res:${BRAND_BASE_DIR}/share/registry bundledext:${${BRAND_BASE_DIR}/program/
PROFILENAME(uno)
:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
sharedext:${${BRAND_BASE_DIR}/program/ PROFILENAME(uno)
:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
xcsxcu:${${BRAND_BASE_DIR}/program/ PROFILENAME(uno)
:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry
userext:${${BRAND_BASE_DIR}/program/ PROFILENAME(uno)
:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
user:${$BRAND_BASE_DIR/program/ PROFILENAME(bootstrap)
:UserInstallation}/user/registrymodifications.xcu;
+// xcsxcu:${${BRAND_BASE_DIR}/program/PROFILENAME(uno)
+// :UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.
+// configuration.PackageRegistryBackend/registry can be dropped once
+// old UserInstallation format can no longer exist (probably OOo 4)
+End
+
#if !defined MACOSX
ProfileItem gid_Brand_Profileitem_Redirect_Ure_Bootstrap
ModuleID = gid_Module_Root_Brand;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/file_font_ooo.scp |6 -- 1 file changed, 6 deletions(-) New commits: commit 06e64daff148d5a94913bfe88b0c454fb2bfb0d6 Author: Olivier Hallot olivier.hal...@alta.org.br Date: Thu Oct 27 11:27:27 2011 -0200 Remove restriction for Liberation fonts in Windows build diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index 55e1f0f..fef7b3b 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -91,33 +91,27 @@ STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_BoldItalic, LiberationSansNarrow-BoldI // Liberation Mono #ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular) STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono Bold) STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono Italic) STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic) #endif -#endif // Liberation Sans #ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular) STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic) STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif Bold) STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic) #endif -#endif // Liberation Serif #ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif Regular) STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold) STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif Italic) STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic) #endif -#endif // Gentium fonts ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/directory_ooo.scp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1af9425e8239d1f7e3a12bf9979d190904f695cd
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Oct 21 09:51:13 2011 +0200
Work around a problem creating symlinks in ooinstall.
It can happen that the ure-link symlink shall be created while its
parent directory has not yet been created. The logic in the Perl code
is so confusing and beyond fixing, that an easy hack out was to flag
the respective directory as always-CREATE, which kind of works around
the problem.
diff --git a/scp2/source/ooo/directory_ooo.scp
b/scp2/source/ooo/directory_ooo.scp
index 015c1dc..10b32fb 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -92,7 +92,7 @@ Directory gid_Dir_Ooo_Basis
#else
HostName = basis${OOOBASEVERSION};
#endif
-Styles = (BASISDIRECTORY);
+Styles = (BASISDIRECTORY, CREATE);
End
#endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/module_hidden_ooo.scp |1 - 1 file changed, 1 deletion(-) New commits: commit 9e3f639df008ae37044e137d45a94ba2e7019028 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Oct 5 13:07:47 2011 +0200 Don't package this one diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 2d220e3..3ba48ef 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -327,7 +327,6 @@ Module gid_Module_Root_Files_5 #if ! defined SYSTEM_LIBGSF gid_File_Lib_Libgsf, #endif - gid_File_Lib_Cmis, gid_File_Lib_Dict_Ja, gid_File_Lib_Dict_Zh, gid_File_Lib_Collator_Data, ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/file_library_ooo.scp |2 ++ 1 file changed, 2 insertions(+) New commits: commit e944e135bc157d092532fff0829390fa7d4fa958 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Oct 4 14:27:35 2011 +0200 Revert fix invalid superflous #endif from 5bd2890a56125d391b42f34d51e2e0c57b0a80b0 This reverts commit d2f633c5464fd4339e9e804c97596a78bfa58e62. diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index b6b5e2c..03e2f93 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -206,6 +206,8 @@ File gid_File_Lib_Cmis #endif End +#endif + #ifndef SYSTEM_DB File gid_File_Lib_Db ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/file_ooo.scp | 14 -- scp2/source/ooo/module_hidden_ooo.scp |2 -- 2 files changed, 16 deletions(-) New commits: commit 13ce988ac8352679a55390894cab2364353bb03c Author: Caolán McNamara caol...@redhat.com Date: Fri Sep 23 16:34:15 2011 +0100 drop empty .lm files diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 4cf5deb..2fcbfdc 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -510,13 +510,6 @@ File gid_File_Lm_Arabic Styles = (PACKED); End -File gid_File_Lm_Armenian -TXT_FILE_BODY; -Name = armenian.lm; -Dir = gid_Dir_Share_Fingerprint; -Styles = (PACKED); -End - File gid_File_Lm_Basque TXT_FILE_BODY; Name = basque.lm; @@ -587,13 +580,6 @@ File gid_File_Lm_Danish Styles = (PACKED); End -File gid_File_Lm_Drents -TXT_FILE_BODY; -Name = drents.lm; -Dir = gid_Dir_Share_Fingerprint; -Styles = (PACKED); -End - File gid_File_Lm_Dutch TXT_FILE_BODY; Name = dutch.lm; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 273f802..cb1e89a 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -602,7 +602,6 @@ Module gid_Module_Root_Files_6 gid_File_Lm_Albanian, gid_File_Lm_Amharic_Utf, gid_File_Lm_Arabic, -gid_File_Lm_Armenian, gid_File_Lm_Basque, gid_File_Lm_Belarus, gid_File_Lm_Bosnian, @@ -613,7 +612,6 @@ Module gid_Module_Root_Files_6 gid_File_Lm_Croatian, gid_File_Lm_Czech, gid_File_Lm_Danish, -gid_File_Lm_Drents, gid_File_Lm_Dutch, gid_File_Lm_English, gid_File_Lm_Esperanto, ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
