[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sysui/desktop

[Petr Mladek]

 sysui/desktop/share/makefile.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b2f53d05d81c1da8e029b79d73b642ca28a661d1
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Sat Jun 4 13:23:40 2011 +0200

    Using "$(ICONPREFIX.libreoffice)-" as icon prefix
    
    During packaing phase we create only one type of
    /opt/libreoffice3.4/share/*.desktop files
    however we create icon files for all products (libreoffice, oxygenoffice)
    
    This patch fix icon names to libreofficexx-then all program desktop files
    will have icons again in OxygenOffice
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index 6e9ab75..68cba59 100755
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -180,7 +180,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys : ../mimetypes/{$(MIMELIST)}.ke
     @@-$(MKDIRHIER) $(@:d)
     @echo Creating GNOME .keys file for $(@:d:d:f) ..
     @echo ---------------------------------
-    @$(PERL) brand.pl -p $(PRODUCTNAME.$(@:d:d:f)) -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix "$(ICONPREFIX.$(@:d:d:f))-" $< $(MISC)/$(@:d:d:f)
+    @$(PERL) brand.pl -p $(PRODUCTNAME.$(@:d:d:f)) -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix '$(ICONPREFIX.libreoffice)-' $< $(MISC)/$(@:d:d:f)
     @$(PERL) translate.pl -p $(PRODUCTNAME.$(@:d:d:f)) -d $(MISC)/$(@:d:d:f) --ext "keys" --key "description" $(ULFDIR)$/documents.ulf
     @cat $(MISC)/$(@:d:d:f)/{$(MIMELIST)}.keys > $@.$(INPATH)
     @mv -f $@.$(INPATH) $@
@@ -208,7 +208,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/mimelnklist : ../mimetypes/{$(MIMELIST)}.deskto
     @@-$(MKDIRHIER) $(@:db).$(INPATH)
     @echo Creating KDE mimelnk entries for $(@:d:d:f) ..
     @echo ---------------------------------
-    @$(PERL) brand.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix "$(ICONPREFIX.$(@:d:d:f))-" $< $(@:db).$(INPATH)
+    @$(PERL) brand.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix '$(ICONPREFIX.libreoffice)-' $< $(@:db).$(INPATH)
     @$(PERL) ../share/translate.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/documents.ulf
     @mv -f $(@:db).$(INPATH)/* $(@:d)
     @rmdir $(@:db).$(INPATH)
@@ -222,7 +222,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh : $$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     @echo "#!/bin/bash" > $@.$(INPATH)
     @echo "PREFIX=$(UNIXFILENAME.$(@:d:d:f))" >> $@.$(INPATH)
-    @echo "ICON_PREFIX=$(ICONPREFIX.$(@:d:d:f))" >> $@.$(INPATH)
+    @echo "ICON_PREFIX=$(ICONPREFIX.libreoffice)" >> $@.$(INPATH)
     @echo "ICON_SOURCE_DIR=../../../desktop/icons" >> $@.$(INPATH)
     @echo "PRODUCTVERSION=$(PRODUCTVERSION.$(@:d:d:f))" >> $@.$(INPATH)
     @cat $< >> $@.$(INPATH)