[Libreoffice-commits] .: 5 commits - scp2/source solenv/inc

[René Engelhard]

 scp2/source/ooo/common_brand.scp |   11 +++++++++++
 solenv/inc/minor.mk              |    4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 536d16df890ef1bdd59dba3539c0b11d8e06dd6b
Merge: 042e875... c5a5249...
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Nov 26 17:50:28 2010 +0100

    Merge branch 'libreoffice-3-3'

commit c5a52491e86b6a44797bbb593916e826feca4ece
Merge: c0f4988... 07cd2d9...
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Nov 26 17:41:11 2010 +0100

    Merge commit 'ooo/OOO330_m17' into libreoffice-3-3

diff --cc solenv/inc/minor.mk
index 80c9d76,98281ac..6e5dd9b
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@@ -1,5 -1,5 +1,5 @@@
  RSCVERSION=330
- RSCREVISION=330m15(Build:1)
 -RSCREVISION=330m17(Build:9551)
 -BUILD=9551
++RSCREVISION=330m17(Build:1)
 +BUILD=1
- LAST_MINOR=m16
+ LAST_MINOR=m17
  SOURCEVERSION=OOO330
commit c0f4988a8c0b45ab259eec4a9a7bbf7fe57bbf6f
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Nov 25 23:11:29 2010 +0100

    Pack credits file

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 701f9a7..5fe49e6 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1513,3 +1513,14 @@ File gid_License_Odt
     Name = "LICENSE.odt";
     Styles = (PACKED);
 End
+
+File gid_Credits_Odt
+    BIN_FILE_BODY;
+#if defined MACOSX
+    Dir = gid_Brand_Dir_BasisLink;
+#else
+    Dir = gid_Dir_Brand_Root;
+#endif
+    Name = "CREDITS.odt";
+    Styles = (PACKED);
+End
commit 4cc3249e389c7227104bddf82dc607694201fa0e
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Nov 25 16:29:36 2010 +0100

    more removal of the html versions of LICENSE
    
    the gid_Brand_File* definitions broke non-en_US builds

diff --git a/scp2/source/ooo/common_brand_readme.scp b/scp2/source/ooo/common_brand_readme.scp
index 6655f80..bd77922 100644
--- a/scp2/source/ooo/common_brand_readme.scp
+++ b/scp2/source/ooo/common_brand_readme.scp
@@ -41,18 +41,6 @@ File gid_Brand_File_Txt_License
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
-File gid_Brand_File_Txt_License_Html
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Readme;
-  #ifdef UNX
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, license, html);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
 File gid_Brand_File_License_License
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_License;
@@ -65,18 +53,6 @@ File gid_Brand_File_License_License
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
-File gid_Brand_File_License_License_Html
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_License;
-  #ifdef UNX
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, license, html);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
 File gid_Brand_File_Txt_Readme
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Share_Readme;
commit 07cd2d96621827511bafa4f42f49cd0f7e68c2eb
Author: Kurt Zenker <kz at openoffice.org>
Date:   Tue Nov 23 17:46:25 2010 +0100

    OOO330

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 6b22483..98281ac 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=330
-RSCREVISION=330m16(Build:9549)
-BUILD=9549
-LAST_MINOR=m16
+RSCREVISION=330m17(Build:9551)
+BUILD=9551
+LAST_MINOR=m17
 SOURCEVERSION=OOO330