LibreOffice Branding: first cut

This commit is contained in:
Fridrich Štrba 2010-09-22 15:32:16 +02:00
parent 9f3971de09
commit 89471c0481
26 changed files with 54 additions and 54 deletions

View file

@ -63,7 +63,7 @@ VS_VERSION_INFO versioninfo
block "040704E4"
{
// German StringTable
value "CompanyName", "OpenOffice.org\0"
value "CompanyName", "The Document Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
@ -75,7 +75,7 @@ VS_VERSION_INFO versioninfo
block "040904E4"
{
// International StringTable
value "CompanyName", "OpenOffice.org\0"
value "CompanyName", "The Document Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="OpenOffice" type="win32" />
<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="LibreOffice" type="win32" />
<description>http://www.openoffice.org</description>
<dependency>
<dependentAssembly>

View file

@ -68,7 +68,7 @@ VS_VERSION_INFO versioninfo
block "040704E4"
{
// German StringTable
value "CompanyName", "Oracle\0"
value "CompanyName", "The Document Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
@ -80,7 +80,7 @@ VS_VERSION_INFO versioninfo
block "040904E4"
{
// International StringTable
value "CompanyName", "Oracle\0"
value "CompanyName", "The Document Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"

View file

@ -1,4 +1,4 @@
This product is made available subject to the terms of GNU Lesser General Public License Version 3. A copy of the LGPL license can be found at http://www.openoffice.org/license.html
This product is made available subject to the terms of GNU Lesser General Public License Version 3. A copy of the LGPL license can be found at http://www.gnu.org/licenses/lgpl-3.0-standalone.html
------------------------------------
Third Party Code. Additional copyright notices and license terms applicable to portions of the Software are set forth in the THIRDPARTYLICENSEREADME.html file.
@ -9,7 +9,7 @@ All trademarks and registered trademarks mentioned herein are the property of th
------------------------------------
Copyright (c) 2000,2010 Oracle and/or it affiliates. All rights reserved.
This product has been created with contributions from the OpenOffice.org community, of which Oracle is a principal member. OpenOffice.org acknowledges all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html.
This product has been created with contributions from the OpenOffice.org community. We acknowledge all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html.
------------------------------------

View file

@ -1,6 +1,6 @@
Description: %productname desktop integration
Maintainer: OpenOffice.org
Maintainer: LibreOffice
Architecture: all
Provides: openoffice.org-desktop-integration, openoffice.org-unbundled
Conflicts: openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
Replaces: openofficeorg-desktop-integration, openofficeorg-debian-menus
Provides: libreoffice-desktop-integration, libreoffice-unbundled
Conflicts: libreoffice-desktop-integration, libreoffice-debian-menus, libreoffice-bundled
Replaces: libreoffice-desktop-integration, libreoffice-debian-menus

View file

@ -1,39 +1,39 @@
?package(openoffice.org-writer):needs="X11" section="Apps/Editors"\
?package(libreoffice-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(libreoffice-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(libreoffice-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(libreoffice-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(libreoffice-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(libreoffice-core02):needs="X11" section="Apps/System"\
title="%PRODUCTNAME Printer Administration"\
command="%PREFIX-printeradmin"\
hints="Setup,Printer,Config"\

View file

@ -80,7 +80,7 @@ if [ "$1" = "configure" ]
then
# backing out existing entries to avoid duplicates
sed '
/^# OpenOffice.org/d
/^# LibreOffice/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
# LibreOffice
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

View file

@ -7,7 +7,7 @@ Name: %pkgprefix-freedesktop-menus
#BuildRequires: perl
Group: Office
License: LGPL
Provides: openoffice.org3-desktop-integration
Provides: libreoffice-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
/^# LibreOffice/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
# LibreOffice
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

View file

@ -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: libreoffice-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
/^# LibreOffice/d
/^application\/vnd\.oasis\.opendocument/d
/^application\/vnd\.openofficeorg/d
/^application\/vnd\.sun/d
@ -309,7 +309,7 @@ fi
%files
%attr(0755,root,root) /usr/bin/soffice
%attr(0755,root,root) /usr/bin/%unixfilename
%attr(0755,root,root) %verify(not size md5) /usr/bin/%unixfilename
%attr(0755,root,root) /usr/bin/%unixfilename-printeradmin
%defattr(0644, root, root)

View file

@ -4,7 +4,7 @@ Terminal=false
Icon=base
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-MoreApplications-Databases;
Exec=openoffice -base %U
Exec=${UNIXBASISROOTNAME} -base %U
MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
Name=%PRODUCTNAME Base
GenericName=Database Development

View file

@ -4,7 +4,7 @@ Terminal=false
Icon=calc
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets;
Exec=openoffice -calc %U
Exec=${UNIXBASISROOTNAME} -calc %U
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;
Name=%PRODUCTNAME Calc
GenericName=Spreadsheet

View file

@ -4,7 +4,7 @@ Terminal=false
Icon=draw
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing;
Exec=openoffice -draw %U
Exec=${UNIXBASISROOTNAME} -draw %U
MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
Name=%PRODUCTNAME Draw
GenericName=Drawing Program

View file

@ -4,7 +4,7 @@ Terminal=false
Icon=impress
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations;
Exec=openoffice -impress %U
Exec=${UNIXBASISROOTNAME} -impress %U
MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;
Name=%PRODUCTNAME Impress
GenericName=Presentation

View file

@ -4,7 +4,7 @@ Terminal=false
Icon=math
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
Exec=openoffice -math %U
Exec=${UNIXBASISROOTNAME} -math %U
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
Name=%PRODUCTNAME Math
GenericName=Formula Editor

View file

@ -4,5 +4,5 @@ Terminal=false
Icon=printeradmin
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;
Exec=openoffice-printeradmin
Exec=${UNIXBASISROOTNAME}-printeradmin
Name=%PRODUCTNAME Printer Administration

View file

@ -3,7 +3,7 @@ Version=1.0
Terminal=false
Type=Application
Categories=Office;
Exec=openoffice -quickstart -nologo -nodefault
Exec=${UNIXBASISROOTNAME} -quickstart -nologo -nodefault
NoDisplay=true
Name=%PRODUCTNAME Quickstarter
Comment=Hook for quickstarter startup

View file

@ -4,7 +4,7 @@ Terminal=false
Icon=startcenter
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
Exec=openoffice %U
Exec=${UNIXBASISROOTNAME} %U
MimeType=application/vnd.openofficeorg.extension;
Name=%PRODUCTNAME
GenericName=Office

View file

@ -4,7 +4,7 @@ Terminal=false
Icon=writer
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors;
Exec=openoffice -writer %U
Exec=${UNIXBASISROOTNAME} -writer %U
MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;
Name=%PRODUCTNAME Writer
GenericName=Word Processor

View file

@ -43,7 +43,7 @@ RPMMACROS= \
PKGDIR=$(BIN)
.ENDIF
PRODUCTLIST = openoffice.org broffice.org
PRODUCTLIST = libreoffice broffice.org
# default values to minimize maintainance effort
PRODUCTVERSION = 3.3
@ -61,12 +61,12 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/.//g)
# 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
PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION)
PRODUCTVERSIONSHORT.openoffice.org = $(PRODUCTVERSIONSHORT)
PKGVERSION.openoffice.org = $(PKGVERSION)
UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSIONSHORT.openoffice.org)
ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g)
PRODUCTNAME.libreoffice = LibreOffice
PRODUCTVERSION.libreoffice = $(PRODUCTVERSION)
PRODUCTVERSIONSHORT.libreoffice = $(PRODUCTVERSIONSHORT)
PKGVERSION.libreoffice = $(PKGVERSION)
UNIXFILENAME.libreoffice = $(PRODUCTNAME.libreoffice:l)$(PRODUCTVERSIONSHORT.libreoffice)
ICONPREFIX.libreoffice = $(UNIXFILENAME.libreoffice:s/.//g)
PRODUCTNAME.broffice.org = BrOffice.org
PRODUCTVERSION.broffice.org = $(PRODUCTVERSION)

View file

@ -5,11 +5,11 @@ Summary: %productname desktop integration
Name: %pkgprefix-redhat-menus
Group: Office
License: LGPL
Vendor: OpenOffice.org
Vendor: LibreOffice
AutoReqProv: no
BuildArch: noarch
Requires: redhat-release
Provides: openoffice.org3-desktop-integration
Provides: libreoffice-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
/^# LibreOffice/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
# LibreOffice
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
@ -268,7 +268,7 @@ for theme in gnome hicolor locolor; do
done
%files
%attr(0755,root,root) /usr/bin/soffice
%attr(0755,root,root) /usr/bin/%unixfilename
%attr(0755,root,root) %verify(not size md5) /usr/bin/%unixfilename
%attr(0755,root,root) /usr/bin/%unixfilename-printeradmin
%defattr(0644, root, root)

View file

@ -38,8 +38,8 @@ eval 'exec perl -wS $0 ${1+"$@"}'
$destdir = pop @ARGV;
mkdir $destdir,0777;
$productname = "OpenOffice.org";
$productfilename = "openoffice";
$productname = "LibreOffice";
$productfilename = "libreoffice";
$prefix = "";
$iconprefix = "";

View file

@ -1,7 +1,7 @@
#!/usr/bin/perl
use File::Basename;
$basedir = dirname($0);
$productname = 'OpenOffice.org';
$productname = 'LibreOffice';
$mimedir = $basedir.'/../mimetypes';
$FS= ' '; # field seperator (space) - for documents.ulf

View file

@ -17,5 +17,5 @@ en-US = "Create and edit scientific formulas and equations by using Math."
en-US = "Manage databases, create queries and reports to track and manage your information by using Base."
[startcenter]
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 Document Foundation."

View file

@ -36,7 +36,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#
my ($prefix, $ext, $key);
$productname = "OpenOffice.org";
$productname = "LibreOffice";
$workdir = ".";
while ($_ = $ARGV[0], /^-/) {

View file

@ -10,4 +10,4 @@ PKGNAME: default, make sure to adapt the link
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 The Document Foundation

View file

@ -5,14 +5,14 @@ Summary: %productname desktop integration
Name: %pkgprefix-suse-menus
Group: Office
License: LGPL
Vendor: OpenOffice.org
Vendor: The Document 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: libreoffice-desktop-integration
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
%define _binary_payload w9.gzdio