You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/02/23 21:03:50 UTC
svn commit: r1292933 - in /incubator/ooo/branches/alg/install/main:
instsetoo_native/util/ solenv/bin/modules/installer/ sysui/desktop/
sysui/desktop/debian/ sysui/desktop/freedesktop/ sysui/desktop/mandriva/
sysui/desktop/redhat/ sysui/desktop/share/ ...
Author: alg
Date: Thu Feb 23 20:03:50 2012
New Revision: 1292933
URL: http://svn.apache.org/viewvc?rev=1292933&view=rev
Log:
adapted most too ambitioned changes back, left needed ones
Modified:
incubator/ooo/branches/alg/install/main/instsetoo_native/util/openoffice.lst
incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/globals.pm
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/solaris/mailcap
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=1292933&r1=1292932&r2=1292933&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 Thu Feb 23 20:03:50 2012
@@ -8,18 +8,18 @@ Globals
OOOPACKAGEVERSION 3.4.0
UREPACKAGEVERSION 3.4.0
URELAYERVERSION 1
- BASISROOTNAME Apache OpenOffice
- UNIXBASISROOTNAME apache.openoffice
- SERVICETAG_PRODUCTNAME Apache OpenOffice 3.4
+ BASISROOTNAME OpenOffice.org
+ UNIXBASISROOTNAME openoffice.org
+ SERVICETAG_PRODUCTNAME OpenOffice.org 3.4
SERVICETAG_PRODUCTVERSION 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
PACKAGEPREFIX
- BASISPACKAGEPREFIX aoobasis
- UREPACKAGEPREFIX apache.openoffice
- SOLSUREPACKAGEPREFIX apacheopenoffice
+ BASISPACKAGEPREFIX ooobasis
+ UREPACKAGEPREFIX openoffice.org
+ SOLSUREPACKAGEPREFIX openofficeorg
USE_FILEVERSION 1
LIBRARYVERSION 9.4.0
POOLPRODUCT 1
@@ -53,7 +53,7 @@ OpenOffice
{
variables
{
- PRODUCTNAME Apache OpenOffice
+ PRODUCTNAME OpenOffice.org
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -98,7 +98,7 @@ OpenOffice
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://templates.services.openoffice.org
STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT Apache OpenOffice
+ REGISTRATION_PRODUCT OpenOffice.org
REGISTRATION_CID 926117
DICT_REPO_URL http://extensions.services.openoffice.org/dictionaries
}
@@ -117,7 +117,7 @@ OpenOffice_wJRE
{
variables
{
- PRODUCTNAME Apache OpenOffice
+ PRODUCTNAME OpenOffice.org
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -163,7 +163,7 @@ OpenOffice_wJRE
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://templates.services.openoffice.org
STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT Apache OpenOffice
+ REGISTRATION_PRODUCT OpenOffice.org
REGISTRATION_CID 926117
DICT_REPO_URL http://extensions.services.openoffice.org/dictionaries
}
@@ -181,13 +181,13 @@ OpenOffice_Dev
{
variables
{
- PRODUCTNAME AOO-dev
+ PRODUCTNAME OOo-dev
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
- BASISROOTNAME AOO-dev
- UNIXBASISROOTNAME aoo-dev
+ BASISROOTNAME OOo-dev
+ UNIXBASISROOTNAME ooo-dev
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -195,9 +195,9 @@ OpenOffice_Dev
ABOUTBOXPRODUCTVERSION 3.4.0
BASEPRODUCTVERSION 3.4
DEVELOPMENTPRODUCT 1
- BASISPACKAGEPREFIX aoobasis-dev
- UREPACKAGEPREFIX aoodev
- SOLSUREPACKAGEPREFIX aoodev
+ BASISPACKAGEPREFIX ooobasis-dev
+ UREPACKAGEPREFIX ooodev
+ SOLSUREPACKAGEPREFIX ooodev
REGISTRYLAYERNAME LayerDev
SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
@@ -234,7 +234,7 @@ OpenOffice_Dev
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://templates.services.openoffice.org
STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT Apache OpenOffice
+ REGISTRATION_PRODUCT OpenOffice.org
REGISTRATION_CID 926117
DICT_REPO_URL http://extensions.services.openoffice.org/dictionaries
}
@@ -292,10 +292,10 @@ OpenOffice_SDK
{
Settings
{
- downloadname AOO-SDK_{packageversion}_{os}_install_{languages}
+ downloadname OOo-SDK_{packageversion}_{os}_install_{languages}
variables
{
- PRODUCTNAME Apache OpenOffice
+ PRODUCTNAME OpenOffice.org
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -338,24 +338,24 @@ OpenOffice_Dev_SDK
{
Settings
{
- downloadname AOO-Dev-SDK_{packageversion}_{os}_install_{languages}
+ downloadname OOo-Dev-SDK_{packageversion}_{os}_install_{languages}
variables
{
- PRODUCTNAME AOO-dev
+ PRODUCTNAME OOo-dev
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
- BASISROOTNAME AOO-dev
- UNIXBASISROOTNAME aoo-dev
+ BASISROOTNAME OOo-dev
+ UNIXBASISROOTNAME ooo-dev
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
PACKAGEVERSION 3.4.0
PACKAGEREVISION {milestone}
- BASISPACKAGEPREFIX aoobasis-dev
- UREPACKAGEPREFIX aoodev
- SOLSUREPACKAGEPREFIX aoodev
+ BASISPACKAGEPREFIX ooobasis-dev
+ UREPACKAGEPREFIX ooodev
+ SOLSUREPACKAGEPREFIX ooodev
REGISTRYLAYERNAME LayerDev
DEVELOPMENTPRODUCT 1
PACK_INSTALLED 1
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=1292933&r1=1292932&r2=1292933&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 Thu Feb 23 20:03:50 2012
@@ -273,7 +273,7 @@ BEGIN
$isopensourceproduct = 1;
$manufacturer = "";
$longmanufacturer = "";
- $sundirname = "Apache";
+ $sundirname = "Oracle";
$codefilename = "codes.txt";
$componentfilename = "components.txt";
$productcode = "";
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=1292933&r1=1292932&r2=1292933&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 Thu Feb 23 20:03:50 2012
@@ -1,39 +1,39 @@
-?package(apache.openoffice-writer):needs="X11" section="Apps/Editors"\
+?package(openoffice.org-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(apache.openoffice-calc):needs="X11" section="Apps/Math"\
+?package(openoffice.org-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(apache.openoffice-draw):needs="X11" section="Apps/Graphics"\
+?package(openoffice.org-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(apache.openoffice-impress):needs="X11" section="Apps/Graphics"\
+?package(openoffice.org-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(apache.openoffice-base):needs="X11" section="Apps/Databases"\
+?package(openoffice.org-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(apache.openoffice-core02):needs="X11" section="Apps/System"\
+?package(openoffice.org-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=1292933&r1=1292932&r2=1292933&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/debian/postinst (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/debian/postinst Thu Feb 23 20:03:50 2012
@@ -80,7 +80,7 @@ if [ "$1" = "configure" ]
then
# backing out existing entries to avoid duplicates
sed '
-/^# Apache OpenOffice/d
+/^# OpenOffice.org/d
/^application\/vnd\.oasis\.opendocument/d
/^application\/vnd\.openofficeorg/d
/^application\/vnd\.sun/d
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=1292933&r1=1292932&r2=1292933&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 Thu Feb 23 20:03:50 2012
@@ -7,7 +7,7 @@ Name: %pkgprefix-freedesktop-menus
#BuildRequires: perl
Group: Office
License: ALv2
-Provides: apache.openoffice3-desktop-integration
+Provides: openoffice.org3-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 '
-/^# Apache OpenOffice/d
+/^# OpenOffice.org/d
/^application\/vnd\.oasis\.opendocument/d
/^application\/vnd\.openofficeorg/d
/^application\/vnd\.sun/d
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=1292933&r1=1292932&r2=1292933&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 Thu Feb 23 20:03:50 2012
@@ -13,7 +13,7 @@ BuildArch: noarch
# here and check for the 'mandriva-release' in the future (next year).
#
Requires: mandrake-release
-Provides: apache.openoffice3-desktop-integration
+Provides: openoffice.org3-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 '
-/^# Apache OpenOffice/d
+/^# OpenOffice.org/d
/^application\/vnd\.oasis\.opendocument/d
/^application\/vnd\.openofficeorg/d
/^application\/vnd\.sun/d
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=1292933&r1=1292932&r2=1292933&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/productversion.mk (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/productversion.mk Thu Feb 23 20:03:50 2012
@@ -39,11 +39,18 @@ RPMMACROS= \
PKGDIR=$(BIN)
.ENDIF
-PRODUCTLIST = $(UNIXBASISROOTNAME)
+# 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
+
+# CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
+PRODUCTVERSION = 3.4
+
+# CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
+PRODUCTVERSIONSHORT = 3
-# default values to minimize maintainance effort
-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 +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}}'
-PRODUCTNAME.openoffice.org = $(UNIXBASISROOTNAME)
+# 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/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=1292933&r1=1292932&r2=1292933&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 Thu Feb 23 20:03:50 2012
@@ -9,7 +9,7 @@ Vendor: Apache Software Foundation
AutoReqProv: no
BuildArch: noarch
Requires: redhat-release
-Provides: apache.openoffice3-desktop-integration
+Provides: openoffice.org3-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 '
-/^# Apache OpenOffice/d
+/^# OpenOffice.org/d
/^application\/vnd\.oasis\.opendocument/d
/^application\/vnd\.openofficeorg/d
/^application\/vnd\.sun/d
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=1292933&r1=1292932&r2=1292933&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 Thu Feb 23 20:03:50 2012
@@ -34,7 +34,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
$destdir = pop @ARGV;
mkdir $destdir,0777;
-$productname = "Apache OpenOffice";
+$productname = "OpenOffice.org";
$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=1292933&r1=1292932&r2=1292933&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 Thu Feb 23 20:03:50 2012
@@ -1,7 +1,7 @@
#!/usr/bin/perl
use File::Basename;
$basedir = dirname($0);
-$productname = 'Apache OpenOffice';
+$productname = 'OpenOffice.org';
$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=1292933&r1=1292932&r2=1292933&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 Thu Feb 23 20:03:50 2012
@@ -32,7 +32,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#
my ($prefix, $ext, $key);
-$productname = "Apache OpenOffice";
+$productname = "OpenOffice.org";
$workdir = ".";
while ($_ = $ARGV[0], /^-/) {
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=1292933&r1=1292932&r2=1292933&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/mailcap (original)
+++ incubator/ooo/branches/alg/install/main/sysui/desktop/solaris/mailcap Thu Feb 23 20:03:50 2012
@@ -2,7 +2,7 @@ if [ "$1" = install ]
then
# backing out existing entries to avoid duplicates
sed '
-/^# Apache OpenOffice/d
+/^# OpenOffice.org/d
/^application\/vnd\.oasis\.opendocument/d
/^application\/vnd\.openofficeorg/d
/^application\/vnd\.sun/d
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=1292933&r1=1292932&r2=1292933&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 Thu Feb 23 20:03:50 2012
@@ -12,7 +12,7 @@ BuildArch: noarch
Requires: /etc/SuSE-release
# .. but not for Sun JDS
Conflicts: SunDesktopVersion
-Provides: apache.openoffice3-desktop-integration
+Provides: openoffice.org3-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 '
-/^# Apache OpenOffice/d
+/^# OpenOffice.org/d
/^application\/vnd\.oasis\.opendocument/d
/^application\/vnd\.openofficeorg/d
/^application\/vnd\.sun/d