[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc

2012-04-18 Thread Petr Mladek 
 instsetoo_native/util/openoffice.lst |   30 +++---
 solenv/inc/minor.mk  |2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 314f65c6c879bddbc656b21ce478efaa20453fa8
Author: Petr Mladek 
Date:   Wed Apr 18 20:23:27 2012 +0200

bump product version to 3.5.4-rc0+

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 8fdbcf3..9b37041 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
-   UREPACKAGEVERSION 3.5.3
+   UREPACKAGEVERSION 3.5.4
URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice3.5
@@ -58,7 +58,7 @@ LibreOffice
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.3
+   ABOUTBOXPRODUCTVERSION 3.5.4
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
 PCPFILENAME libreoffice.pcp
@@ -70,7 +70,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.3
+   PACKAGEVERSION 3.5.4
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -117,7 +117,7 @@ LibreOffice_wJRE
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.3
+   ABOUTBOXPRODUCTVERSION 3.5.4
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
@@ -128,7 +128,7 @@ LibreOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.3
+   PACKAGEVERSION 3.5.4
PACKAGEREVISION {buildid}
LICENSENAME LGPL
WITHJREPRODUCT 1
@@ -176,7 +176,7 @@ LibreOffice_Dev
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.3
+   ABOUTBOXPRODUCTVERSION 3.5.4
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
@@ -192,7 +192,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.3
+   PACKAGEVERSION 3.5.4
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -279,7 +279,7 @@ LibreOffice_SDK
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.3
+PACKAGEVERSION 3.5.4
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 POOLPRODUCT 0
@@ -323,7 +323,7 @@ LibreOffice_Dev_SDK
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.3
+PACKAGEVERSION 3.5.4
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -371,7 +371,7 @@ LibreOffice_Test
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.3
+PACKAGEVERSION 3.5.4
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 POOLPRODUCT 0
@@ -415,7 +415,7 @@ LibreOffice_Dev_Test
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.3
+PACKAGEVERSION 3.5.4
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -463,7 +463,7 @@ OxygenOffice
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOU

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc

2012-03-20 Thread Petr Mladek 
 instsetoo_native/util/openoffice.lst |   30 +++---
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit fb03509d32f79a668622961c7d8d5347f1c4bb0f
Author: Petr Mladek 
Date:   Tue Mar 20 15:12:48 2012 +0100

bump product version to 3.5.3-rc0+, release number to 300

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 2d32336..8fdbcf3 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
-   UREPACKAGEVERSION 3.5.2
+   UREPACKAGEVERSION 3.5.3
URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice3.5
@@ -58,7 +58,7 @@ LibreOffice
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.2
+   ABOUTBOXPRODUCTVERSION 3.5.3
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
 PCPFILENAME libreoffice.pcp
@@ -70,7 +70,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.2
+   PACKAGEVERSION 3.5.3
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -117,7 +117,7 @@ LibreOffice_wJRE
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.2
+   ABOUTBOXPRODUCTVERSION 3.5.3
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
@@ -128,7 +128,7 @@ LibreOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.2
+   PACKAGEVERSION 3.5.3
PACKAGEREVISION {buildid}
LICENSENAME LGPL
WITHJREPRODUCT 1
@@ -176,7 +176,7 @@ LibreOffice_Dev
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.2
+   ABOUTBOXPRODUCTVERSION 3.5.3
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
@@ -192,7 +192,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.2
+   PACKAGEVERSION 3.5.3
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -279,7 +279,7 @@ LibreOffice_SDK
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.2
+PACKAGEVERSION 3.5.3
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 POOLPRODUCT 0
@@ -323,7 +323,7 @@ LibreOffice_Dev_SDK
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.2
+PACKAGEVERSION 3.5.3
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -371,7 +371,7 @@ LibreOffice_Test
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.2
+PACKAGEVERSION 3.5.3
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 POOLPRODUCT 0
@@ -415,7 +415,7 @@ LibreOffice_Dev_Test
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.2
+PACKAGEVERSION 3.5.3
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -463,7 +463,7 @@ OxygenOffice
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc

2012-02-24 Thread Petr Mladek 
 instsetoo_native/util/openoffice.lst |   30 +++---
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 24404329b71f12886830b6511ece8af10b2a7df1
Author: Petr Mladek 
Date:   Fri Feb 24 15:54:46 2012 +0100

bump product version to 3.5.2-rc0+, release number to 200

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 1988ba1..2d32336 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
-   UREPACKAGEVERSION 3.5.1
+   UREPACKAGEVERSION 3.5.2
URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice3.5
@@ -58,7 +58,7 @@ LibreOffice
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.1
+   ABOUTBOXPRODUCTVERSION 3.5.2
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
 PCPFILENAME libreoffice.pcp
@@ -70,7 +70,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.1
+   PACKAGEVERSION 3.5.2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -117,7 +117,7 @@ LibreOffice_wJRE
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.1
+   ABOUTBOXPRODUCTVERSION 3.5.2
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
@@ -128,7 +128,7 @@ LibreOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.1
+   PACKAGEVERSION 3.5.2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
WITHJREPRODUCT 1
@@ -176,7 +176,7 @@ LibreOffice_Dev
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.1
+   ABOUTBOXPRODUCTVERSION 3.5.2
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
@@ -192,7 +192,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.1
+   PACKAGEVERSION 3.5.2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -279,7 +279,7 @@ LibreOffice_SDK
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.1
+PACKAGEVERSION 3.5.2
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 POOLPRODUCT 0
@@ -323,7 +323,7 @@ LibreOffice_Dev_SDK
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.1
+PACKAGEVERSION 3.5.2
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -371,7 +371,7 @@ LibreOffice_Test
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.1
+PACKAGEVERSION 3.5.2
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 POOLPRODUCT 0
@@ -415,7 +415,7 @@ LibreOffice_Dev_Test
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.1
+PACKAGEVERSION 3.5.2
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -463,7 +463,7 @@ OxygenOffice
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc

2012-01-24 Thread Petr Mladek 
 instsetoo_native/util/openoffice.lst |   60 +--
 solenv/inc/minor.mk  |4 +-
 2 files changed, 32 insertions(+), 32 deletions(-)

New commits:
commit eb9b34079d23351e9626aa57e18d31adbbb8f4fa
Author: Petr Mladek 
Date:   Tue Jan 24 21:27:22 2012 +0100

bump product version to 3.5.1-rc0+, release number to 100

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index dba6be7..1988ba1 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
-   UREPACKAGEVERSION 3.5.0
+   UREPACKAGEVERSION 3.5.1
URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice3.5
@@ -53,13 +53,13 @@ LibreOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION rc1
+   SHORT_PRODUCTEXTENSION rc0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX rc1+
+   ABOUTBOXPRODUCTVERSION 3.5.1
+   ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
 PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -70,7 +70,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.0
+   PACKAGEVERSION 3.5.1
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -112,13 +112,13 @@ LibreOffice_wJRE
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION rc1
+   SHORT_PRODUCTEXTENSION rc0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX rc1+
+   ABOUTBOXPRODUCTVERSION 3.5.1
+   ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
@@ -128,7 +128,7 @@ LibreOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.0
+   PACKAGEVERSION 3.5.1
PACKAGEREVISION {buildid}
LICENSENAME LGPL
WITHJREPRODUCT 1
@@ -170,14 +170,14 @@ LibreOffice_Dev
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION rc1
+   SHORT_PRODUCTEXTENSION rc0
UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX rc1+
+   ABOUTBOXPRODUCTVERSION 3.5.1
+   ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -192,7 +192,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.0
+   PACKAGEVERSION 3.5.1
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -240,7 +240,7 @@ URE
 PRODUCTEXTENSION
 BRANDPACKAGEVERSION 3.5
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION rc1
+SHORT_PRODUCTEXTENSION rc0

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc

2012-01-18 Thread Fridrich Strba 
 instsetoo_native/util/openoffice.lst |   30 +++---
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 2f1fa4abea5035cdf83331dd18b86b6fd6393d88
Author: Fridrich Å trba 
Date:   Wed Jan 18 10:28:55 2012 +0100

bump product version to 3.5.0-rc1+, release number to 11

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 18d804d..dba6be7 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -53,13 +53,13 @@ LibreOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta3
+   SHORT_PRODUCTEXTENSION rc1
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX beta3+
+   ABOUTBOXPRODUCTVERSIONSUFFIX rc1+
BASEPRODUCTVERSION 3.5
 PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -112,13 +112,13 @@ LibreOffice_wJRE
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta3
+   SHORT_PRODUCTEXTENSION rc1
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX beta3+
+   ABOUTBOXPRODUCTVERSIONSUFFIX rc1+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
@@ -170,14 +170,14 @@ LibreOffice_Dev
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta3
+   SHORT_PRODUCTEXTENSION rc1
UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX beta3+
+   ABOUTBOXPRODUCTVERSIONSUFFIX rc1+
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -240,7 +240,7 @@ URE
 PRODUCTEXTENSION
 BRANDPACKAGEVERSION 3.5
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta3
+SHORT_PRODUCTEXTENSION rc1
 LICENSENAME LGPL
 SETSTATICPATH 1
 NOVERSIONINDIRNAME 1
@@ -275,7 +275,7 @@ LibreOffice_SDK
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta3
+SHORT_PRODUCTEXTENSION rc1
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
@@ -318,7 +318,7 @@ LibreOffice_Dev_SDK
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta3
+SHORT_PRODUCTEXTENSION rc1
 UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -367,7 +367,7 @@ LibreOffice_Test
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta3
+SHORT_PRODUCTEXTENSION rc1
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
@@ -410,7 +410,7 @@ LibreOffice_Dev_Test
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta3
+SHORT_PRODUCTEXTENSION rc1
 UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
@@ -458,13 +458,13 @@ OxygenOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-   SHORT_PRODUCTEXTENSION  beta3
+   SHORT_PRODUCTEXTENSION  rc1
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONU

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc

2012-01-10 Thread Petr Mladek 
 instsetoo_native/util/openoffice.lst |   30 +++---
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 349701133f09530adc56c51bbfcb5400845ff993
Author: Petr Mladek 
Date:   Tue Jan 10 18:17:39 2012 +0100

bump product version to 3.5.0-beta3+, release number to 3

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index d5dc9ed..18d804d 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -53,13 +53,13 @@ LibreOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta2
+   SHORT_PRODUCTEXTENSION beta3
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX beta2+
+   ABOUTBOXPRODUCTVERSIONSUFFIX beta3+
BASEPRODUCTVERSION 3.5
 PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -112,13 +112,13 @@ LibreOffice_wJRE
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta2
+   SHORT_PRODUCTEXTENSION beta3
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX beta2+
+   ABOUTBOXPRODUCTVERSIONSUFFIX beta3+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
@@ -170,14 +170,14 @@ LibreOffice_Dev
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta2
+   SHORT_PRODUCTEXTENSION beta3
UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX beta2+
+   ABOUTBOXPRODUCTVERSIONSUFFIX beta3+
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -240,7 +240,7 @@ URE
 PRODUCTEXTENSION
 BRANDPACKAGEVERSION 3.5
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta2
+SHORT_PRODUCTEXTENSION beta3
 LICENSENAME LGPL
 SETSTATICPATH 1
 NOVERSIONINDIRNAME 1
@@ -275,7 +275,7 @@ LibreOffice_SDK
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta2
+SHORT_PRODUCTEXTENSION beta3
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
@@ -318,7 +318,7 @@ LibreOffice_Dev_SDK
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta2
+SHORT_PRODUCTEXTENSION beta3
 UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -367,7 +367,7 @@ LibreOffice_Test
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta2
+SHORT_PRODUCTEXTENSION beta3
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
@@ -410,7 +410,7 @@ LibreOffice_Dev_Test
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta2
+SHORT_PRODUCTEXTENSION beta3
 UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
@@ -458,13 +458,13 @@ OxygenOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-   SHORT_PRODUCTEXTENSION  beta2
+   SHORT_PRODUCTEXTENSION  beta3
 POSTVERSIONEXTENSION

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc

2011-12-20 Thread Petr Mladek 
 instsetoo_native/util/openoffice.lst |   30 +++---
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 42d0322a75ac0922729d79f951186b368e69c2c5
Author: Petr Mladek 
Date:   Tue Dec 20 18:41:40 2011 +0100

bump product version to 3.5.0-beta2+, release number to 2

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 0b79557..d5dc9ed 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -53,13 +53,13 @@ LibreOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta1
+   SHORT_PRODUCTEXTENSION beta2
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX beta1+
+   ABOUTBOXPRODUCTVERSIONSUFFIX beta2+
BASEPRODUCTVERSION 3.5
 PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -112,13 +112,13 @@ LibreOffice_wJRE
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta1
+   SHORT_PRODUCTEXTENSION beta2
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX beta1+
+   ABOUTBOXPRODUCTVERSIONSUFFIX beta2+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
@@ -170,14 +170,14 @@ LibreOffice_Dev
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta1
+   SHORT_PRODUCTEXTENSION beta2
UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX beta1+
+   ABOUTBOXPRODUCTVERSIONSUFFIX beta2+
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -240,7 +240,7 @@ URE
 PRODUCTEXTENSION
 BRANDPACKAGEVERSION 3.5
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta1
+SHORT_PRODUCTEXTENSION beta2
 LICENSENAME LGPL
 SETSTATICPATH 1
 NOVERSIONINDIRNAME 1
@@ -275,7 +275,7 @@ LibreOffice_SDK
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta1
+SHORT_PRODUCTEXTENSION beta2
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
@@ -318,7 +318,7 @@ LibreOffice_Dev_SDK
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta1
+SHORT_PRODUCTEXTENSION beta2
 UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -367,7 +367,7 @@ LibreOffice_Test
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION alpha0
+SHORT_PRODUCTEXTENSION beta2
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
@@ -410,7 +410,7 @@ LibreOffice_Dev_Test
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION alpha0
+SHORT_PRODUCTEXTENSION beta2
 UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
@@ -458,13 +458,13 @@ OxygenOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-   SHORT_PRODUCTEXTENSION  beta1
+   SHORT_PRODUCTEXTENSION  beta2
 POSTVERSIONEXTENSION

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc

2011-12-12 Thread Petr Mladek 
 instsetoo_native/util/openoffice.lst |   16 
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 6bbbe8bfe6de8502df7807c6408b4023c73aeb16
Author: Petr Mladek 
Date:   Mon Dec 12 14:22:23 2011 +0100

bump product version to 3.5.0-beta1, release number to 1

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 93c3686..c269959 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -53,7 +53,7 @@ LibreOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta0
+   SHORT_PRODUCTEXTENSION beta1
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -111,7 +111,7 @@ LibreOffice_wJRE
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta0
+   SHORT_PRODUCTEXTENSION beta1
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -168,7 +168,7 @@ LibreOffice_Dev
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta0
+   SHORT_PRODUCTEXTENSION beta1
UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
@@ -237,7 +237,7 @@ URE
 PRODUCTEXTENSION
 BRANDPACKAGEVERSION 3.5
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta0
+SHORT_PRODUCTEXTENSION beta1
 LICENSENAME LGPL
 SETSTATICPATH 1
 NOVERSIONINDIRNAME 1
@@ -272,7 +272,7 @@ LibreOffice_SDK
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta0
+SHORT_PRODUCTEXTENSION beta1
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
@@ -315,7 +315,7 @@ LibreOffice_Dev_SDK
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta0
+SHORT_PRODUCTEXTENSION beta1
 UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -455,7 +455,7 @@ OxygenOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-   SHORT_PRODUCTEXTENSION  beta0
+   SHORT_PRODUCTEXTENSION  beta1
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -518,7 +518,7 @@ OxygenOffice_wJRE
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-   SHORT_PRODUCTEXTENSION beta0
+   SHORT_PRODUCTEXTENSION beta1
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index c4403f3..38646f1 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=350
-RSCREVISION=350m1(Build:0)
-BUILD=0
+RSCREVISION=350m1(Build:1)
+BUILD=1
 LAST_MINOR=m1
 SOURCEVERSION=OOO350
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/bin

2011-12-12 Thread Andras Timar 
 instsetoo_native/util/openoffice.lst |6 +++---
 solenv/bin/modules/installer/download.pm |6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit ea0bc3c3d48ff750dc76442b1e4f1ac4d2e9a42d
Author: Andras Timar 
Date:   Mon Dec 12 10:00:41 2011 +0100

change PRODUCTNAME back to LOdev, because prev. change broke Linux packaging

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 3f9b12d..93c3686 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -164,7 +164,7 @@ LibreOffice_Dev
{
variables
{
-   PRODUCTNAME LibO-dev
+   PRODUCTNAME LOdev
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
@@ -311,7 +311,7 @@ LibreOffice_Dev_SDK
 downloadname LibO-Dev-SDK_{packageversion}_{os}_install_{languages}
 variables
 {
-PRODUCTNAME LibO-dev
+PRODUCTNAME LOdev
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
@@ -403,7 +403,7 @@ LibreOffice_Dev_Test
 downloadname LO-Dev-Test_{packageversion}_{os}_install_{languages}
 variables
 {
-PRODUCTNAME LibO-dev
+PRODUCTNAME LOdev
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index 246adea..5f186b7 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -394,15 +394,15 @@ sub get_downloadname_productname
 
 if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LibO"; }
 
-if ( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) { $start = "LibO-Dev"; 
}
+if ( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) { $start = "LibO-Dev"; }
 
 if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( 
$allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-SDK"; }
 
-if (( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) && ( 
$allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-Dev-SDK"; }
+if (( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) && ( 
$allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-Dev-SDK"; }
 
 if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( 
$allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start = "LibO-Test"; }
 
-if (( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) && ( 
$allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start = 
"LibO-Dev-Test"; }
+if (( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) && ( 
$allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start = 
"LibO-Dev-Test"; }
 
 if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LibO-URE"; }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util

2011-12-11 Thread Andras Timar 
 instsetoo_native/util/openoffice.lst |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d75885f5190ef3bc12932db281af4ac74f7a0616
Author: Andras Timar 
Date:   Sun Dec 11 20:12:54 2011 +0100

fix problems with generation of download name

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 0cfafc5..3f9b12d 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -164,7 +164,7 @@ LibreOffice_Dev
{
variables
{
-   PRODUCTNAME LOdev
+   PRODUCTNAME LibO-dev
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
@@ -217,8 +217,8 @@ LibreOffice_Dev
compression 5
script  setup_osl
downloadname
LibO-dev_{productversion}_{os}_install_{languages}
-   langpackdownloadname
LibO_{productversion}_languagepack_{os}_install_{languages}
-   helppackdownloadname
LibO_{productversion}_helppack_{os}_install_{languages}
+   langpackdownloadname
LibO-dev_{productversion}_languagepack_{os}_install_{languages}
+   helppackdownloadname
LibO-dev_{productversion}_helppack_{os}_install_{languages}
include 
{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
}
 }
@@ -265,7 +265,7 @@ LibreOffice_SDK
 {
 Settings
 {
-downloadname OOo-SDK_{packageversion}_{os}_install_{languages}
+downloadname LibO-SDK_{packageversion}_{os}_install_{languages}
 variables
 {
 PRODUCTNAME LibreOffice
@@ -308,10 +308,10 @@ LibreOffice_Dev_SDK
 {
 Settings
 {
-downloadname OOo-Dev-SDK_{packageversion}_{os}_install_{languages}
+downloadname LibO-Dev-SDK_{packageversion}_{os}_install_{languages}
 variables
 {
-PRODUCTNAME LOdev
+PRODUCTNAME LibO-dev
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
@@ -403,7 +403,7 @@ LibreOffice_Dev_Test
 downloadname LO-Dev-Test_{packageversion}_{os}_install_{languages}
 variables
 {
-PRODUCTNAME LOdev
+PRODUCTNAME LibO-dev
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util

2011-12-07 Thread Petr Mladek 
 instsetoo_native/util/openoffice.lst |   36 +--
 1 file changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 9b5e6c1b2f7742f34f26881a104b07d092541142
Author: Petr Mladek 
Date:   Wed Dec 7 22:35:55 2011 +0100

Revert "mention version suffix, e.g. "beta1" in about dialog"

broke build on MAC; need better solution after beta1 tag

This reverts commit fec8058db415db791c51d4a81435cf1f93b304e7.

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index d505a06..0cfafc5 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -51,9 +51,9 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 3.5
-   PRODUCTEXTENSION beta1-test 
+   PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta1-test
+   SHORT_PRODUCTEXTENSION beta0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -109,9 +109,9 @@ LibreOffice_wJRE
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 3.5
-   PRODUCTEXTENSION beta1-test 
+   PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta1-test
+   SHORT_PRODUCTEXTENSION beta0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -166,9 +166,9 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 3.5
-   PRODUCTEXTENSION beta1-test 
+   PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta1-test
+   SHORT_PRODUCTEXTENSION beta0
UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
@@ -234,10 +234,10 @@ URE
 PRODUCTVERSION 3.5
 PACKAGEVERSION 3.5
 PACKAGEREVISION 1
-PRODUCTEXTENSION beta1-test
+PRODUCTEXTENSION
 BRANDPACKAGEVERSION 3.5
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta1-test
+SHORT_PRODUCTEXTENSION beta0
 LICENSENAME LGPL
 SETSTATICPATH 1
 NOVERSIONINDIRNAME 1
@@ -270,9 +270,9 @@ LibreOffice_SDK
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 3.5
-PRODUCTEXTENSION beta1-test
+PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta1-test
+SHORT_PRODUCTEXTENSION beta0
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
@@ -313,9 +313,9 @@ LibreOffice_Dev_SDK
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 3.5
-PRODUCTEXTENSION beta1-test
+PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta1-test
+SHORT_PRODUCTEXTENSION beta0
 UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -362,7 +362,7 @@ LibreOffice_Test
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 3.5
-PRODUCTEXTENSION beta1-test
+PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
 SHORT_PRODUCTEXTENSION alpha0
 POSTVERSIONEXTENSION TEST
@@ -405,7 +405,7 @@ LibreOffice_Dev_Test
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 3.5
-PRODUCTEXTENSION beta1-test
+PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
 SHORT_PRODUCTEXTENSION alpha0
 UNIXBASISROOTNAME lodev3.5
@@ -453,9 +453,9 @@ OxygenOffice
{
PRODUCTNAME OxygenOffice
PRODUCTVERSION 3.5
-   PRODUCTEXTENSION beta1-test
+   PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-   SHORT_PRODUCTEXTENSION  beta1-test
+   SHORT_PRODUCTEXTENSION  beta0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -516,9 +516,9 @@ OxygenOffice_wJRE
{
PRODUCTNAME OxygenOffice
PRODUCTVERSION 3.5
-   PRODUCTEXTENSION beta1-test
+   PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-   SHORT_PRODUCTEXTENSION beta1-test
+

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util

2011-12-07 Thread Petr Mladek 
 instsetoo_native/util/openoffice.lst |   36 +--
 1 file changed, 18 insertions(+), 18 deletions(-)

New commits:
commit fec8058db415db791c51d4a81435cf1f93b304e7
Author: Petr Mladek 
Date:   Wed Dec 7 17:36:06 2011 +0100

mention version suffix, e.g. "beta1" in about dialog

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 0cfafc5..d505a06 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -51,9 +51,9 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 3.5
-   PRODUCTEXTENSION 
+   PRODUCTEXTENSION beta1-test 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta0
+   SHORT_PRODUCTEXTENSION beta1-test
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -109,9 +109,9 @@ LibreOffice_wJRE
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 3.5
-   PRODUCTEXTENSION 
+   PRODUCTEXTENSION beta1-test 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta0
+   SHORT_PRODUCTEXTENSION beta1-test
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -166,9 +166,9 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 3.5
-   PRODUCTEXTENSION 
+   PRODUCTEXTENSION beta1-test 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta0
+   SHORT_PRODUCTEXTENSION beta1-test
UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
@@ -234,10 +234,10 @@ URE
 PRODUCTVERSION 3.5
 PACKAGEVERSION 3.5
 PACKAGEREVISION 1
-PRODUCTEXTENSION
+PRODUCTEXTENSION beta1-test
 BRANDPACKAGEVERSION 3.5
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta0
+SHORT_PRODUCTEXTENSION beta1-test
 LICENSENAME LGPL
 SETSTATICPATH 1
 NOVERSIONINDIRNAME 1
@@ -270,9 +270,9 @@ LibreOffice_SDK
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 3.5
-PRODUCTEXTENSION
+PRODUCTEXTENSION beta1-test
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta0
+SHORT_PRODUCTEXTENSION beta1-test
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
@@ -313,9 +313,9 @@ LibreOffice_Dev_SDK
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 3.5
-PRODUCTEXTENSION
+PRODUCTEXTENSION beta1-test
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta0
+SHORT_PRODUCTEXTENSION beta1-test
 UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -362,7 +362,7 @@ LibreOffice_Test
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 3.5
-PRODUCTEXTENSION
+PRODUCTEXTENSION beta1-test
 LONG_PRODUCTEXTENSION
 SHORT_PRODUCTEXTENSION alpha0
 POSTVERSIONEXTENSION TEST
@@ -405,7 +405,7 @@ LibreOffice_Dev_Test
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 3.5
-PRODUCTEXTENSION
+PRODUCTEXTENSION beta1-test
 LONG_PRODUCTEXTENSION
 SHORT_PRODUCTEXTENSION alpha0
 UNIXBASISROOTNAME lodev3.5
@@ -453,9 +453,9 @@ OxygenOffice
{
PRODUCTNAME OxygenOffice
PRODUCTVERSION 3.5
-   PRODUCTEXTENSION
+   PRODUCTEXTENSION beta1-test
LONG_PRODUCTEXTENSION
-   SHORT_PRODUCTEXTENSION  beta0
+   SHORT_PRODUCTEXTENSION  beta1-test
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -516,9 +516,9 @@ OxygenOffice_wJRE
{
PRODUCTNAME OxygenOffice
PRODUCTVERSION 3.5
-   PRODUCTEXTENSION
+   PRODUCTEXTENSION beta1-test
LONG_PRODUCTEXTENSION
-   SHORT_PRODUCTEXTENSION beta0
+   SHORT_PRODUCTEXTENSION beta1-test
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVE

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util

2011-12-07 Thread Thorsten Behrens 
 instsetoo_native/util/makefile.mk |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit e4c8b865d0e05f848bb4b8eac53c1b14466bb8f3
Author: Bjoern Michaelsen 
Date:   Wed Dec 7 15:46:42 2011 +0100

dont do fancy stuff with files that are in zips instsetoo_native for now

diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index 39677d2..907b2e7 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -71,10 +71,7 @@ INSTALLDIR=$(OUT)
 LOCALPYFILES= \
 $(BIN)$/uno.py \
 $(BIN)$/unohelper.py \
-$(BIN)$/pythonloader.py \
-$(BIN)$/officehelper.py \
-$(BIN)$/mailmerge.py \
-$(BIN)$/msgbox.py
+$(BIN)$/pythonloader.py
 .ENDIF
 
 help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" 
2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US qtz
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits