[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-1-25-g61a8f21
The following commit has been merged in the master branch:
commit 61a8f219cc41927f47f338e5f37e6b3c5d8301d5
Author: Rene Engelhard <rene@debian.org>
Date: Sat Sep 17 08:31:49 2011 +0000
fix mimetype icon links for hicolor (closes: #641860)
diff --git a/changelog b/changelog
index 629e4c8..99b59af 100644
--- a/changelog
+++ b/changelog
@@ -23,11 +23,13 @@ libreoffice (1:3.4.3-2) UNRELEASED; urgency=low
* debian/rules:
- re-enable -sdbc-postgresql
- fix adding PYTHONPATH to unopkg (closes: #625878)
+ * debian/libreoffice-common.links, debian/rules:
+ - fix mimetype icon links for hicolor (closes: #641860)
[ Lionel Elie Mamane ]
* debian/rules: we need translate-toolkit (>= 1.9.0)
- -- Rene Engelhard <rene@debian.org> Fri, 16 Sep 2011 14:10:06 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 17 Sep 2011 08:28:13 +0000
libreoffice (1:3.4.3-1) unstable; urgency=low
diff --git a/libreoffice-common.links.in b/libreoffice-common.links.in
index be8c18d..b763942 100644
--- a/libreoffice-common.links.in
+++ b/libreoffice-common.links.in
@@ -1,36 +1,36 @@
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-database.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.database.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-drawing.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.drawing.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-drawing-template.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-formula.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.formula.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-master-document.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.master-document.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-presentation.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.presentation.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-presentation-template.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-spreadsheet.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-spreadsheet-template.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-text.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.text.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-text-template.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.text-template.png
-usr/share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-web-template.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.web-template.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-database.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.database.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-drawing.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.drawing.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-drawing-template.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-formula.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.formula.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-master-document.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.master-document.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-presentation.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.presentation.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-presentation-template.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-spreadsheet.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-spreadsheet-template.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-text.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.text.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-text-template.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.text-template.png
-usr/share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-web-template.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.web-template.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-database.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.database.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-drawing.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.drawing.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-drawing-template.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-formula.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.formula.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-master-document.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.master-document.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-presentation.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.presentation.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-presentation-template.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-spreadsheet.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-spreadsheet-template.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-text.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.text.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-text-template.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.text-template.png
-usr/share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-web-template.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.web-template.png
+usr/share/icons/hicolor/16x16/mimetypes/libreoffice@ICONVERSION@-oasis-database.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.database.png
+usr/share/icons/hicolor/16x16/mimetypes/libreoffice@ICONVERSION@-oasis-drawing.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.drawing.png
+usr/share/icons/hicolor/16x16/mimetypes/libreoffice@ICONVERSION@-oasis-drawing-template.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
+usr/share/icons/hicolor/16x16/mimetypes/libreoffice@ICONVERSION@-oasis-formula.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.formula.png
+usr/share/icons/hicolor/16x16/mimetypes/libreoffice@ICONVERSION@-oasis-master-document.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.master-document.png
+usr/share/icons/hicolor/16x16/mimetypes/libreoffice@ICONVERSION@-oasis-presentation.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.presentation.png
+usr/share/icons/hicolor/16x16/mimetypes/libreoffice@ICONVERSION@-oasis-presentation-template.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
+usr/share/icons/hicolor/16x16/mimetypes/libreoffice@ICONVERSION@-oasis-spreadsheet.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
+usr/share/icons/hicolor/16x16/mimetypes/libreoffice@ICONVERSION@-oasis-spreadsheet-template.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
+usr/share/icons/hicolor/16x16/mimetypes/libreoffice@ICONVERSION@-oasis-text.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.text.png
+usr/share/icons/hicolor/16x16/mimetypes/libreoffice@ICONVERSION@-oasis-text-template.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.text-template.png
+usr/share/icons/hicolor/16x16/mimetypes/libreoffice@ICONVERSION@-oasis-web-template.png usr/share/icons/hicolor/16x16/mimetypes/application-vnd.oasis.opendocument.web-template.png
+usr/share/icons/hicolor/32x32/mimetypes/libreoffice@ICONVERSION@-oasis-database.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.database.png
+usr/share/icons/hicolor/32x32/mimetypes/libreoffice@ICONVERSION@-oasis-drawing.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.drawing.png
+usr/share/icons/hicolor/32x32/mimetypes/libreoffice@ICONVERSION@-oasis-drawing-template.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
+usr/share/icons/hicolor/32x32/mimetypes/libreoffice@ICONVERSION@-oasis-formula.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.formula.png
+usr/share/icons/hicolor/32x32/mimetypes/libreoffice@ICONVERSION@-oasis-master-document.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.master-document.png
+usr/share/icons/hicolor/32x32/mimetypes/libreoffice@ICONVERSION@-oasis-presentation.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.presentation.png
+usr/share/icons/hicolor/32x32/mimetypes/libreoffice@ICONVERSION@-oasis-presentation-template.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
+usr/share/icons/hicolor/32x32/mimetypes/libreoffice@ICONVERSION@-oasis-spreadsheet.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
+usr/share/icons/hicolor/32x32/mimetypes/libreoffice@ICONVERSION@-oasis-spreadsheet-template.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
+usr/share/icons/hicolor/32x32/mimetypes/libreoffice@ICONVERSION@-oasis-text.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.text.png
+usr/share/icons/hicolor/32x32/mimetypes/libreoffice@ICONVERSION@-oasis-text-template.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.text-template.png
+usr/share/icons/hicolor/32x32/mimetypes/libreoffice@ICONVERSION@-oasis-web-template.png usr/share/icons/hicolor/32x32/mimetypes/application-vnd.oasis.opendocument.web-template.png
+usr/share/icons/hicolor/48x48/mimetypes/libreoffice@ICONVERSION@-oasis-database.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.database.png
+usr/share/icons/hicolor/48x48/mimetypes/libreoffice@ICONVERSION@-oasis-drawing.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.drawing.png
+usr/share/icons/hicolor/48x48/mimetypes/libreoffice@ICONVERSION@-oasis-drawing-template.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
+usr/share/icons/hicolor/48x48/mimetypes/libreoffice@ICONVERSION@-oasis-formula.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.formula.png
+usr/share/icons/hicolor/48x48/mimetypes/libreoffice@ICONVERSION@-oasis-master-document.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.master-document.png
+usr/share/icons/hicolor/48x48/mimetypes/libreoffice@ICONVERSION@-oasis-presentation.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.presentation.png
+usr/share/icons/hicolor/48x48/mimetypes/libreoffice@ICONVERSION@-oasis-presentation-template.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
+usr/share/icons/hicolor/48x48/mimetypes/libreoffice@ICONVERSION@-oasis-spreadsheet.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
+usr/share/icons/hicolor/48x48/mimetypes/libreoffice@ICONVERSION@-oasis-spreadsheet-template.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
+usr/share/icons/hicolor/48x48/mimetypes/libreoffice@ICONVERSION@-oasis-text.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.text.png
+usr/share/icons/hicolor/48x48/mimetypes/libreoffice@ICONVERSION@-oasis-text-template.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.text-template.png
+usr/share/icons/hicolor/48x48/mimetypes/libreoffice@ICONVERSION@-oasis-web-template.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.web-template.png
diff --git a/rules b/rules
index 9dae019..7797a61 100755
--- a/rules
+++ b/rules
@@ -3146,6 +3146,7 @@ endif
if [ -e $$LINKS.in ]; then \
sed -e "s/\@LIBSUFFIX\@/$(LIBSUFFIX)/g" \
-e "s#\@OOBASISDIR\@#$(OOBASISDIR)#g" \
+ -e "s#/@ICONVERSION@/$(shell echo $(OOVER) | sed -e "s/\.//g")" \
< $$LINKS.in > $$LINKS ; \
fi; \
done
--
LibreOffice packaging repository
Reply to: