summaryrefslogtreecommitdiff
path: root/sysui/desktop/share
diff options
context:
space:
mode:
Diffstat (limited to 'sysui/desktop/share')
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/add_specfile_triggers.sed0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/brand.pl18
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/create_mime_xml.pl2
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/create_tree.sh23
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/documents.ulf0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/launcher_comment.ulf2
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/launcher_genericname.ulf0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/launcher_name.ulf0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/makefile.mk10
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/openoffice.sh0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/printeradmin.sh0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/translate.pl8
12 files changed, 43 insertions, 20 deletions
diff --git a/sysui/desktop/share/add_specfile_triggers.sed b/sysui/desktop/share/add_specfile_triggers.sed
index a8d9d2932a0c..a8d9d2932a0c 100644..100755
--- a/sysui/desktop/share/add_specfile_triggers.sed
+++ b/sysui/desktop/share/add_specfile_triggers.sed
diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl
index ebb5df19d549..ec71b9f90995 100644..100755
--- a/sysui/desktop/share/brand.pl
+++ b/sysui/desktop/share/brand.pl
@@ -38,8 +38,9 @@ eval 'exec perl -wS $0 ${1+"$@"}'
$destdir = pop @ARGV;
mkdir $destdir,0777;
-$productname = "OpenOffice.org";
-$productfilename = "openoffice";
+$productname = "LibreOffice";
+$productname_br = "BrOffice";
+$productfilename = "libreoffice";
$prefix = "";
$iconprefix = "";
@@ -50,6 +51,10 @@ while ($_ = $ARGV[0], /^-/) {
$productname = $ARGV[0];
shift;
}
+ if (/^-b/) {
+ $productname_br = $ARGV[0];
+ shift;
+ }
if (/^-u/) {
$productfilename = $ARGV[0];
shift;
@@ -86,15 +91,15 @@ while (<>) {
# remove possible Windows line-ends
chomp;
- # patch all occurances of openoffice in ICON line with
+ # patch all occurrences of openoffice in ICON line with
# $prefix
s/Icon=/Icon=$iconprefix/;
- # patch all occurances of openoffice in icon_filename
+ # patch all occurrences of openoffice in icon_filename
# line with $prefix
s/icon_filename=/icon_filename=$iconprefix/;
- # patch all occurances of openoffice in EXEC line with
+ # patch all occurrences of openoffice in EXEC line with
# $productfilename
if ( /Exec/ ) {
s/openoffice/$productfilename/;
@@ -116,6 +121,9 @@ while (<>) {
}
}
+ # replace %PRODUCTNAME_BR placeholders
+ s/%PRODUCTNAME_BR/$productname_br/g;
+
# replace %PRODUCTNAME placeholders
s/%PRODUCTNAME/$productname/g;
diff --git a/sysui/desktop/share/create_mime_xml.pl b/sysui/desktop/share/create_mime_xml.pl
index c6b8e4f0b44c..e1fc890ff181 100644..100755
--- a/sysui/desktop/share/create_mime_xml.pl
+++ b/sysui/desktop/share/create_mime_xml.pl
@@ -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
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index e04825df2019..a19474b64ef4 100644..100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -3,7 +3,7 @@ umask 022
if [ "${KDEMAINDIR}" ]
then
echo Copying icons ..
- for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/??x?? locolor} -name "*.png"`
+ for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/???x??? hicolor/??x?? locolor} -name "*.png"`
do
targetdir=${DESTDIR}/${KDEMAINDIR}/share/icons/`dirname $i`
mkdir -p $targetdir
@@ -22,7 +22,7 @@ fi
if [ "${GNOMEDIR}" ]
then
echo Copying GNOME icons ..
- for i in `cd ${ICON_SOURCE_DIR}/hicolor; find ??x?? -name "*.png"`
+ for i in `cd ${ICON_SOURCE_DIR}/hicolor; find ??x?? ???x??? -name "*.png"`
do
targetdir=${DESTDIR}/${GNOMEDIR}/share/icons/gnome/`dirname $i`
mkdir -p $targetdir
@@ -92,17 +92,26 @@ fi
mkdir -p ${DESTDIR}/usr/bin
-office_root=/opt/${PREFIX}
+office_prefix=/opt
+office_root=${office_prefix}/${PREFIX}
-ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/soffice
+#this symlink is needed to have the API boostrap functions running right
+ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/libreoffice
-cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX}
cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
+if test "${PREFIX}" != libreoffice ; then
+ # compat symlinks
+ mkdir -p ${DESTDIR}${office_prefix}
+ ln -sf libreoffice ${DESTDIR}${office_root}
+ ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice
+ ln -sf /usr/bin/${PREFIX}-printeradmin ${DESTDIR}/usr/bin/libreoffice-printeradmin
+fi
+
mkdir -p ${DESTDIR}/usr/share/mime/packages
-cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/
-chmod 0644 ${DESTDIR}/usr/share/mime/packages/openoffice.org.xml
+cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/libreoffice.xml
+chmod 0644 ${DESTDIR}/usr/share/mime/packages/libreoffice.xml
mkdir -p ${DESTDIR}/usr/share/applications
for i in `cat launcherlist`; do
diff --git a/sysui/desktop/share/documents.ulf b/sysui/desktop/share/documents.ulf
index 88fd05c879d2..88fd05c879d2 100644..100755
--- a/sysui/desktop/share/documents.ulf
+++ b/sysui/desktop/share/documents.ulf
diff --git a/sysui/desktop/share/launcher_comment.ulf b/sysui/desktop/share/launcher_comment.ulf
index 6aeab6d94c36..e36949263fce 100644..100755
--- a/sysui/desktop/share/launcher_comment.ulf
+++ b/sysui/desktop/share/launcher_comment.ulf
@@ -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."
diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf
index ff8041a155fc..ff8041a155fc 100644..100755
--- a/sysui/desktop/share/launcher_genericname.ulf
+++ b/sysui/desktop/share/launcher_genericname.ulf
diff --git a/sysui/desktop/share/launcher_name.ulf b/sysui/desktop/share/launcher_name.ulf
index db97e2686d47..db97e2686d47 100644..100755
--- a/sysui/desktop/share/launcher_name.ulf
+++ b/sysui/desktop/share/launcher_name.ulf
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index e1e47648b077..45a1b11c85f3 100644..100755
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -150,10 +150,10 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
@@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f)
@echo Creating desktop entries for $(@:f) ..
@echo ---------------------------------
- @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}${ICONVERSION}-' $< $(@:db).$(INPATH).$(@:f)
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
+ @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}-' $< $(@:db).$(INPATH).$(@:f)
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -p '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
.IF "$(WITH_LIBSN)"=="YES"
@noop x$(foreach,i,$(LAUNCHERLIST) $(shell @echo "StartupNotify=true" >> $(@:db).$(INPATH).$(@:f)/$i.desktop))x
.ENDIF
@@ -220,7 +220,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/mimelnklist : ../mimetypes/{$(MIMELIST)}.deskto
$(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh : makefile.mk
$(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh : $$(@:f)
@@-$(MKDIRHIER) $(@:d)
- @echo "#\!/bin/bash" > $@.$(INPATH)
+ @echo "#!/bin/bash" > $@.$(INPATH)
@echo "PREFIX=$(UNIXFILENAME.$(@:d:d:f))" >> $@.$(INPATH)
@echo "ICON_PREFIX=$(ICONPREFIX.$(@:d:d:f))" >> $@.$(INPATH)
@echo "ICON_SOURCE_DIR=../../../desktop/icons" >> $@.$(INPATH)
diff --git a/sysui/desktop/share/openoffice.sh b/sysui/desktop/share/openoffice.sh
index d3ecf978ee8f..d3ecf978ee8f 100644..100755
--- a/sysui/desktop/share/openoffice.sh
+++ b/sysui/desktop/share/openoffice.sh
diff --git a/sysui/desktop/share/printeradmin.sh b/sysui/desktop/share/printeradmin.sh
index 0eb631f345f0..0eb631f345f0 100644..100755
--- a/sysui/desktop/share/printeradmin.sh
+++ b/sysui/desktop/share/printeradmin.sh
diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
index 0c3ee55b10ce..cdc636b7a266 100644..100755
--- a/sysui/desktop/share/translate.pl
+++ b/sysui/desktop/share/translate.pl
@@ -36,7 +36,8 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#
my ($prefix, $ext, $key);
-$productname = "OpenOffice.org";
+$productname = "LibreOffice";
+$productname_br = "BrOffice";
$workdir = ".";
while ($_ = $ARGV[0], /^-/) {
@@ -46,6 +47,10 @@ while ($_ = $ARGV[0], /^-/) {
$productname = $ARGV[0];
shift;
}
+ if (/^-b/) {
+ $productname_br = $ARGV[0];
+ shift;
+ }
if (/^-d/) {
$workdir = $ARGV[0];
shift;
@@ -122,6 +127,7 @@ KEY: while (<TEMPLATE>) {
$value = substr($value, index($value, "\"") + 1, rindex($value, "\"") - 1);
# replace resource placeholder
+ $value=~s/%PRODUCTNAME_BR/$productname_br/g;
$value=~s/%PRODUCTNAME/$productname/g;
$locale=~s/-/_/;