[Libreoffice] [REVIEW] missing desktop icons (fdo#37160)

Hi,

could you please review the attached patch for LO-3.4?

LO-3.4 can be installed in parallel with LO-3.3 on Linux (fdo#36551).
All the system files need to be versioned, including the menu icons.
Everything worked in beta5. Just the icon name in the desktop files was
not versioned. In fact, the icon name in the desktop file was defined
ugly way and was not in sync with the desktop integration packages.


Best Regards,
Petr

From 275cae7a668f20f0bfbce1e091f7ccc2b52c5b4d Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Mon, 16 May 2011 23:04:48 +0200
Subject: [PATCH] find the versioned desktop menu icons (fdo#37160)

---
 sysui/desktop/share/makefile.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index bc1ef50..6e9ab75 100755
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -150,7 +150,7 @@ $(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) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}'  -b '$${{PRODUCTNAME_BR}} 
$${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix "$(ICONPREFIX.libreoffice)-" $< 
$(@: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
-- 
1.7.4.2