incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1245647 - in /incubator/ooo/branches/alg/install/main: instsetoo_native/util/ sysui/desktop/ sysui/desktop/debian/ sysui/desktop/freedesktop/ sysui/desktop/mandriva/ sysui/desktop/redhat/ sysui/desktop/share/ sysui/desktop/slackware/ sysui...
Date Fri, 17 Feb 2012 16:40:59 GMT
Author: alg
Date: Fri Feb 17 16:40:59 2012
New Revision: 1245647

URL: http://svn.apache.org/viewvc?rev=1245647&view=rev
Log:
further namechanges, license changes

Modified:
    incubator/ooo/branches/alg/install/main/instsetoo_native/util/openoffice.lst
    incubator/ooo/branches/alg/install/main/sysui/desktop/debian/control
    incubator/ooo/branches/alg/install/main/sysui/desktop/debian/openoffice.org-debian-menus
    incubator/ooo/branches/alg/install/main/sysui/desktop/debian/postinst
    incubator/ooo/branches/alg/install/main/sysui/desktop/freedesktop/freedesktop-menus.spec
    incubator/ooo/branches/alg/install/main/sysui/desktop/mandriva/mandriva-menus.spec
    incubator/ooo/branches/alg/install/main/sysui/desktop/productversion.mk
    incubator/ooo/branches/alg/install/main/sysui/desktop/redhat/redhat-menus.spec
    incubator/ooo/branches/alg/install/main/sysui/desktop/share/brand.pl
    incubator/ooo/branches/alg/install/main/sysui/desktop/share/create_mime_xml.pl
    incubator/ooo/branches/alg/install/main/sysui/desktop/share/translate.pl
    incubator/ooo/branches/alg/install/main/sysui/desktop/slackware/slack-desc
    incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/mailcap
    incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/pkginfo
    incubator/ooo/branches/alg/install/main/sysui/desktop/suse/suse-menus.spec

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=1245647&r1=1245646&r2=1245647&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 Fri Feb 17
16:40:59 2012
@@ -12,7 +12,7 @@ Globals
 			UNIXBASISROOTNAME apache.openoffice
 			SERVICETAG_PRODUCTNAME Apache OpenOffice 3.4 
 			SERVICETAG_PRODUCTVERSION 3.4
-			SERVICETAG_PARENTNAME Apache OpenOffice 3.4 
+			SERVICETAG_PARENTNAME OpenOffice.org 3.4 
 			SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
 			SERVICETAG_URN urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
 			HIDELICENSEDIALOG 1

