incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1293313 - in /incubator/ooo/trunk/main: instsetoo_native/inc_openoffice/windows/msi_languages/ instsetoo_native/util/ scp2/source/ooo/ solenv/bin/modules/installer/ solenv/inc/ sysui/desktop/ sysui/desktop/debian/ sysui/desktop/freedesktop...
Date Fri, 24 Feb 2012 16:05:59 GMT
Author: alg
Date: Fri Feb 24 16:05:58 2012
New Revision: 1293313

URL: http://svn.apache.org/viewvc?rev=1293313&view=rev
Log:
Changed various aspects concerning usages of old vendor names, licenses and similar. Checked
on Win, Linux and Mac.

Modified:
    incubator/ooo/trunk/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
    incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
    incubator/ooo/trunk/main/scp2/source/ooo/folderitem_ooo.ulf
    incubator/ooo/trunk/main/solenv/bin/modules/installer/epmfile.pm
    incubator/ooo/trunk/main/solenv/inc/shlinfo.rc
    incubator/ooo/trunk/main/sysui/desktop/debian/control
    incubator/ooo/trunk/main/sysui/desktop/debian/postinst
    incubator/ooo/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec
    incubator/ooo/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec
    incubator/ooo/trunk/main/sysui/desktop/productversion.mk
    incubator/ooo/trunk/main/sysui/desktop/redhat/redhat-menus.spec
    incubator/ooo/trunk/main/sysui/desktop/slackware/slack-desc
    incubator/ooo/trunk/main/sysui/desktop/solaris/mailcap
    incubator/ooo/trunk/main/sysui/desktop/solaris/pkginfo
    incubator/ooo/trunk/main/sysui/desktop/suse/suse-menus.spec

Modified: incubator/ooo/trunk/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf?rev=1293313&r1=1293312&r2=1293313&view=diff
==============================================================================
--- incubator/ooo/trunk/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
(original)
+++ incubator/ooo/trunk/main/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
Fri Feb 24 16:05:58 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 = "This Program is based on the 'Apache OpenOffice (incubating)' project which is supported
by members of the Apache Community. For credits, see: http://www.openoffice.org/welcome/credits.html"
 
 [OOO_CONTROL_125]
 en-US = "&Next >"

Modified: incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst?rev=1293313&r1=1293312&r2=1293313&view=diff
==============================================================================
--- incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst (original)
+++ incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst Fri Feb 24 16:05:58 2012
@@ -10,7 +10,7 @@ Globals
 			URELAYERVERSION 1
 			BASISROOTNAME OpenOffice.org
 			UNIXBASISROOTNAME openoffice.org
-			SERVICETAG_PRODUCTNAME OpenOffice.org 3.4 
+			SERVICETAG_PRODUCTNAME OpenOffice.org 3.4
 			SERVICETAG_PRODUCTVERSION 3.4
 			SERVICETAG_PARENTNAME OpenOffice.org 3.4 
 			SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
@@ -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
@@ -308,9 +308,9 @@ OpenOffice_SDK
             PACK_INSTALLED 1
             POOLPRODUCT 0
             DMG_VOLUMEEXTENSION SDK
-            DATABASENAME openofficeorg33sdk
+            DATABASENAME openofficeorg34sdk
             NO_README_IN_ROOTDIR 1
-            LICENSENAME LGPL
+            LICENSENAME ALv2
             IGNOREDIRECTORYLAYER 1
             NOVERSIONINDIRNAME 0
             NOSPACEINDIRECTORYNAME 1
@@ -361,9 +361,9 @@ OpenOffice_Dev_SDK
             PACK_INSTALLED 1
             POOLPRODUCT 0
             DMG_VOLUMEEXTENSION SDK
-            DATABASENAME openofficeorg33devsdk
+            DATABASENAME openofficeorg34devsdk
             NO_README_IN_ROOTDIR 1
-            LICENSENAME LGPL
+            LICENSENAME ALv2
             IGNOREDIRECTORYLAYER 1
             NOVERSIONINDIRNAME 0
             NOSPACEINDIRECTORYNAME 1

