incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1244521 - in /incubator/ooo/branches/alg/install/main: instsetoo_native/inc_openoffice/windows/msi_languages/ instsetoo_native/util/ scp2/source/ooo/ solenv/bin/modules/installer/ solenv/inc/
Date Wed, 15 Feb 2012 14:59:19 GMT
Author: alg
Date: Wed Feb 15 14:59:18 2012
New Revision: 1244521

URL: http://svn.apache.org/viewvc?rev=1244521&view=rev
Log:
first basic changes to install configuration

Modified:
    incubator/ooo/branches/alg/install/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
    incubator/ooo/branches/alg/install/main/instsetoo_native/util/openoffice.lst
    incubator/ooo/branches/alg/install/main/scp2/source/ooo/folderitem_ooo.ulf
    incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/epmfile.pm
    incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/globals.pm
    incubator/ooo/branches/alg/install/main/solenv/inc/shlinfo.rc

Modified: incubator/ooo/branches/alg/install/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf?rev=1244521&r1=1244520&r2=1244521&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
(original)
+++ incubator/ooo/branches/alg/install/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
Wed Feb 15 14:59:18 2012
@@ -305,7 +305,7 @@ en-US = "< &Back"
 en-US = "Cancel"
 
 [OOO_CONTROL_124]
-en-US = "Build contributed in collaboration with the community by Oracle. For credits, see:
http://www.openoffice.org/welcome/credits.html"
+en-US = "Build contributed by members of the Apache OpenOffice community. For credits, see:
http://www.openoffice.org/welcome/credits.html"
 
 [OOO_CONTROL_125]
 en-US = "&Next >"

Modified: incubator/ooo/branches/alg/install/main/instsetoo_native/util/openoffice.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/instsetoo_native/util/openoffice.lst?rev=1244521&r1=1244520&r2=1244521&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/instsetoo_native/util/openoffice.lst (original)
+++ incubator/ooo/branches/alg/install/main/instsetoo_native/util/openoffice.lst Wed Feb 15
14:59:18 2012
@@ -76,7 +76,7 @@ OpenOffice
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
 			PACKAGEVERSION 3.4.0
 			PACKAGEREVISION {milestone}
-			LICENSENAME LGPL
+			LICENSENAME ALv2
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 			SPELLCHECKERFILE spellchecker_selection.txt
@@ -139,7 +139,7 @@ OpenOffice_wJRE
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
 			PACKAGEVERSION 3.4.0
 			PACKAGEREVISION {milestone}
-			LICENSENAME LGPL
+			LICENSENAME ALv2
 			WITHJREPRODUCT 1
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
@@ -209,7 +209,7 @@ OpenOffice_Dev
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
 			PACKAGEVERSION 3.4.0
 			PACKAGEREVISION {milestone}
-			LICENSENAME LGPL
+			LICENSENAME ALv2
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 			SPELLCHECKERFILE spellchecker_selection.txt
@@ -261,7 +261,7 @@ URE
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
-            LICENSENAME LGPL
+            LICENSENAME ALv2
             SETSTATICPATH 1
             NOVERSIONINDIRNAME 1
             PCPFILENAME ure.pcp
@@ -310,7 +310,7 @@ OpenOffice_SDK
             DMG_VOLUMEEXTENSION SDK
             DATABASENAME openofficeorg33sdk
             NO_README_IN_ROOTDIR 1
-            LICENSENAME LGPL
+            LICENSENAME ALv2
             IGNOREDIRECTORYLAYER 1
             NOVERSIONINDIRNAME 0
             NOSPACEINDIRECTORYNAME 1
@@ -363,7 +363,7 @@ OpenOffice_Dev_SDK
             DMG_VOLUMEEXTENSION SDK
             DATABASENAME openofficeorg33devsdk
             NO_README_IN_ROOTDIR 1
-            LICENSENAME LGPL
+            LICENSENAME ALv2
             IGNOREDIRECTORYLAYER 1
             NOVERSIONINDIRNAME 0
             NOSPACEINDIRECTORYNAME 1

Modified: incubator/ooo/branches/alg/install/main/scp2/source/ooo/folderitem_ooo.ulf
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/scp2/source/ooo/folderitem_ooo.ulf?rev=1244521&r1=1244520&r2=1244521&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/scp2/source/ooo/folderitem_ooo.ulf (original)
+++ incubator/ooo/branches/alg/install/main/scp2/source/ooo/folderitem_ooo.ulf Wed Feb 15
14:59:18 2012
@@ -28,4 +28,4 @@ en-US = "From Template"
 en-US = "Open Document"
 
 [STR_FI_TOOLTIP_SOFFICE]
-en-US = "The office productivity suite compatible to the open and standardized ODF document
format. Supported by Oracle."
+en-US = "The office productivity suite compatible to the open and standardized ODF document
format. Supported by Apache."

Modified: incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/epmfile.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/epmfile.pm?rev=1244521&r1=1244520&r2=1244521&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/epmfile.pm Wed Feb
15 14:59:18 2012
@@ -1454,7 +1454,7 @@ sub set_autoprovreq_in_specfile
 
 #####################################################################
 # Replacing Copyright with License in the spec file
-# Syntax: License: LGPL, SISSL
+# Syntax: License: ALv2 (older usages were LGPL, SISSL)
 #####################################################################
 
 sub set_license_in_specfile

Modified: incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/globals.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/globals.pm?rev=1244521&r1=1244520&r2=1244521&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/globals.pm (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/globals.pm Wed Feb
15 14:59:18 2012
@@ -272,7 +272,7 @@ BEGIN
 	$isopensourceproduct = 1;
 	$manufacturer = "";
 	$longmanufacturer = "";
-	$sundirname = "Oracle";
+	$sundirname = "Apache";
 	$codefilename = "codes.txt";
 	$componentfilename = "components.txt";	
 	$productcode = "";

Modified: incubator/ooo/branches/alg/install/main/solenv/inc/shlinfo.rc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/shlinfo.rc?rev=1244521&r1=1244520&r2=1244521&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/shlinfo.rc (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/shlinfo.rc Wed Feb 15 14:59:18 2012
@@ -75,7 +75,7 @@ VS_VERSION_INFO versioninfo
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	PPS(ORG_NAME) "\0"
 				value "InternalName", 		PPS(INTERNAL_NAME) "\0"
-				value "LegalCopyright",		S_CRIGHT " Oracle, Inc.\0"
+				value "LegalCopyright",		S_CRIGHT " Apache Software Foundation\0"
 				ADDITIONAL_VERINFO1
 				ADDITIONAL_VERINFO2
 				ADDITIONAL_VERINFO3
@@ -88,7 +88,7 @@ VS_VERSION_INFO versioninfo
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	PPS(ORG_NAME) "\0"
 				value "InternalName", 		PPS(INTERNAL_NAME) "\0"
-				value "LegalCopyright", 	S_CRIGHT " Oracle, Inc.\0"
+				value "LegalCopyright", 	S_CRIGHT " Apache Software Foundation\0"
 				ADDITIONAL_VERINFO1
 				ADDITIONAL_VERINFO2
 				ADDITIONAL_VERINFO3



Mime
View raw message