incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1399619 - in /incubator/ooo/trunk/main: ./ instsetoo_native/util/ readlicense_oo/docs/readme/ solenv/bin/ solenv/bin/modules/installer/ vcl/unx/kde/ vcl/unx/kde4/
Date Thu, 18 Oct 2012 12:33:54 GMT
Author: hdu
Date: Thu Oct 18 12:33:53 2012
New Revision: 1399619

URL: http://svn.apache.org/viewvc?rev=1399619&view=rev
Log:
Remove the incubating disclaimer now that Apache OpenOffice has graduated from the Apache
Incubator

On October 18th, 2012 the Apache Software foundation announced that the
Apache OpenOffice project has graduated from the Apache Incubator

Modified:
    incubator/ooo/trunk/main/LICENSE
    incubator/ooo/trunk/main/README
    incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
    incubator/ooo/trunk/main/readlicense_oo/docs/readme/readme.xrm
    incubator/ooo/trunk/main/solenv/bin/modules/installer/download.pm
    incubator/ooo/trunk/main/solenv/bin/srcrelease.xml
    incubator/ooo/trunk/main/vcl/unx/kde/kdedata.cxx
    incubator/ooo/trunk/main/vcl/unx/kde4/KDEXLib.cxx

Modified: incubator/ooo/trunk/main/LICENSE
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/LICENSE?rev=1399619&r1=1399618&r2=1399619&view=diff
==============================================================================
--- incubator/ooo/trunk/main/LICENSE (original)
+++ incubator/ooo/trunk/main/LICENSE Thu Oct 18 12:33:53 2012
@@ -200,9 +200,9 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-APACHE OpenOffice (incubating) SUBCOMPONENTS: 
+APACHE OpenOffice SUBCOMPONENTS: 
 
