configure.in | 2 -
instsetoo_native/util/openoffice.lst | 40 +++++++++++++++++------------------
solenv/inc/minor.mk | 4 +--
3 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 4a38cb3bfc1a30d37cbb3ae51989cf747e54eb66
Author: Petr Mladek <pmla...@suse.cz>
Date: Wed Jun 20 15:26:46 2012 +0200
explicitely check gmodule build flags for gtk3 module
g_module_open is used in gtk3gtksys.cxx
gmodule dependencies were moved into private requires in rencent gio-2.0.pc.
It was because GIO users are not generally expected to use gmodule API,
see
http://git.gnome.org/browse/glib/commit/?id=1f02ef3205e810dd937f316f5a7b58ecc2893d59
Change-Id: I90e980678eaaa825ae130f54d13f4a5772a2700a
diff --git a/configure.in b/configure.in
index 9cf0baa..42d8c24 100644
--- a/configure.in
+++ b/configure.in
@@ -8725,7 +8725,7 @@ if test "x$enable_gtk3" = "xyes"; then
if test "$with_system_cairo" != yes; then
echo "System cairo required for gtk3 support, please use
--with-system-cairo"
fi
- PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.2 gtk+-unix-print-3.0 cairo,
ENABLE_GTK3="TRUE", ENABLE_GTK3="")
+ PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.2 gtk+-unix-print-3.0
gmodule-no-export-2.0 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
if test "x$ENABLE_GTK3" = "xTRUE"; then
R="gtk3"
else
commit 0828ea8d03d19808acca6ace4dd2860bc8bf3fb9
Author: Petr Mladek <pmla...@suse.cz>
Date: Tue Jun 19 20:14:09 2012 +0200
bump product version to 3.6.0.0.beta2+, build id to 12
Change-Id: I5c4bbf9ca2b24aea49cedfd4f6e67f476a0f7764
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 4d7a82b..e3eae70 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,7 +5,7 @@ Globals
{
variables
{
- UREPACKAGEVERSION 3.6.0.0.beta1
+ UREPACKAGEVERSION 3.6.0.0.beta2
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice3.6
@@ -51,12 +51,12 @@ LibreOffice
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .0.0.beta1
+ SHORT_PRODUCTEXTENSION .0.0.beta2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.6.0.0.beta1
+ ABOUTBOXPRODUCTVERSION 3.6.0.0.beta2
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp
@@ -66,7 +66,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.6.0.0.beta1
+ PACKAGEVERSION 3.6.0.0.beta2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -103,13 +103,13 @@ LibreOffice_Dev
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .0.0.beta1
+ SHORT_PRODUCTEXTENSION .0.0.beta2
UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.6.0.0.beta1
+ ABOUTBOXPRODUCTVERSION 3.6.0.0.beta2
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 3.6
DEVELOPMENTPRODUCT 1
@@ -124,7 +124,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.6.0.0.beta1
+ PACKAGEVERSION 3.6.0.0.beta2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -162,12 +162,12 @@ URE
{
PRODUCTNAME URE
PRODUCTVERSION 3.6
- PACKAGEVERSION 3.6.0.0.beta1
+ PACKAGEVERSION 3.6.0.0.beta2
PACKAGEREVISION 1
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3.6
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .0.0.beta1
+ SHORT_PRODUCTEXTENSION .0.0.beta2
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
PCPFILENAME ure.pcp
@@ -199,11 +199,11 @@ LibreOffice_SDK
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .0.0.beta1
+ SHORT_PRODUCTEXTENSION .0.0.beta2
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.6
- PACKAGEVERSION 3.6.0.0.beta1
+ PACKAGEVERSION 3.6.0.0.beta2
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
@@ -240,12 +240,12 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .0.0.beta1
+ SHORT_PRODUCTEXTENSION .0.0.beta2
UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.6
- PACKAGEVERSION 3.6.0.0.beta1
+ PACKAGEVERSION 3.6.0.0.beta2
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -287,11 +287,11 @@ LibreOffice_Test
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .0.0.beta1
+ SHORT_PRODUCTEXTENSION .0.0.beta2
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 3.6
- PACKAGEVERSION 3.6.0.0.beta1
+ PACKAGEVERSION 3.6.0.0.beta2
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION TEST
@@ -328,12 +328,12 @@ LibreOffice_Dev_Test
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .0.0.beta1
+ SHORT_PRODUCTEXTENSION .0.0.beta2
UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 3.6
- PACKAGEVERSION 3.6.0.0.beta1
+ PACKAGEVERSION 3.6.0.0.beta2
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -374,12 +374,12 @@ OxygenOffice
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .0.0.beta1
+ SHORT_PRODUCTEXTENSION .0.0.beta2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.6.0.0.beta1
+ ABOUTBOXPRODUCTVERSION 3.6.0.0.beta2
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 3.6
PCPFILENAME openoffice.pcp
@@ -389,7 +389,7 @@ OxygenOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.6.0.0.beta1
+ PACKAGEVERSION 3.6.0.0.beta2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
SERVICESPROJEKT 1
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 69e79bd..a8f6550 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
RSCVERSION=360
-RSCREVISION=360m1(Build:11)
-BUILD=11
+RSCREVISION=360m1(Build:12)
+BUILD=12
LAST_MINOR=m1
SOURCEVERSION=OOO360
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
