[ooo-build-commit] Branch 'ooo/OOO310' - 2 commits - instsetoo_native/util scp2/source solenv/bin
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Jun 30 17:06:11 PDT 2009
instsetoo_native/util/openoffice.lst | 6 +++---
scp2/source/ooo/file_library_ooo.scp | 18 +++++++++---------
solenv/bin/make_installer.pl | 3 ++-
solenv/bin/modules/installer/epmfile.pm | 4 ++--
4 files changed, 16 insertions(+), 15 deletions(-)
New commits:
commit ccd762a8acc61a358536395a4a77338aa5296a00
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Jun 30 16:37:23 2009 +0000
CWS-TOOLING: integrate CWS native250
2009-06-25 11:55:49 +0200 is r273374 : #159953# Patch IDs for Solaris Sparc and x86
2009-06-15 16:48:23 +0200 is r273000 : #159953# update of service tags
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index d1a9700..a151c62 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -14,7 +14,7 @@ Globals
SERVICETAG_PRODUCTVERSION 3.1
SERVICETAG_PARENTNAME OpenOffice.org 3.1
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
- SERVICETAG_URN urn:uuid:67d59a0f-7902-11dd-938b-080020a9ed93
+ SERVICETAG_URN urn:uuid:a933af5e-f2fc-11dd-8c47-080020a9ed93
HIDELICENSEDIALOG 1
PACKAGEPREFIX
BASISPACKAGEPREFIX ooobasis
@@ -190,7 +190,7 @@ OpenOffice_Dev
UREPACKAGEPREFIX ooodev
SOLSUREPACKAGEPREFIX ooodev
REGISTRYLAYERNAME LayerDev
- SERVICETAG_URN urn:uuid:07a3230b-7902-11dd-938b-080020a9ed93
+ SERVICETAG_URN urn:uuid:f45e3d22-f2fc-11dd-8c47-080020a9ed93
UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
@@ -481,7 +481,7 @@ BrOffice_Dev
UREPACKAGEPREFIX ooodev
SOLSUREPACKAGEPREFIX ooodev
REGISTRYLAYERNAME LayerDevBroffice
- SERVICETAG_URN urn:uuid:07a3230b-7902-11dd-938b-080020a9ed93
+ SERVICETAG_URN urn:uuid:f45e3d22-f2fc-11dd-8c47-080020a9ed93
UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 3fb40aa..6931a99 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1609,7 +1609,8 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
$installer::globals::subdir = installer::epmfile::create_new_directory_structure($newepmdir);
$installer::globals::postprocess_specialepm = 1;
- if (( $installer::globals::patch ) && ( $installer::globals::issolarisx86build )) { installer::worker::fix2_solaris_x86_patch($packagename, $installer::globals::subdir); }
+ # solaris patch not needed anymore
+ # if (( $installer::globals::patch ) && ( $installer::globals::issolarisx86build )) { installer::worker::fix2_solaris_x86_patch($packagename, $installer::globals::subdir); }
}
}
else # this is the standard epm (not relocatable) or ( nonlinux and nonsolaris )
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 0d04416..e9f6166 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1075,10 +1075,10 @@ sub set_revision_in_pkginfo
my $micro = $3;
my $finalmajor = $major;
- my $finalminor = 0;
+ my $finalminor = $minor;
my $finalmicro = 0;
- if (( $packagename =~ /-ure\s*$/ ) && ( $finalmajor == 1 )) { $finalminor = 4; }
+ # if (( $packagename =~ /-ure\s*$/ ) && ( $finalmajor == 1 )) { $finalminor = 4; }
$version = "$finalmajor.$finalminor.$finalmicro";
}
commit e68383c25e9f3ff23b6063e5ac8535c033623c75
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Jun 30 16:19:56 2009 +0000
CWS-TOOLING: integrate CWS ooo311gsl04
2009-06-25 18:59:25 +0200 pl r273391 : add forgotten patch flags for cws: ooo311gsl01,ooo311gsl02,ooo311gsl03,ooo311gsl04,svp02,c28v001
2009-06-25 18:05:10 +0200 pl r273388 : CWS-TOOLING: rebase CWS ooo311gsl04 to branches/OOO310 at 272865 (milestone: OOO310:m13)
2009-06-15 16:57:19 +0200 pl r273001 : #i98804# check for nil
2009-06-11 07:14:52 +0200 hdu r272842 : #i102603# make rotated+shuffled text export work again
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 80bac29..bb6ce04 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -411,7 +411,7 @@ End
#endif
-STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
+STD_LIB_FILE_PATCH(gid_File_Lib_Drawinglayer,drawinglayer)
SPECIAL_UNO_LIB_FILE(gid_File_Lib_Embobj,embobj)
@@ -560,7 +560,7 @@ End
#ifdef QUARTZ
File gid_File_Lib_Fps_Aqua
TXT_FILE_BODY;
- Styles = (PACKED);
+ Styles = (PACKED,PATCH);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = gid_Dir_Program;
Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
@@ -631,7 +631,7 @@ STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
File gid_File_Lib_Fwk
Name = LIBNAME(fwk);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
+ Styles = (PACKED,PATCH,UNO_COMPONENT);
Dir = gid_Dir_Program;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1094,7 +1094,7 @@ End
File gid_File_Lib_Vclplug_Gen
Name = LIBNAME(vclplug_gen);
TXT_FILE_BODY;
- Styles = (PACKED);
+ Styles = (PACKED,PATCH);
Dir = gid_Dir_Program;
End
#endif
@@ -1104,7 +1104,7 @@ End
File gid_File_Lib_Vclplug_Gtk
Name = LIBNAME(vclplug_gtk);
TXT_FILE_BODY;
- Styles = (PACKED);
+ Styles = (PACKED,PATCH);
Dir = gid_Dir_Program;
End
#endif
@@ -1113,7 +1113,7 @@ End
File gid_File_Lib_Vclplug_Kde
Name = LIBNAME(vclplug_kde);
TXT_FILE_BODY;
- Styles = (PACKED);
+ Styles = (PACKED,PATCH);
Dir = gid_Dir_Program;
End
#endif
@@ -1139,7 +1139,7 @@ End
#endif
#if defined UNX && ! defined QUARTZ
-STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
+STD_LIB_FILE_PATCH( gid_File_Lib_Vclplug_Svp, vclplug_svp )
STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
#endif
@@ -1372,7 +1372,7 @@ STD_LIB_FILE( gid_File_Lib_Msword, msword )
File gid_File_Lib_Sysdtrans
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
+ Styles = (PACKED,PATCH,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = gid_Dir_Program;
#ifdef UNX
@@ -1490,7 +1490,7 @@ STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
File gid_File_Lib_Vcl
Name = LIBNAME(vcl);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
+ Styles = (PACKED,PATCH,UNO_COMPONENT);
Dir = gid_Dir_Program;
RegistryID = gid_Starregistry_Services_Rdb;
End
More information about the ooo-build-commit
mailing list