------------------------------------------------------------
revno: 2158
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Fri 2010-10-22 11:11:22 +0200
message:
more desktop/icon related renames
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-10-21 10:59:27 +0000
+++ b/changelog 2010-10-22 09:11:22 +0000
@@ -1,4 +1,4 @@
-libreoffice (1:3.3.0~beta3~20101019-1) UNRELEASED; urgency=low
+libreoffice (1:3.3.0~beta3~20101020-1) UNRELEASED; urgency=low
* update to 3.2.99.3 git
@@ -17,7 +17,8 @@
and we don't use the VCL Testtool anyway
- use new --enable-broffice
- remove manual installing of LibO splash (LibO now also supports
intro.png)
- - update .desktop file installation to actually make Exec= line work
+ - update .desktop file/icon installation to actually give sensible results
+ (Exec= and Icon=)
* debian/broffice.org.p*.in: adapt diversions for new intro.png
-- Rene Engelhard <r...@debian.org> Thu, 21 Oct 2010 12:58:31 +0200
=== modified file 'rules'
--- a/rules 2010-10-21 10:59:27 +0000
+++ b/rules 2010-10-22 09:11:22 +0000
@@ -2729,7 +2729,7 @@
for p in writer calc impress draw math base; do \
mkdir -p -m755 $(PKGDIR)-$$p/usr/share/applications ;\
sed -e 's,Exec=$${UNIXBASISROOTNAME} \(.*\)
%U,Exec=libreoffice$(VER) \1 %U,' \
- -e
's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME},Icon=openofficeorg,' \
+ -e 's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME},Icon=libreoffice,'
\
-e 's,Name=$${PRODUCTNAME}
$${PRODUCTVERSION},Name=LibreOffice $(VER),' \
-e 's/ / /' \
< $$dirname/$$p.desktop \
@@ -3112,7 +3112,7 @@
# this is referenced in .keys/.applications
for i in `find $(PKGDIR)-common/usr/share/icons -name
"openofficeorg*png"`; do \
mkdir -p `dirname $$i | sed -e
s,libreoffice-common,broffice.org,`; \
- ln -s `basename $$i` `echo $$i | sed -e
s,libreoffice-common,broffice.org, | sed -e s/openofficeorg/brofficeorg/`; \
+ ln -s `basename $$i` `echo $$i | sed -e
s,libreoffice-common,broffice.org, | sed -e s/libreoffice/brofficeorg/`; \
done
touch $@
@@ -3151,8 +3151,8 @@
# menu files from sysui
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
mkdir -p -m755 $(PKGDIR)-common/usr/share/applications ;\
- sed -e 's,Exec=$${UNIXPRODUCTNAME}$${PRODUCTVERSION} \(.*\)
%U,Exec=ooffice$(VER) \1 %U,' \
- -e 's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME},Icon=openofficeorg,' \
+ sed -e 's,Exec=$${UNIXPRODUCTNAME}$${PRODUCTVERSION} \(.*\)
%U,Exec=libreoffice$(VER) \1 %U,' \
+ -e 's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME},Icon=libreoffice,' \
-e 's,Name=$${PRODUCTNAME} $${PRODUCTVERSION},Name=LibreOffice
$(VER),' \
-e 's/ / /' \
< $$dirname/startcenter.desktop \
@@ -3250,8 +3250,8 @@
# menu files from sysui
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
mkdir -p -m755 $(PKGDIR)-filter-mobiledev/usr/share/applications ;\
- sed -e 's,Exec=$${UNIXPRODUCTNAME}$${PRODUCTVERSION} \(.*\)
%U,Exec=ooffice$(VER) \1 %U,' \
- -e 's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME},Icon=openofficeorg,' \
+ sed -e 's,Exec=$${UNIXPRODUCTNAME}$${PRODUCTVERSION} \(.*\)
%U,Exec=libreoffice$(VER) \1 %U,' \
+ -e 's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME},Icon=libreoffice,' \
-e 's,Name=$${PRODUCTNAME} $${PRODUCTVERSION},Name=LibreOffice
$(VER),' \
-e 's/ / /' \
< $$dirname/javafilter.desktop \
