[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 2 commits - configure.ac instsetoo_native/util solenv/inc

[Andras Timar]

 configure.ac                         |    2 +-
 instsetoo_native/util/openoffice.lst |   24 ++++++++++++------------
 solenv/inc/minor.mk                  |    4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit f2fa51c49bebd9ca0af5d61827b663c99a4ac5c3
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Jan 12 13:17:54 2014 -0800

    Bump for 4.0-22
    
    Change-Id: Ie1e528f6a203237818432b182da8e929ccf2e45e

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 18f1728..d17ecb8 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -33,7 +33,7 @@ Globals
             CREATE_MSP_INSTALLSET 1
             UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
             PACKAGEMAP package_names.txt,package_names_ext.txt
-            WINDOWSPATCHLEVEL 21
+            WINDOWSPATCHLEVEL 22
             OOOVENDOR The Document Foundation
             OOODOWNLOADNAME 1
             BUILDIDCWS {buildidcws}
@@ -50,13 +50,13 @@ LibreOffice
         {
             PRODUCTNAME LibreOffice
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION -21
+            PRODUCTEXTENSION -22
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 4.0
             USERDIRPRODUCTVERSION 4
             ABOUTBOXPRODUCTVERSION 4.0
-            ABOUTBOXPRODUCTVERSIONSUFFIX :build-321
+            ABOUTBOXPRODUCTVERSIONSUFFIX :build-322
             BASEPRODUCTVERSION 4.0
             PCPFILENAME libreoffice.pcp
             UPDATEURL http://update.libreoffice.org/check.php
@@ -100,14 +100,14 @@ LibreOffice_Dev
         {
             PRODUCTNAME LOdev
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION -21
+            PRODUCTEXTENSION -22
             UNIXBASISROOTNAME lodev4.0
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 4.0
             USERDIRPRODUCTVERSION 4
             ABOUTBOXPRODUCTVERSION 4.0
-            ABOUTBOXPRODUCTVERSIONSUFFIX :build-321
+            ABOUTBOXPRODUCTVERSIONSUFFIX :build-322
             BASEPRODUCTVERSION 4.0
             DEVELOPMENTPRODUCT 1
             BASISPACKAGEPREFIX lodevbasis
@@ -161,7 +161,7 @@ URE
             PRODUCTVERSION 4.0
             PACKAGEVERSION 4.0
             PACKAGEREVISION 1
-            PRODUCTEXTENSION -21
+            PRODUCTEXTENSION -22
             BRANDPACKAGEVERSION 4.0
             LICENSENAME LGPL
             NOVERSIONINDIRNAME 1
@@ -192,7 +192,7 @@ LibreOffice_SDK
         {
             PRODUCTNAME LibreOffice
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION -21
+            PRODUCTEXTENSION -22
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 4.0
@@ -231,7 +231,7 @@ LibreOffice_Dev_SDK
         {
             PRODUCTNAME LOdev
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION -21
+            PRODUCTEXTENSION -22
             UNIXBASISROOTNAME lodev4.0
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
@@ -276,7 +276,7 @@ LibreOffice_Test
         {
             PRODUCTNAME LibreOffice
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION -21
+            PRODUCTEXTENSION -22
             POSTVERSIONEXTENSION TEST
             POSTVERSIONEXTENSIONUNIX test
             BRANDPACKAGEVERSION 4.0
@@ -315,7 +315,7 @@ LibreOffice_Dev_Test
         {
             PRODUCTNAME LOdev
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION -21
+            PRODUCTEXTENSION -22
             UNIXBASISROOTNAME lodev4.0
             POSTVERSIONEXTENSION TEST
             POSTVERSIONEXTENSIONUNIX test
@@ -359,13 +359,13 @@ OxygenOffice
         {
             PRODUCTNAME OxygenOffice
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION -21
+            PRODUCTEXTENSION -22
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 4.0
             USERDIRPRODUCTVERSION 4
             ABOUTBOXPRODUCTVERSION 4.0
-            ABOUTBOXPRODUCTVERSIONSUFFIX :build-321
+            ABOUTBOXPRODUCTVERSIONSUFFIX :build-322
             BASEPRODUCTVERSION 4.0
             PCPFILENAME openoffice.pcp
             UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 2d69399..87b14c5 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=400
-RSCREVISION=400m1(Build:321)
-BUILD=321
+RSCREVISION=400m1(Build:322)
+BUILD=322
 LAST_MINOR=m0
 SOURCEVERSION=OOO400
 
commit a1dd29fb04c9f340f8b435f4587592b4f4f7e9ea
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Jan 12 13:01:18 2014 -0800

    change PYTHON_VERSION back to old value
    
    because MSP patch cannot rename directories, and MSP installed over
    the older base would result in immediate crash if Python cannot find
    its libs. Version number is hard coded in PYTHONPATH.
    
    Change-Id: Ib90ba3ab6f19a89f1ab2ae6fbc0aad9365d3645d

diff --git a/configure.ac b/configure.ac
index 047696b..1131679 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7555,7 +7555,7 @@ internal)
     SYSTEM_PYTHON=NO
     PYTHON_VERSION_MAJOR=3
     PYTHON_VERSION_MINOR=3
-    PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
+    PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0
     BUILD_TYPE="$BUILD_TYPE PYTHON"
     # Embedded Python dies without Home set
     if test "$HOME" = ""; then