------------------------------------------------------------
revno: 2338
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Fri 2011-01-21 02:10:13 +0100
message:
fix Name[pt_BR] and Comment[da]/Comment[tr] fix...
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2011-01-20 23:49:41 +0000
+++ b/changelog 2011-01-21 01:10:13 +0000
@@ -4,8 +4,10 @@
- remove obsolete (commented-out) FIXME section as /usr/share for icons
works again since longer. Fixes actual splitout of the images to the
various -style-* packages, thanks Matthias Klose for the pointer
+ - really correctly subsitute substitute ${PRODUCTNAME_BR} ${PRODUCTVERSION}
+ in Name[pt_BR] (closes: #610345)
- -- Rene Engelhard <r...@debian.org> Thu, 20 Jan 2011 23:35:48 +0100
+ -- Rene Engelhard <r...@debian.org> Fri, 21 Jan 2011 02:08:24 +0100
libreoffice (1:3.3.0~rc4-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2011-01-20 23:49:41 +0000
+++ b/rules 2011-01-21 01:10:13 +0000
@@ -2405,13 +2405,20 @@
sed -e 's,Exec=$${UNIXBASISROOTNAME} \(.*\)
%U,Exec=libreoffice$(VER) \1 %U,' \
-e 's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME},Icon=libreoffice,'
\
-e 's,Name=$${PRODUCTNAME}
$${PRODUCTVERSION},Name=LibreOffice $(VER),' \
- -e 's,Comment=$${PRODUCTNAME}
$${PRODUCTVERSION},Name=LibreOffice $(VER),' \
- -e 's,Name=$${PRODUCTNAME_BR}
$${PRODUCTVERSION},Name=BrOffice $(VER),' \
+ -e 's,Name\[pt_BR\]=$${PRODUCTNAME_BR}
$${PRODUCTVERSION},Name[pt_BR]=BrOffice $(VER),' \
-e 's/ / /' \
< $$dirname/$$p.desktop \
>
$(PKGDIR)-$$p/usr/share/applications/libreoffice$(VER)-$$p.desktop || exit 1 ;\
done
-ifeq "$(BUILD_GTK)" "y"
+ ifeq (tr,$(findstring tr,$(LANGPACKISOS)))
+ sed -i 's,Comment\[tr\]=$${PRODUCTNAME}
$${PRODUCTVERSION},Comment[tr]=LibreOffice $(VER),' \
+
$(PKGDIR)-calc/usr/share/applications/libreoffice$(VER)-calc.desktop
+ endif
+ ifeq (da,$(findstring da,$(LANGPACKISOS)))
+ sed -i 's,Comment\[da\]=$${PRODUCTNAME}
$${PRODUCTVERSION},Comment[da]=LibreOffice $(VER),' \
+
$(PKGDIR)-writer/usr/share/applications/libreoffice$(VER)-writer.desktop
+ endif
+ ifeq "$(BUILD_GTK)" "y"
# qstart.desktop is different to the above. Should be handled by
# --with-unix-wrapper of ooo-build but that somehow doesn't work as
# expected. FIXME.
@@ -2420,7 +2427,7 @@
-e "s,Name=LibreOffice $$PRODUCTVERSION,Name=LibreOffice
$(VER)," \
-e "s/ / /" \
$(PKGDIR)-gtk/$(OOBRANDDIR)/share/xdg/qstart.desktop
-endif
+ endif
# we don't need the share/xdgs except qstart
for f in `find debian -name '*.desktop' | grep xdg | grep -v qstart`;
do \
rm -f $$f; done