Modified: incubator/ooo/trunk/main/scp2/source/ooo/folderitem_ooo.ulf
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/folderitem_ooo.ulf?rev=1293313&r1=1293312&r2=1293313&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/folderitem_ooo.ulf (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/folderitem_ooo.ulf Fri Feb 24 16:05:58 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 The Apache Software Foundation."

Modified: incubator/ooo/trunk/main/solenv/bin/modules/installer/epmfile.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/modules/installer/epmfile.pm?rev=1293313&r1=1293312&r2=1293313&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ incubator/ooo/trunk/main/solenv/bin/modules/installer/epmfile.pm Fri Feb 24 16:05:58 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/trunk/main/solenv/inc/shlinfo.rc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/shlinfo.rc?rev=1293313&r1=1293312&r2=1293313&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/shlinfo.rc (original)
+++ incubator/ooo/trunk/main/solenv/inc/shlinfo.rc Fri Feb 24 16:05:58 2012
@@ -74,11 +74,11 @@ VS_VERSION_INFO versioninfo
 			block "040704E4"
 			{
 				// German StringTable
-				value "CompanyName",		"OpenOffice.org\0"
+				value "CompanyName",		"Apache Software Foundation\0"
 				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
@@ -87,11 +87,11 @@ VS_VERSION_INFO versioninfo
 			block "040904E4"
 			{
 				// International StringTable
-				value "CompanyName",		"OpenOffice.org\0"
+				value "CompanyName",		"Apache Software Foundation\0"
 				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

Modified: incubator/ooo/trunk/main/sysui/desktop/debian/control
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/debian/control?rev=1293313&r1=1293312&r2=1293313&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/debian/control (original)
+++ incubator/ooo/trunk/main/sysui/desktop/debian/control Fri Feb 24 16:05:58 2012
@@ -1,5 +1,5 @@
 Description: %productname desktop integration
-Maintainer: OpenOffice.org
+Maintainer: Apache Software Foundation
 Architecture: all
 Provides: openoffice.org-desktop-integration, openoffice.org-unbundled
 Conflicts: openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled

Modified: incubator/ooo/trunk/main/sysui/desktop/debian/postinst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/debian/postinst?rev=1293313&r1=1293312&r2=1293313&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/debian/postinst (original)
+++ incubator/ooo/trunk/main/sysui/desktop/debian/postinst Fri Feb 24 16:05:58 2012
@@ -116,7 +116,7 @@ then
 
   # now append our stuff to the temporary file
   cat >> /etc/mailcap.tmp$$ << END
-# OpenOffice.org
+# Apache OpenOffice
 application/vnd.oasis.opendocument.text; %PREFIX -view %s
 application/vnd.oasis.opendocument.text-template; %PREFIX -view %s
 application/vnd.oasis.opendocument.text-web; %PREFIX -view %s

Modified: incubator/ooo/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec?rev=1293313&r1=1293312&r2=1293313&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec (original)
+++ incubator/ooo/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec Fri Feb 24 16:05:58
2012
@@ -6,7 +6,7 @@ Name: %pkgprefix-freedesktop-menus
 #BuildRequires: sed
 #BuildRequires: perl
 Group: Office
-License: LGPL
+License: ALv2
 Provides: openoffice.org3-desktop-integration
 Conflicts: %pkgprefix-suse-menus
 Conflicts: %pkgprefix-debian-menus
@@ -203,7 +203,7 @@ then
 
   # now append our stuff to the temporary file
   cat >> /etc/mailcap.tmp$$ << END
-# OpenOffice.org
+# Apache OpenOffice
 application/vnd.oasis.opendocument.text; %unixfilename -view %s
 application/vnd.oasis.opendocument.text-template; %unixfilename -view %s
 application/vnd.oasis.opendocument.text-web; %unixfilename -view %s

Modified: incubator/ooo/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec?rev=1293313&r1=1293312&r2=1293313&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec (original)
+++ incubator/ooo/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec Fri Feb 24 16:05:58
2012
@@ -4,7 +4,7 @@ Release: %release
 Summary: %productname desktop integration
 Name: %pkgprefix-mandriva-menus
 Group: Office
-License: LGPL
+License: ALv2
 AutoReqProv: no
 BuildArch: noarch
 #
@@ -123,7 +123,7 @@ then
 
   # now append our stuff to the temporary file
   cat >> /etc/mailcap.tmp$$ << END
-# OpenOffice.org
+# Apache OpenOffice
 application/vnd.oasis.opendocument.text; %unixfilename -view %s
 application/vnd.oasis.opendocument.text-template; %unixfilename -view %s
 application/vnd.oasis.opendocument.text-web; %unixfilename -view %s

Modified: incubator/ooo/trunk/main/sysui/desktop/productversion.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/productversion.mk?rev=1293313&r1=1293312&r2=1293313&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/productversion.mk (original)
+++ incubator/ooo/trunk/main/sysui/desktop/productversion.mk Fri Feb 24 16:05:58 2012
@@ -39,11 +39,18 @@ RPMMACROS= \
 PKGDIR=$(BIN)
 .ENDIF
 
+# CAUTION! here the parsing result from openoffice.lst is NOT available, so this is hardcoded
+# but should not be. When replacing with $(UNIXBASISROOTNAME) it will be empty (!)
 PRODUCTLIST = openoffice.org
 
-# default values to minimize maintainance effort 
+# default values to minimize maintainance effort
+
+# CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
 PRODUCTVERSION = 3.4
+
+# CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
 PRODUCTVERSIONSHORT = 3
+
 PKGVERSION = $(PRODUCTVERSION)
 # gnome-vfs treats everything behind the last '.' as an icon extension, 
 # even though the "icon_filename" in '.keys' is specified as filename 
@@ -57,7 +64,9 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/./
 # which is need by other distributors, see http://www.openoffice.org/issues/show_bug.cgi?id=75366
 UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
 
+# CAUTION! $(UNIXBASISROOTNAME) from openoffice.lst NOT available (!)
 PRODUCTNAME.openoffice.org = OpenOffice.org
+
 PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION)
 PRODUCTVERSIONSHORT.openoffice.org = $(PRODUCTVERSIONSHORT)
 PKGVERSION.openoffice.org = $(PKGVERSION)

Modified: incubator/ooo/trunk/main/sysui/desktop/redhat/redhat-menus.spec
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/redhat/redhat-menus.spec?rev=1293313&r1=1293312&r2=1293313&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/redhat/redhat-menus.spec (original)
+++ incubator/ooo/trunk/main/sysui/desktop/redhat/redhat-menus.spec Fri Feb 24 16:05:58 2012
@@ -4,8 +4,8 @@ Release: %release
 Summary: %productname desktop integration
 Name: %pkgprefix-redhat-menus
 Group: Office
-License: LGPL
-Vendor: OpenOffice.org
+License: ALv2
+Vendor: Apache Software Foundation
 AutoReqProv: no
 BuildArch: noarch
 Requires: redhat-release
@@ -162,7 +162,7 @@ then
 
   # now append our stuff to the temporary file
   cat >> /etc/mailcap.tmp$$ << END
-# OpenOffice.org
+# Apache OpenOffice
 application/vnd.oasis.opendocument.text; %unixfilename -view %s
 application/vnd.oasis.opendocument.text-template; %unixfilename -view %s
 application/vnd.oasis.opendocument.text-web; %unixfilename -view %s

Modified: incubator/ooo/trunk/main/sysui/desktop/slackware/slack-desc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/slackware/slack-desc?rev=1293313&r1=1293312&r2=1293313&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/slackware/slack-desc (original)
+++ incubator/ooo/trunk/main/sysui/desktop/slackware/slack-desc Fri Feb 24 16:05:58 2012
@@ -1,7 +1,7 @@
 # needs to be 11 lines - variables replaced by the makefile...
        |-----handy-ruler------------------------------------------------------|
 PKGNAME: PRODUCTNAME Desktop-Integration for Slackware
-PKGNAME: Version: PKGVERSION, License: LGPL
+PKGNAME: Version: PKGVERSION, License: ALv2
 PKGNAME:
 PKGNAME: Note that this package is non-functional without the main packages of
 PKGNAME: LONGPRODUCTNAME
@@ -10,4 +10,4 @@ PKGNAME: default, make sure to adapt the
 PKGNAME:          /etc/UNIXFILENAME
 PKGNAME: accordingly to point to the correct location.
 PKGNAME:
-PKGNAME: This package is provided by OpenOffice.org
+PKGNAME: This package is provided by Apache Software Foundation

Modified: incubator/ooo/trunk/main/sysui/desktop/solaris/mailcap
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/solaris/mailcap?rev=1293313&r1=1293312&r2=1293313&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/solaris/mailcap (original)
+++ incubator/ooo/trunk/main/sysui/desktop/solaris/mailcap Fri Feb 24 16:05:58 2012
@@ -38,7 +38,7 @@ sed '
 
 # now append our stuff to the temporary file
 cat << END
-# OpenOffice.org
+# Apache OpenOffice
 application/vnd.oasis.opendocument.text; %PREFIX -view %s
 application/vnd.oasis.opendocument.text-template; %PREFIX -view %s
 application/vnd.oasis.opendocument.text-web; %PREFIX -view %s

Modified: incubator/ooo/trunk/main/sysui/desktop/solaris/pkginfo
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/solaris/pkginfo?rev=1293313&r1=1293312&r2=1293313&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/solaris/pkginfo (original)
+++ incubator/ooo/trunk/main/sysui/desktop/solaris/pkginfo Fri Feb 24 16:05:58 2012
@@ -2,7 +2,7 @@ PKG=%pkgprefix3-desktop-int
 NAME=%PRODUCTNAME Solaris desktop integration
 CATEGORY=application
 BASEDIR=/
-VENDOR=OpenOffice.org
+VENDOR=Apache Software Foundation
 HOTLINE=Please contact your local service provider
 EMAIL=
 MAXINST=1000

Modified: incubator/ooo/trunk/main/sysui/desktop/suse/suse-menus.spec
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/suse/suse-menus.spec?rev=1293313&r1=1293312&r2=1293313&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/suse/suse-menus.spec (original)
+++ incubator/ooo/trunk/main/sysui/desktop/suse/suse-menus.spec Fri Feb 24 16:05:58 2012
@@ -4,8 +4,8 @@ Release: %release
 Summary: %productname desktop integration
 Name: %pkgprefix-suse-menus
 Group: Office
-License: LGPL
-Vendor: OpenOffice.org
+License: ALv2
+Vendor: Apache Software Foundation
 AutoReqProv: no
 BuildArch: noarch
 # /etc/SuSE-release for SuSE, SLES and Novell Linux Desktop ..
@@ -173,7 +173,7 @@ then
 
   # now append our stuff to the temporary file
   cat >> /etc/mailcap.tmp$$ << END
-# OpenOffice.org
+# Apache OpenOffice
 application/vnd.oasis.opendocument.text; %unixfilename -view %s
 application/vnd.oasis.opendocument.text-template; %unixfilename -view %s
 application/vnd.oasis.opendocument.text-web; %unixfilename -view %s



Mime
View raw message