Hello community,
here is the log from the commit of package libreoffice-components for openSUSE:Factory
checked in at Fri Jan 7 12:09:05 CET 2011.
--------
--- libreoffice-components/libreoffice-components.changes 2010-12-01 20:44:39.000000000 +0100
+++ /mounts/work_src_done/STABLE/libreoffice-components/libreoffice-components.changes 2010-12-21 19:55:49.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Dec 21 19:44:02 CET 2010 - pmladek@suse.cz
+
+- updated to libreoffice-3.3.0.2 (3.3-rc2)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libreoffice-components-3.3.0.1.tar.bz2
New:
----
libreoffice-components-3.3.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice-components.spec ++++++
--- /var/tmp/diff_new_pack.m554j0/_old 2011-01-07 11:59:08.000000000 +0100
+++ /var/tmp/diff_new_pack.m554j0/_new 2011-01-07 11:59:08.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package libreoffice-components (Version 3.3.0.1)
+# spec file for package libreoffice-components (Version 3.3.0.2)
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,11 +21,11 @@
Name: libreoffice-components
# allow to use xulrunner191 on SLED11-SP1 (bnc#540726)
%define use_xulrunner191 no
-Version: 3.3.0.1
+Version: 3.3.0.2
Release: 1
%define piece components
-%define ooo_build_version 3.3.0.1
-%define ooo_piece_version 3.3.0.1
+%define ooo_build_version 3.3.0.2
+%define ooo_piece_version 3.3.0.2
%define ooo_sourcedirname libreoffice-build-%ooo_piece_version
%define ooo_prefix %_libdir
%define ooo_home libreoffice
++++++ libreoffice-components-3.3.0.1.tar.bz2 -> libreoffice-components-3.3.0.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.1/ChangeLog new/libreoffice-components-3.3.0.2/ChangeLog
--- old/libreoffice-components-3.3.0.1/ChangeLog 2010-12-01 16:30:41.000000000 +0100
+++ new/libreoffice-components-3.3.0.2/ChangeLog 2010-12-18 20:50:54.000000000 +0100
@@ -1,3 +1,60 @@
+2010-12-18 Petr Mladek [b67926ba6bd659390b18351cf0795198ea7cdfd0]
+
+Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2)
+
+
+2010-12-17 Petr Mladek [5de9a4a1aef05c2510b4d9e966fb56743f6abb98]
+
+fix langpack dependencies after move to helppack
+
+draw, impress langapckages does not lonegr exist; they included
+just help
+
+help package is optional, so there should not be hard dependency
+
+2010-12-16 Fridrich Štrba [62ec5368d43ae47500921b43571ebede8ac0422e]
+
+put helppack packinfo in a separate file
+
+
+2010-12-14 Michael Meeks [70b0313d28bda1b3c594809eba15c7369a2484ec]
+
+Use BrOffice branding on Windows keyed to locale/country-code not exename
+
+
+2010-12-07 Kohei Yoshida [9a14ab77f2437812c48f7c221f18a4f3d2ed8271]
+
+Put the ODMA dialog check box on its own row.
+
+* Put the ODMA dialog check box on its own row, and push everything
+ downward to make some room.
+
+* Remove the Help Formatting controls to make more room. Without this
+ the enable experimental check box would go outside the visible area
+ on Mac.
+
+This fixes fdo#32133.
+
+Signed-off-by: Jan Holesovsky
+
+2010-12-06 Kohei Yoshida [76debb82e9bf4c520febb86f5390052e4b8a545e]
+
+Make the ODMA check box clickable again. (fdo#32132)
+
+
+2010-12-06 Kohei Yoshida [a8fc429c6f0a19d7bf8e7aee2a9614498dd89c95]
+
+Make 'Reset help agent' button clickable again. (fdo#32132)
+
+
+2010-12-01 Kohei Yoshida [117ea10a00ab0dad44c6968ddd5c04e2325d083d]
+
+Fixed the sizes of Tips and Extended tips check boxes.
+
+The Tips check box control was too wide and it was overlapping with
+the Extended tips check box, which prevented it from being clickable.
+(fdo#32028)
+
2010-12-01 Petr Mladek [5a392ae6dca41d9bd32eb874d32aee16c649649b]
Version 3.3.0.1, tag LIBREOFFICE_3_3_0_1 (3.3-rc1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.1/cui/source/options/optgdlg.cxx new/libreoffice-components-3.3.0.2/cui/source/options/optgdlg.cxx
--- old/libreoffice-components-3.3.0.1/cui/source/options/optgdlg.cxx 2010-11-23 21:17:26.000000000 +0100
+++ new/libreoffice-components-3.3.0.2/cui/source/options/optgdlg.cxx 2010-12-09 20:56:57.000000000 +0100
@@ -221,6 +221,11 @@
{
FreeResource();
+#if not ENABLE_HELP_FORMATTING
+ aHelpFormatFT.Hide();
+ aHelpFormatLB.Hide();
+#endif
+
if (!lcl_HasSystemFilePicker())
{
aFileDlgFL.Hide();
@@ -238,6 +243,27 @@
aODMADlgCB.Hide();
#endif
+ if (!aODMADlgCB.IsVisible())
+ {
+ // rearrange the following controls
+ Point aNewPos = aPrintDlgFL.GetPosPixel();
+ long nDelta = aNewPos.Y() - aODMADlgCB.GetPosPixel().Y();
+
+ Window* pWins[] =
+ {
+ &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB,
+ &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB
+ };
+ Window** pCurrent = pWins;
+ const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
+ for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent )
+ {
+ aNewPos = (*pCurrent)->GetPosPixel();
+ aNewPos.Y() -= nDelta;
+ (*pCurrent)->SetPosPixel( aNewPos );
+ }
+ }
+
if ( !aFileDlgCB.IsVisible() )
{
// rearrange the following controls
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.1/cui/source/options/optgdlg.hrc new/libreoffice-components-3.3.0.2/cui/source/options/optgdlg.hrc
--- old/libreoffice-components-3.3.0.1/cui/source/options/optgdlg.hrc 2010-11-11 16:12:41.000000000 +0100
+++ new/libreoffice-components-3.3.0.2/cui/source/options/optgdlg.hrc 2010-12-09 20:56:57.000000000 +0100
@@ -30,6 +30,8 @@
// defines for positions and sizes ---------------------------------------
+#define ENABLE_HELP_FORMATTING 0
+
#define WHOLE_WIDTH 248
#define EDIT_WIDTH 30
#define UNIT_WIDTH 40
@@ -46,19 +48,24 @@
#define ROWSPACE RSC_SP_CTRL_DESC_Y
#define ROW0 3
#define ROW1 (ROW0 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#if ENABLE_HELP_FORMATTING
#define ROW2 (ROW1 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#else
+#define ROW2 (ROW1)
+#endif
#define ROW3 (ROW2 +RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
#define ROW4 (ROW3 +RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE)
#define ROW5 (ROW4 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
#define ROW6 (ROW5 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW7 (ROW6 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#define ROW8 (ROW7 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW9 (ROW8 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#define ROW10 (ROW9 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW7 (ROW6 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW8 (ROW7 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#define ROW9 (ROW8 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW10 (ROW9 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
#define ROW11 (ROW10+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW12 (ROW11+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#define ROW13 (ROW12+RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE)
+#define ROW12 (ROW11+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW13 (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
#define ROW14 (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW15 (ROW14+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
#define DIFF(v1,v2) (v2-v1)
#define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.1/cui/source/options/optgdlg.src new/libreoffice-components-3.3.0.2/cui/source/options/optgdlg.src
--- old/libreoffice-components-3.3.0.1/cui/source/options/optgdlg.src 2010-11-11 16:12:41.000000000 +0100
+++ new/libreoffice-components-3.3.0.2/cui/source/options/optgdlg.src 2010-12-09 20:56:57.000000000 +0100
@@ -51,15 +51,16 @@
CheckBox CB_TOOLTIP
{
Pos = MAP_APPFONT( COL1, ROW1 );
- Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
+ Size = MAP_APPFONT( COL3 - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Tips";
};
CheckBox CB_EXTHELP
{
Pos = MAP_APPFONT( COL3, ROW1 );
- Size = MAP_APPFONT( WHOLE_WIDTH - COL2, RSC_CD_CHECKBOX_HEIGHT );
+ Size = MAP_APPFONT( WHOLE_WIDTH - COL3, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Extended tips";
};
+#if ENABLE_HELP_FORMATTING
FixedText FT_HELPFORMAT
{
Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW2) );
@@ -82,10 +83,11 @@
< "High Contrast White" ; > ;
};
};
+#endif
CheckBox CB_HELPAGENT
{
Pos = MAP_APPFONT( COL1, ROW3 );
- Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
+ Size = MAP_APPFONT( COL3 - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Help Agent";
};
PushButton PB_HELPAGENT_RESET
@@ -109,62 +111,62 @@
CheckBox CB_FILEDLG
{
Pos = MAP_APPFONT( COL1, ROW5 );
- Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
+ Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Use %PRODUCTNAME dialogs";
};
CheckBox CB_ODMADLG
{
- Pos = MAP_APPFONT( COL3, ROW5 );
- Size = MAP_APPFONT( WHOLE_WIDTH - COL4, RSC_CD_CHECKBOX_HEIGHT );
+ Pos = MAP_APPFONT( COL1, ROW6 );
+ Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Show ODMA DMS dialogs first";
Text [ en-GB ] = "Show ODMA DMS dialogues first";
};
FixedLine FL_PRINTDLG
{
- Pos = MAP_APPFONT( COL0, ROW6 );
+ Pos = MAP_APPFONT( COL0, ROW7 );
Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
Text [ en-US ] = "Print dialogs";
};
CheckBox CB_PRINTDLG
{
- Pos = MAP_APPFONT( COL1, ROW7 );
+ Pos = MAP_APPFONT( COL1, ROW8 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Use %PRODUCTNAME ~dialogs";
};
FixedLine FL_DOCSTATUS
{
- Pos = MAP_APPFONT( COL0, ROW8 );
+ Pos = MAP_APPFONT( COL0, ROW9 );
Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
Text [ en-US ] = "Document status";
};
CheckBox CB_DOCSTATUS
{
- Pos = MAP_APPFONT( COL1, ROW9 );
+ Pos = MAP_APPFONT( COL1, ROW10 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Printing sets \"document modified\" status";
};
CheckBox CB_SAVE_ALWAYS
{
- Pos = MAP_APPFONT( COL1, ROW10 );
+ Pos = MAP_APPFONT( COL1, ROW11 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Allow to save document even when the document is not modified";
};
FixedLine FL_TWOFIGURE
{
- Pos = MAP_APPFONT( COL0, ROW11 );
+ Pos = MAP_APPFONT( COL0, ROW12 );
Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
Text [ en-US ] = "Year (two digits)" ;
};
FixedText FT_INTERPRET
{
- Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW12) );
+ Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW13) );
Size = MAP_APPFONT( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT );
Text [ en-US ] = "Interpret as years between";
};
NumericField NF_YEARVALUE
{
Border = TRUE ;
- Pos = MAP_APPFONT( COL4, ROW12 );
+ Pos = MAP_APPFONT( COL4, ROW13 );
Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT );
Minimum = 1583 ;
Maximum = 9857 ;
@@ -173,13 +175,13 @@
};
FixedText FT_TOYEAR
{
- Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW12) );
+ Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW13) );
Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT );
Text [ en-US ] = "and " ;
};
CheckBox CB_EXPERIMENTAL
{
- Pos = MAP_APPFONT( COL0, ROW13 );
+ Pos = MAP_APPFONT( COL1, ROW15 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Enable experimental (unstable) features";
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.1/setup_native/source/packinfo/packinfo_brand.txt new/libreoffice-components-3.3.0.2/setup_native/source/packinfo/packinfo_brand.txt
--- old/libreoffice-components-3.3.0.1/setup_native/source/packinfo/packinfo_brand.txt 2010-11-11 16:12:41.000000000 +0100
+++ new/libreoffice-components-3.3.0.2/setup_native/source/packinfo/packinfo_brand.txt 2010-12-17 22:21:26.000000000 +0100
@@ -128,8 +128,8 @@
module = "gid_Module_Langpack_Brand"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-draw,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-impress,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw (Name="Draw language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help (Name="Help language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress (Name="Impress language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")"
+requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")"
copyright = "1999-2009 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "%PRODUCTNAME"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.1/setup_native/source/packinfo/packinfo_office_help.txt new/libreoffice-components-3.3.0.2/setup_native/source/packinfo/packinfo_office_help.txt
--- old/libreoffice-components-3.3.0.1/setup_native/source/packinfo/packinfo_office_help.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/libreoffice-components-3.3.0.2/setup_native/source/packinfo/packinfo_office_help.txt 2010-12-16 12:43:41.000000000 +0100
@@ -0,0 +1,36 @@
+# Format:
+
+# Start
+# scpModule
+# shellscript file (optional)
+# solarispackagename
+# solarisrequires (optional)
+# solarisprovides (optional)
+# packagename
+# linuxreplaces (optional)
+# requires (optional)
+# provides (optional)
+# copyright
+# vendor
+# description
+# destpath
+# End
+
+Start
+module = "gid_Module_Helppack_Help"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+copyright = "1999-2009 by OpenOffice.org"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Help module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
+destpath = "/opt"
+packageversion = "%OOOPACKAGEVERSION"
+pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
+End
+
+
+# END OF Language depended package definitions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.1/setup_native/source/packinfo/packinfo_office_lang.txt new/libreoffice-components-3.3.0.2/setup_native/source/packinfo/packinfo_office_lang.txt
--- old/libreoffice-components-3.3.0.1/setup_native/source/packinfo/packinfo_office_lang.txt 2010-11-11 16:12:41.000000000 +0100
+++ new/libreoffice-components-3.3.0.2/setup_native/source/packinfo/packinfo_office_lang.txt 2010-12-16 12:43:41.000000000 +0100
@@ -65,22 +65,6 @@
End
Start
-module = "gid_Module_Langpack_Help"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
-copyright = "1999-2009 by OpenOffice.org"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "Language help module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
-destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-End
-
-Start
module = "gid_Module_Langpack_Writer"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.3.0.1/setup_native/source/win32/nsis/downloadtemplate.nsi new/libreoffice-components-3.3.0.2/setup_native/source/win32/nsis/downloadtemplate.nsi
--- old/libreoffice-components-3.3.0.1/setup_native/source/win32/nsis/downloadtemplate.nsi 2010-11-30 21:17:39.000000000 +0100
+++ new/libreoffice-components-3.3.0.2/setup_native/source/win32/nsis/downloadtemplate.nsi 2010-12-14 18:39:19.000000000 +0100
@@ -278,10 +278,9 @@
File "/oname=$PLUGINSDIR\modern-wizard.bmp" WELCOMEBMPPLACEHOLDER
File "/oname=$PLUGINSDIR\modern-wizard-br.bmp" WELCOMEBMPPLACEHOLDER_BR
- ; use broffice specific branding if executable name begins BrOffice
- StrCpy $0 $EXEFILE 8
-; messageBox MB_OK "ExeName: $0 - chopped $EXEFILE"
- StrCmp $0 "BrOffice" BrOfficeSplash DefaultSplash
+ ; use broffice specific branding if we are in Brazil
+; messageBox MB_OK "Language: $LANGUAGE"
+ StrCmp $LANGUAGE "1046" BrOfficeSplash DefaultSplash
DefaultSplash:
; messageBox MB_OK "LibreOffice"
SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org