Modified: incubator/ooo/branches/alg/install/main/sysui/desktop/debian/control
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/debian/control?rev=1245647&r1=1245646&r2=1245647&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/debian/control (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/debian/control Fri Feb 17 16:40:59
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/branches/alg/install/main/sysui/desktop/debian/openoffice.org-debian-menus
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/debian/openoffice.org-debian-menus?rev=1245647&r1=1245646&r2=1245647&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/debian/openoffice.org-debian-menus
(original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/debian/openoffice.org-debian-menus
Fri Feb 17 16:40:59 2012
@@ -1,39 +1,39 @@
-?package(openoffice.org-writer):needs="X11" section="Apps/Editors"\
+?package(apache.openoffice-writer):needs="X11" section="Apps/Editors"\
   title="%PRODUCTNAME Writer" command="%PREFIX -writer"\
   hints="Word Processors"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-writer.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-writer.png"
 
-?package(openoffice.org-calc):needs="X11" section="Apps/Math"\
+?package(apache.openoffice-calc):needs="X11" section="Apps/Math"\
   title="%PRODUCTNAME Calc" command="%PREFIX -calc"\
   hints="Spreadsheets"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-calc.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-calc.png"
 
-?package(openoffice.org-draw):needs="X11" section="Apps/Graphics"\
+?package(apache.openoffice-draw):needs="X11" section="Apps/Graphics"\
   title="%PRODUCTNAME Draw" command="%PREFIX -draw"\
   hints="Drawing"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-draw.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-draw.png"
 
-?package(openoffice.org-impress):needs="X11" section="Apps/Graphics"\
+?package(apache.openoffice-impress):needs="X11" section="Apps/Graphics"\
   title="%PRODUCTNAME Impress" command="%PREFIX -impress"\
   hints="Presentation"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-impress.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-impress.png"
 
-?package(openoffice.org-base):needs="X11" section="Apps/Databases"\
+?package(apache.openoffice-base):needs="X11" section="Apps/Databases"\
   title="%PRODUCTNAME Base" command="%PREFIX -base"\
   hints="Database"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-base.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-base.png"
 
-?package(openoffice.org-core02):needs="X11" section="Apps/System"\
+?package(apache.openoffice-core02):needs="X11" section="Apps/System"\
   title="%PRODUCTNAME Printer Administration"\
   command="%PREFIX-printeradmin"\
   hints="Setup,Printer,Config"\

Modified: incubator/ooo/branches/alg/install/main/sysui/desktop/debian/postinst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/debian/postinst?rev=1245647&r1=1245646&r2=1245647&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/debian/postinst (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/debian/postinst Fri Feb 17 16:40:59
2012
@@ -80,7 +80,7 @@ if [ "$1" = "configure" ]
 then
   # backing out existing entries to avoid duplicates
   sed '
-/^# OpenOffice.org/d
+/^# Apache OpenOffice/d
 /^application\/vnd\.oasis\.opendocument/d
 /^application\/vnd\.openofficeorg/d
 /^application\/vnd\.sun/d
@@ -96,7 +96,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/branches/alg/install/main/sysui/desktop/freedesktop/freedesktop-menus.spec
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/freedesktop/freedesktop-menus.spec?rev=1245647&r1=1245646&r2=1245647&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/freedesktop/freedesktop-menus.spec
(original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/freedesktop/freedesktop-menus.spec
Fri Feb 17 16:40:59 2012
@@ -6,8 +6,8 @@ Name: %pkgprefix-freedesktop-menus
 #BuildRequires: sed
 #BuildRequires: perl
 Group: Office
-License: LGPL
-Provides: openoffice.org3-desktop-integration
+License: ALv2
+Provides: apache.openoffice3-desktop-integration
 Conflicts: %pkgprefix-suse-menus
 Conflicts: %pkgprefix-debian-menus
 Conflicts: %pkgprefix-redhat-menus
@@ -187,7 +187,7 @@ if [ "$1" = 1 ]
 then
   # backing out existing entries to avoid duplicates
   sed '
-/^# OpenOffice.org/d
+/^# Apache OpenOffice/d
 /^application\/vnd\.oasis\.opendocument/d
 /^application\/vnd\.openofficeorg/d
 /^application\/vnd\.sun/d
@@ -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/branches/alg/install/main/sysui/desktop/mandriva/mandriva-menus.spec
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/mandriva/mandriva-menus.spec?rev=1245647&r1=1245646&r2=1245647&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/mandriva/mandriva-menus.spec (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/mandriva/mandriva-menus.spec Fri
Feb 17 16:40:59 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
 #
@@ -13,7 +13,7 @@ BuildArch: noarch
 #        here and check for the 'mandriva-release' in the future (next year).
 #
 Requires: mandrake-release
-Provides: openoffice.org3-desktop-integration
+Provides: apache.openoffice3-desktop-integration
 
 %define _unpackaged_files_terminate_build 0
 %define _binary_filedigest_algorithm 1
@@ -107,7 +107,7 @@ if [ "$1" = 1 ]
 then
   # backing out existing entries to avoid duplicates
   sed '
-/^# OpenOffice.org/d
+/^# Apache OpenOffice/d
 /^application\/vnd\.oasis\.opendocument/d
 /^application\/vnd\.openofficeorg/d
 /^application\/vnd\.sun/d
@@ -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/branches/alg/install/main/sysui/desktop/productversion.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/productversion.mk?rev=1245647&r1=1245646&r2=1245647&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/productversion.mk (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/productversion.mk Fri Feb 17 16:40:59
2012
@@ -39,11 +39,11 @@ RPMMACROS= \
 PKGDIR=$(BIN)
 .ENDIF
 
-PRODUCTLIST = openoffice.org
+PRODUCTLIST = $(UNIXBASISROOTNAME)
 
 # default values to minimize maintainance effort 
-PRODUCTVERSION = 3.4
-PRODUCTVERSIONSHORT = 3
+PRODUCTVERSION = $(OOOBASEVERSION)
+PRODUCTVERSIONSHORT = $(BRANDPACKAGEVERSION)
 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 +57,7 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/./
 # which is need by other distributors, see http://www.openoffice.org/issues/show_bug.cgi?id=75366
 UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
 
-PRODUCTNAME.openoffice.org = OpenOffice.org
+PRODUCTNAME.openoffice.org = $(UNIXBASISROOTNAME)
 PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION)
 PRODUCTVERSIONSHORT.openoffice.org = $(PRODUCTVERSIONSHORT)
 PKGVERSION.openoffice.org = $(PKGVERSION)

Modified: incubator/ooo/branches/alg/install/main/sysui/desktop/redhat/redhat-menus.spec
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/redhat/redhat-menus.spec?rev=1245647&r1=1245646&r2=1245647&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/redhat/redhat-menus.spec (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/redhat/redhat-menus.spec Fri Feb
17 16:40:59 2012
@@ -4,12 +4,12 @@ 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
-Provides: openoffice.org3-desktop-integration
+Provides: apache.openoffice3-desktop-integration
 %define _unpackaged_files_terminate_build 0
 %define _binary_filedigest_algorithm 1
 %define _binary_payload w9.gzdio
@@ -146,7 +146,7 @@ if [ "$1" = 1 ]
 then
   # backing out existing entries to avoid duplicates
   sed '
-/^# OpenOffice.org/d
+/^# Apache OpenOffice/d
 /^application\/vnd\.oasis\.opendocument/d
 /^application\/vnd\.openofficeorg/d
 /^application\/vnd\.sun/d
@@ -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/branches/alg/install/main/sysui/desktop/share/brand.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/share/brand.pl?rev=1245647&r1=1245646&r2=1245647&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/share/brand.pl (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/share/brand.pl Fri Feb 17 16:40:59
2012
@@ -34,7 +34,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 $destdir = pop @ARGV;
 mkdir $destdir,0777;
 
-$productname = "OpenOffice.org";
+$productname = "Apache OpenOffice";
 $productfilename = "openoffice";
 $prefix = "";
 $iconprefix = "";

Modified: incubator/ooo/branches/alg/install/main/sysui/desktop/share/create_mime_xml.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/share/create_mime_xml.pl?rev=1245647&r1=1245646&r2=1245647&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/share/create_mime_xml.pl (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/share/create_mime_xml.pl Fri Feb
17 16:40:59 2012
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use File::Basename;
 $basedir = dirname($0);
-$productname = 'OpenOffice.org';
+$productname = 'Apache OpenOffice';
 $mimedir = $basedir.'/../mimetypes';
 
 $FS= ' ';		# field seperator (space) - for documents.ulf 

Modified: incubator/ooo/branches/alg/install/main/sysui/desktop/share/translate.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/share/translate.pl?rev=1245647&r1=1245646&r2=1245647&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/share/translate.pl (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/share/translate.pl Fri Feb 17 16:40:59
2012
@@ -32,7 +32,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 
 my ($prefix, $ext, $key);
-$productname = "OpenOffice.org";
+$productname = "Apache OpenOffice";
 $workdir = ".";
 
 while ($_ = $ARGV[0], /^-/) {

Modified: incubator/ooo/branches/alg/install/main/sysui/desktop/slackware/slack-desc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/slackware/slack-desc?rev=1245647&r1=1245646&r2=1245647&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/slackware/slack-desc (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/slackware/slack-desc Fri Feb 17
16:40:59 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/branches/alg/install/main/sysui/desktop/solaris/mailcap
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/mailcap?rev=1245647&r1=1245646&r2=1245647&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/mailcap (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/mailcap Fri Feb 17 16:40:59
2012
@@ -2,7 +2,7 @@ if [ "$1" = install ]
 then
 # backing out existing entries to avoid duplicates
 sed '
-/^# OpenOffice.org/d
+/^# Apache OpenOffice/d
 /^application\/vnd\.oasis\.opendocument/d
 /^application\/vnd\.openofficeorg/d
 /^application\/vnd\.sun/d
@@ -18,7 +18,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/branches/alg/install/main/sysui/desktop/solaris/pkginfo
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/pkginfo?rev=1245647&r1=1245646&r2=1245647&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/pkginfo (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/pkginfo Fri Feb 17 16:40:59
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/branches/alg/install/main/sysui/desktop/suse/suse-menus.spec
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/sysui/desktop/suse/suse-menus.spec?rev=1245647&r1=1245646&r2=1245647&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/suse/suse-menus.spec (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/suse/suse-menus.spec Fri Feb 17
16:40:59 2012
@@ -4,15 +4,15 @@ 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 ..
 Requires: /etc/SuSE-release
 # .. but not for Sun JDS
 Conflicts: SunDesktopVersion
-Provides: openoffice.org3-desktop-integration
+Provides: apache.openoffice3-desktop-integration
 %define _unpackaged_files_terminate_build 0
 %define _binary_filedigest_algorithm 1
 %define _binary_payload w9.gzdio
@@ -157,7 +157,7 @@ if [ "$1" = 1 ]
 then
   # backing out existing entries to avoid duplicates
   sed '
-/^# OpenOffice.org/d
+/^# Apache OpenOffice/d
 /^application\/vnd\.oasis\.opendocument/d
 /^application\/vnd\.openofficeorg/d
 /^application\/vnd\.sun/d
@@ -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