The following commit has been merged in the debian-experimental-3.5 branch:
commit f472e9ae01d4dce84cf546bea84e1584b9fb3477
Author: Rene Engelhard <r...@debian.org>
Date: Tue Dec 27 10:52:42 2011 +0100
@ICONVERSION@ seems to be unneded now (fix debian menu and mimeytype icons)
diff --git a/libreoffice-base.menu.in b/libreoffice-base.menu.in
index 378be53..6a2f4c4 100644
--- a/libreoffice-base.menu.in
+++ b/libreoffice-base.menu.in
@@ -1,4 +1,4 @@
?package(libreoffice-base):needs="X11" section="Applications/Data Management" \
title="LibreOffice Base" command="/usr/bin/libreoffice --base"\
kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/libreoffice@iconvers...@-base.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-base.xpm"
diff --git a/libreoffice-calc.menu.in b/libreoffice-calc.menu.in
index 70d2a57..3927362 100644
--- a/libreoffice-calc.menu.in
+++ b/libreoffice-calc.menu.in
@@ -2,4 +2,4 @@
title="LibreOffice Calc" command="/usr/bin/libreoffice --calc"\
hints="Spreadsheets"\
kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/libreoffice@iconvers...@-calc.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-calc.xpm"
diff --git a/libreoffice-common.links.in b/libreoffice-common.links.in
index 2e7c390..577c935 100644
--- a/libreoffice-common.links.in
+++ b/libreoffice-common.links.in
@@ -1,37 +1,37 @@
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice@iconvers...@-oasis-database.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.database.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice@iconvers...@-oasis-drawing.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.drawing.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice@iconvers...@-oasis-drawing-template.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice@iconvers...@-oasis-formula.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.formula.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice@iconvers...@-oasis-master-document.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.master-document.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice@iconvers...@-oasis-presentation.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.presentation.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice@iconvers...@-oasis-presentation-template.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice@iconvers...@-oasis-spreadsheet.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice@iconvers...@-oasis-spreadsheet-template.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice@iconvers...@-oasis-text.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.text.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice@iconvers...@-oasis-text-template.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.text-template.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice@iconvers...@-oasis-web-template.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.web-template.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice@iconvers...@-oasis-database.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.database.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice@iconvers...@-oasis-drawing.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.drawing.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice@iconvers...@-oasis-drawing-template.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice@iconvers...@-oasis-formula.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.formula.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice@iconvers...@-oasis-master-document.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.master-document.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice@iconvers...@-oasis-presentation.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.presentation.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice@iconvers...@-oasis-presentation-template.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice@iconvers...@-oasis-spreadsheet.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice@iconvers...@-oasis-spreadsheet-template.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice@iconvers...@-oasis-text.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.text.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice@iconvers...@-oasis-text-template.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.text-template.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice@iconvers...@-oasis-web-template.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.web-template.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice@iconvers...@-oasis-database.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.database.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice@iconvers...@-oasis-drawing.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.drawing.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice@iconvers...@-oasis-drawing-template.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice@iconvers...@-oasis-formula.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.formula.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice@iconvers...@-oasis-master-document.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.master-document.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice@iconvers...@-oasis-presentation.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.presentation.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice@iconvers...@-oasis-presentation-template.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice@iconvers...@-oasis-spreadsheet.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice@iconvers...@-oasis-spreadsheet-template.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice@iconvers...@-oasis-text.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.text.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice@iconvers...@-oasis-text-template.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.text-template.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice@iconvers...@-oasis-web-template.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.web-template.png
+usr/share/icons/hicolor/16x16/mimetypes/libreofficeoasis-database.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.database.png
+usr/share/icons/hicolor/16x16/mimetypes/libreofficeoasis-drawing.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.drawing.png
+usr/share/icons/hicolor/16x16/mimetypes/libreofficeoasis-drawing-template.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
+usr/share/icons/hicolor/16x16/mimetypes/libreofficeoasis-formula.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.formula.png
+usr/share/icons/hicolor/16x16/mimetypes/libreofficeoasis-master-document.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.master-document.png
+usr/share/icons/hicolor/16x16/mimetypes/libreofficeoasis-presentation.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.presentation.png
+usr/share/icons/hicolor/16x16/mimetypes/libreofficeoasis-presentation-template.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
+usr/share/icons/hicolor/16x16/mimetypes/libreofficeoasis-spreadsheet.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
+usr/share/icons/hicolor/16x16/mimetypes/libreofficeoasis-spreadsheet-template.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
+usr/share/icons/hicolor/16x16/mimetypes/libreofficeoasis-text.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.text.png
+usr/share/icons/hicolor/16x16/mimetypes/libreofficeoasis-text-template.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.text-template.png
+usr/share/icons/hicolor/16x16/mimetypes/libreofficeoasis-web-template.png
usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.web-template.png
+usr/share/icons/hicolor/32x32/mimetypes/libreofficeoasis-database.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.database.png
+usr/share/icons/hicolor/32x32/mimetypes/libreofficeoasis-drawing.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.drawing.png
+usr/share/icons/hicolor/32x32/mimetypes/libreofficeoasis-drawing-template.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
+usr/share/icons/hicolor/32x32/mimetypes/libreofficeoasis-formula.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.formula.png
+usr/share/icons/hicolor/32x32/mimetypes/libreofficeoasis-master-document.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.master-document.png
+usr/share/icons/hicolor/32x32/mimetypes/libreofficeoasis-presentation.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.presentation.png
+usr/share/icons/hicolor/32x32/mimetypes/libreofficeoasis-presentation-template.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
+usr/share/icons/hicolor/32x32/mimetypes/libreofficeoasis-spreadsheet.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
+usr/share/icons/hicolor/32x32/mimetypes/libreofficeoasis-spreadsheet-template.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
+usr/share/icons/hicolor/32x32/mimetypes/libreofficeoasis-text.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.text.png
+usr/share/icons/hicolor/32x32/mimetypes/libreofficeoasis-text-template.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.text-template.png
+usr/share/icons/hicolor/32x32/mimetypes/libreofficeoasis-web-template.png
usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.web-template.png
+usr/share/icons/hicolor/48x48/mimetypes/libreofficeoasis-database.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.database.png
+usr/share/icons/hicolor/48x48/mimetypes/libreofficeoasis-drawing.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.drawing.png
+usr/share/icons/hicolor/48x48/mimetypes/libreofficeoasis-drawing-template.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
+usr/share/icons/hicolor/48x48/mimetypes/libreofficeoasis-formula.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.formula.png
+usr/share/icons/hicolor/48x48/mimetypes/libreofficeoasis-master-document.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.master-document.png
+usr/share/icons/hicolor/48x48/mimetypes/libreofficeoasis-presentation.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.presentation.png
+usr/share/icons/hicolor/48x48/mimetypes/libreofficeoasis-presentation-template.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
+usr/share/icons/hicolor/48x48/mimetypes/libreofficeoasis-spreadsheet.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
+usr/share/icons/hicolor/48x48/mimetypes/libreofficeoasis-spreadsheet-template.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
+usr/share/icons/hicolor/48x48/mimetypes/libreofficeoasis-text.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.text.png
+usr/share/icons/hicolor/48x48/mimetypes/libreofficeoasis-text-template.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.text-template.png
+usr/share/icons/hicolor/48x48/mimetypes/libreofficeoasis-web-template.png
usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.web-template.png
@OODIR@/share/xdg/startcenter.desktop
usr/share/applications/libreoffice-startcenter.desktop
diff --git a/libreoffice-draw.menu.in b/libreoffice-draw.menu.in
index bd0cf4f..4583871 100644
--- a/libreoffice-draw.menu.in
+++ b/libreoffice-draw.menu.in
@@ -2,4 +2,4 @@
title="LibreOffice Draw" command="/usr/bin/libreoffice --draw"\
hints="Drawing"\
kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/libreoffice@iconvers...@-draw.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-draw.xpm"
diff --git a/libreoffice-impress.menu.in b/libreoffice-impress.menu.in
index 6b6634b..d52e24a 100644
--- a/libreoffice-impress.menu.in
+++ b/libreoffice-impress.menu.in
@@ -2,4 +2,4 @@
title="LibreOffice Impress" command="/usr/bin/libreoffice --impress"\
hints="Presentation"\
kderemove="y"\
-
icon="/usr/share/icons/hicolor/32x32/apps/libreoffice@iconvers...@-impress.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-impress.xpm"
diff --git a/libreoffice-math.menu.in b/libreoffice-math.menu.in
index b2b1958..60d883a 100644
--- a/libreoffice-math.menu.in
+++ b/libreoffice-math.menu.in
@@ -2,4 +2,4 @@
title="LibreOffice Math" command="/usr/bin/libreoffice --math"\
hints="Equation,Editor,Formula"\
kderemove="y"\
- icon="/usr/share/icons/hicolor/32x32/apps/libreoffice@iconvers...@-math.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-math.xpm"
diff --git a/libreoffice-writer.menu.in b/libreoffice-writer.menu.in
index 0af57c1..6be2556 100644
--- a/libreoffice-writer.menu.in
+++ b/libreoffice-writer.menu.in
@@ -2,4 +2,4 @@
title="LibreOffice Writer" command="/usr/bin/libreoffice --writer"\
hints="Word Processors"\
kderemove="y"\
-
icon="/usr/share/icons/hicolor/32x32/apps/libreoffice@iconvers...@-writer.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/libreoffice-writer.xpm"
diff --git a/rules b/rules
index f5add6e..3b26235 100755
--- a/rules
+++ b/rules
@@ -2085,7 +2085,6 @@ endif
for i in base calc draw impress math writer; do \
cat debian/libreoffice$(VER)-$$i.menu.in \
| sed -e s/@VER@/$(VER)/ \
- | sed -e s,@ICONVERSION@,$(shell echo $(OOVER) | sed -e
"s/\.//g"), \
> debian/libreoffice$(VER)-$$i.menu; \
done; \
for i in base calc core draw impress math writer; do \
@@ -2607,7 +2606,6 @@ endif
LINKS=debian/$$PKG.links ; \
if [ -e $$LINKS.in ]; then \
sed -e "s#\@OODIR\@#$(OODIR)#g" \
- -e "s/@ICONVERSION@/$(shell echo $(OOVER) | sed -e "s/\.//g")/"
\
< $$LINKS.in > $$LINKS ; \
fi; \
done
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rfu49-0004pl...@vasks.debian.org