-The Apache OpenOffice (incubating includes a number of subcomponents with
+Apache OpenOffice includes a number of subcomponents with
 separate copyright notices and license terms. Your use of the source
 code for the these subcomponents is subject to the terms and
 conditions of the following licenses. 

Modified: incubator/ooo/trunk/main/README
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/README?rev=1399619&r1=1399618&r2=1399619&view=diff
==============================================================================
--- incubator/ooo/trunk/main/README (original)
+++ incubator/ooo/trunk/main/README Thu Oct 18 12:33:53 2012
@@ -5,7 +5,7 @@ Apache OpenOffice (AOO)
     based on open standards. It is the continuation of the OpenOffice.org project.
     
     For detailed information about Apache OpenOffice please visit 
-    http://incubator.apache.org/openofficeorg/
+    http://openoffice.apache.org/
 
     Apache OpenOffice is a very large project with many components and mainly 
     implemented in C++ but also in Java, Perl, Python and other languages.
@@ -28,7 +28,7 @@ Getting the latest sources via Subversio
 
     svn co https://svn.apache.org/repos/asf/incubator/ooo/trunk aoo
 
-    For further information visit http://incubator.apache.org/openofficeorg/source.html
+    For further information visit http://openoffice.apache.org/source.html
 
 Building Apache OpenOffice
 ===========================

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=1399619&r1=1399618&r2=1399619&view=diff
==============================================================================
--- incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst (original)
+++ incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst Thu Oct 18 12:33:53 2012
@@ -105,8 +105,8 @@ OpenOffice
 		active			1
 		compression		5
 		script			setup_osl
-		downloadname	Apache_OpenOffice_incubating_{productversion}_{os}_install_{languages}
-		langpackdownloadname	Apache_OpenOffice_incubating_{productversion}_languagepack_{os}_install_{languages}
+		downloadname	Apache_OpenOffice_{productversion}_{os}_install_{languages}
+		langpackdownloadname	Apache_OpenOffice_{productversion}_languagepack_{os}_install_{languages}
 		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
@@ -170,7 +170,7 @@ OpenOffice_wJRE
 		active			1
 		compression		5
 		script			setup_osljre
-		downloadname	Apache_OpenOffice_incubating_{productversion}_{os}_installwjre_{languages}
+		downloadname	Apache_OpenOffice_{productversion}_{os}_installwjre_{languages}
 		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
@@ -241,8 +241,8 @@ OpenOffice_Dev
 		active			1
 		compression		5
 		script			setup_osl
-		downloadname	Apache_OpenOffice_incubating-dev_{productversion}_{os}_install_{languages}
-		langpackdownloadname	Apache_OpenOffice_incubating_{productversion}_languagepack_{os}_install_{languages}
+		downloadname	Apache_OpenOffice-dev_{productversion}_{os}_install_{languages}
+		langpackdownloadname	Apache_OpenOffice_{productversion}_languagepack_{os}_install_{languages}
 		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
@@ -292,7 +292,7 @@ OpenOffice_SDK
 {
     Settings
     {
-        downloadname Apache_OpenOffice_incubating-SDK_{packageversion}_{os}_install_{languages}
+        downloadname Apache_OpenOffice-SDK_{packageversion}_{os}_install_{languages}
         variables
         {
             PRODUCTNAME OpenOffice.org
@@ -338,7 +338,7 @@ OpenOffice_Dev_SDK
 {
     Settings
     {
-        downloadname Apache_OpenOffice_incubating-Dev-SDK_{packageversion}_{os}_install_{languages}
+        downloadname Apache_OpenOffice-Dev-SDK_{packageversion}_{os}_install_{languages}
         variables
         {
             PRODUCTNAME OOo-dev

Modified: incubator/ooo/trunk/main/readlicense_oo/docs/readme/readme.xrm
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/readlicense_oo/docs/readme/readme.xrm?rev=1399619&r1=1399618&r2=1399619&view=diff
==============================================================================
--- incubator/ooo/trunk/main/readlicense_oo/docs/readme/readme.xrm (original)
+++ incubator/ooo/trunk/main/readlicense_oo/docs/readme/readme.xrm Thu Oct 18 12:33:53 2012
@@ -278,11 +278,11 @@
 		<div id="GettingInvolved">
 			<h2 id="gettinginvolved1" xml:lang="en-US">Getting Involved</h2>
 			<p id="gettinginvolved2" xml:lang="en-US">The ${PRODUCTNAME} Community would very
much benefit from your active participation in the development of this important open source
project.</p>
-			<p id="gettingimvolved3" xml:lang="en-US">As a user, you are already a valuable
part of the suite's development process and we would like to encourage you to take an even
more active role with a view to being a long-term contributor to the community. Please join
and check out the user page at <a href="http://incubator.apache.org/openofficeorg/get-involved.html">http://incubator.apache.org/openofficeorg/get-involved.html</a></p>
+			<p id="gettingimvolved3" xml:lang="en-US">As a user, you are already a valuable
part of the suite's development process and we would like to encourage you to take an even
more active role with a view to being a long-term contributor to the community. Please join
and check out the user page at <a href="http://openoffice.apache.org/get-involved.html">http://openoffice.apache.org/get-involved.html</a></p>
 			<h3 id="howtostart" xml:lang="en-US">How to Start</h3>
 			<p id="howtostart1" xml:lang="en-US">The best way to start contributing is to subscribe
to one or more of the mailing lists, lurk for a while, and gradually use the mail archives
to familiarize yourself with many of the topics covered since the ${PRODUCTNAME} source code
was released back in October 2000. When you're comfortable, all you need to do is send an
email self-introduction and jump right in. If you are familiar with Open Source Projects,
check out our To-Dos list and see if there is anything you would like to help with at <a
href="http://development.openoffice.org/todo.html">http://development.openoffice.org/todo.html</a>.</p>
 			<h3 id="subscribe" xml:lang="en-US">Subscribe</h3>
-			<p id="subscribe1" xml:lang="en-US">Here are a few of the Project mailing lists
to which you can subscribe at <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html">http://incubator.apache.org/openofficeorg/mailing-lists.html</a></p>
+			<p id="subscribe1" xml:lang="en-US">Here are a few of the Project mailing lists
to which you can subscribe at <a href="http://openoffice.apache.org/mailing-lists.html">http://openoffice.apache.org/mailing-lists.html</a></p>
 			<ul>
 				<li>
 					<p id="subscribelist1" xml:lang="en-US">News: ooo-announce@incubator.apache.org
*recommended to all users* (light traffic)</p>
@@ -302,7 +302,7 @@
 			</ul>
 			<h3 xml:lang="en-US">Joining the Project</h3>
 			<p id="joining" xml:lang="en-US">You can make major contributions to this important
open source project even if you have limited software design or coding experience. Yes, you!</p>
-			<p id="joining1" url="ahead" xml:lang="en-US">At <a href="http://incubator.apache.org/openofficeorg/get-involved.html">http://incubator.apache.org/openofficeorg/get-involved.html</a>
you will find a first overview where you can start with, ranging from Localization, QA, user
support to some real core coding projects. If you are not a developer, try the Documentation
or the Marketing Project. The OpenOffice.org Marketing Project is applying both guerilla and
traditional commercial techniques to marketing open source software, and we are doing it across
language and cultural barriers, so you can help just by spreading the word and telling a friend
about this office suite.</p>
+			<p id="joining1" url="ahead" xml:lang="en-US">At <a href="http://openoffice.apache.org/get-involved.html">http://openoffice.apache.org/get-involved.html</a>
you will find a first overview where you can start with, ranging from Localization, QA, user
support to some real core coding projects. If you are not a developer, try the Documentation
or the Marketing Project. The OpenOffice.org Marketing Project is applying both guerilla and
traditional commercial techniques to marketing open source software, and we are doing it across
language and cultural barriers, so you can help just by spreading the word and telling a friend
about this office suite.</p>
 			<p id="joining3" xml:lang="en-US">You can help by joining the marktig mailig list
ooo-marketing@incubator.apache.org or visit the Marketing Communications &amp; Information
Network on <a href="http://marketing.openoffice.org">http://marketing.openoffice.org</a>
where you can provide point communication contact with press, media, government agencies,
consultants, schools, Linux Users Groups and developers in your country and local community.</p>
 		</div>
 

Modified: incubator/ooo/trunk/main/solenv/bin/modules/installer/download.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/modules/installer/download.pm?rev=1399619&r1=1399618&r2=1399619&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/modules/installer/download.pm (original)
+++ incubator/ooo/trunk/main/solenv/bin/modules/installer/download.pm Thu Oct 18 12:33:53
2012
@@ -463,7 +463,7 @@ sub get_downloadname_productname
 {
 	my ($allvariables) = @_;
 
-	my $start = "Apache_OpenOffice_incubating";
+	my $start = "Apache_OpenOffice";
 
 	if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $start .= ""; }
 

Modified: incubator/ooo/trunk/main/solenv/bin/srcrelease.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/srcrelease.xml?rev=1399619&r1=1399618&r2=1399619&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/srcrelease.xml (original)
+++ incubator/ooo/trunk/main/solenv/bin/srcrelease.xml Thu Oct 18 12:33:53 2012
@@ -25,7 +25,7 @@
   <property name="aoo.name" value="aoo"/>
   <property name="aoo.ver" value="3.5.0"/>
   <property name="release.dir.name" value="${aoo.name}-${aoo.ver}"/>
-  <property name="release.file.name" value="${release.dir.name}-incubating-src"/>
+  <property name="release.file.name" value="${release.dir.name}-src"/>
   <property name="release.zip" value="${out.dir}/${release.file.name}.zip"/>
   <property name="release.tar" value="${out.dir}/${release.file.name}.tar"/>
   <property name="release.tar.gz" value="${out.dir}/${release.file.name}.tar.gz"/>

Modified: incubator/ooo/trunk/main/vcl/unx/kde/kdedata.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/unx/kde/kdedata.cxx?rev=1399619&r1=1399618&r2=1399619&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/unx/kde/kdedata.cxx (original)
+++ incubator/ooo/trunk/main/vcl/unx/kde/kdedata.cxx Thu Oct 18 12:33:53 2012
@@ -128,7 +128,7 @@ void KDEXLib::Init()
 			KAboutData::License_File,
 			"(c) 2003, 2004 Novell, Inc and Apache Software Foundation",
 			I18N_NOOP( "Apache OpenOffice is an office suite.\n" ),
-			"http://incubator.apache.org/openofficeorg/index.html",
+			"http://openoffice.apache.org/index.html",
 			"ooo-issues@incubator.apache.org");
 	kAboutData->addAuthor( "Jan Holesovsky",
 			I18N_NOOP( "Original author and maintainer of the KDE NWF." ),

Modified: incubator/ooo/trunk/main/vcl/unx/kde4/KDEXLib.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/unx/kde4/KDEXLib.cxx?rev=1399619&r1=1399618&r2=1399619&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/unx/kde4/KDEXLib.cxx (original)
+++ incubator/ooo/trunk/main/vcl/unx/kde4/KDEXLib.cxx Thu Oct 18 12:33:53 2012
@@ -82,7 +82,7 @@ void KDEXLib::Init()
 			KAboutData::License_File,
 			ki18n( "Joint Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Novell, Inc and Apache
Software Foundation"),
 			ki18n( "Apache OpenOffice is an office suite.\n" ),
-			"http://incubator.apache.org/openofficeorg/",
+			"http://openoffice.apache.org/",
 			"ooo-issues@incubator.apache.org" );
 			
 	kAboutData->addAuthor( ki18n( "Jan Holesovsky" ),



Mime
View raw message