summaryrefslogtreecommitdiff
path: root/sysui/desktop/share
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-04-26 13:52:54 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-04-26 13:52:54 +0300
commit2ede8b438e0cd0a3cddabcfcc7687c74f2e372a2 (patch)
tree1be9175d2835209db740f00e6251eb154f194fd0 /sysui/desktop/share
parent33aea8abd6e61d2cc135c577885b87cdaabbdacf (diff)
Kill BrOffice, fdo#36262
Diffstat (limited to 'sysui/desktop/share')
-rwxr-xr-xsysui/desktop/share/brand.pl8
-rwxr-xr-xsysui/desktop/share/makefile.mk8
-rwxr-xr-xsysui/desktop/share/translate.pl6
3 files changed, 4 insertions, 18 deletions
diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl
index ec71b9f90995..279302ab5f08 100755
--- a/sysui/desktop/share/brand.pl
+++ b/sysui/desktop/share/brand.pl
@@ -39,7 +39,6 @@ $destdir = pop @ARGV;
mkdir $destdir,0777;
$productname = "LibreOffice";
-$productname_br = "BrOffice";
$productfilename = "libreoffice";
$prefix = "";
$iconprefix = "";
@@ -51,10 +50,6 @@ while ($_ = $ARGV[0], /^-/) {
$productname = $ARGV[0];
shift;
}
- if (/^-b/) {
- $productname_br = $ARGV[0];
- shift;
- }
if (/^-u/) {
$productfilename = $ARGV[0];
shift;
@@ -121,9 +116,6 @@ while (<>) {
}
}
- # replace %PRODUCTNAME_BR placeholders
- s/%PRODUCTNAME_BR/$productname_br/g;
-
# replace %PRODUCTNAME placeholders
s/%PRODUCTNAME/$productname/g;
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index 45a1b11c85f3..72ba78b99721 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}}' -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
+ @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}-' $< $(@: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
.IF "$(WITH_LIBSN)"=="YES"
@noop x$(foreach,i,$(LAUNCHERLIST) $(shell @echo "StartupNotify=true" >> $(@:db).$(INPATH).$(@:f)/$i.desktop))x
.ENDIF
diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
index cdc636b7a266..197c333e6f37 100755
--- a/sysui/desktop/share/translate.pl
+++ b/sysui/desktop/share/translate.pl
@@ -37,7 +37,6 @@ eval 'exec perl -wS $0 ${1+"$@"}'
my ($prefix, $ext, $key);
$productname = "LibreOffice";
-$productname_br = "BrOffice";
$workdir = ".";
while ($_ = $ARGV[0], /^-/) {
@@ -47,10 +46,6 @@ while ($_ = $ARGV[0], /^-/) {
$productname = $ARGV[0];
shift;
}
- if (/^-b/) {
- $productname_br = $ARGV[0];
- shift;
- }
if (/^-d/) {
$workdir = $ARGV[0];
shift;
@@ -127,7 +122,6 @@ 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/-/_/;