[Libreoffice] [PATCH] Fix application icons names as found inside *.desktop files.

Hi all,

the attached patch should fix the problem of not seeing the icons when
the universal LibO packages are installed.
In any case the LibO applications can be started.

Tested on Ubuntu 9.10, KDE.

Please have a look.

Patch submitted according to LGPLv3+.

beppec56.

--
Kind Regards,
Giuseppe Castagno
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu
beppec56 at openoffice.org


From ebe7b072b95fde4cd609b09b686feb94ba905c41 Mon Sep 17 00:00:00 2001
From: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
Date: Fri, 22 Oct 2010 21:40:56 +0200
Subject: [PATCH] Removed PRODUCTVERSIONSHORT number from icon name in *.desktop files.

This is another piece of the change from /opt/libreoffice3 to
/opt/libreoffice.
---
 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 e1e4764..5b672aa 100644
--- 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}}' -u $(UNIXWRAPPERNAME) 
--iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}${ICONVERSION}-' $< $(@:db).$(INPATH).$(@:f)
+    @$(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
-- 
1.6.3.3