------------------------------------------------------------
revno: 1219
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-11-24 19:01:26 +0100
message:
also install extension.desktop defining the MimeType and the ooo-build icons
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-11-23 23:06:55 +0000
+++ b/changelog 2008-11-24 18:01:26 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:2.4.1-12.13pre) unstable; urgency=low
+openoffice.org (1:2.4.1-12.13pre) unstable; urgency=medium
* ooo-build:
- update (r14583)
@@ -9,8 +9,10 @@
* debian/rules:
- don't add | java2-runtime to JAVA_RUNTIME_DEPENDS as we don't work
with cacao-oj6
- - actually install openoffice.org.xml for shared-mime-info
- (adresses #502737 at least for nautilus)
+ - install the extension.desktop with Type=MimeType (to
+ /usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop) and
+ install icons for it from ooo-build. Also actually install
+ openoffice.org.xml for shared-mime-info (closes: #502737)
* debian/control.in:
- conflict against cacao-oj6-jre (closes: #495694)
=== modified file 'rules'
--- a/rules 2008-11-18 01:21:00 +0000
+++ b/rules 2008-11-24 18:01:26 +0000
@@ -2767,6 +2767,17 @@
-e 's/ / /' \
< $$dirname/extension.desktop \
>
$(PKGDIR)-common/usr/share/applications/ooo$(VER)-extension.desktop || exit 1
+ dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/misc/openoffice.org >/dev/null; pwd`" ;\
+ mkdir -p -m755 $(PKGDIR)-common/usr/share/mimelnk/application ;\
+ sed -e 's,Comment=Extension,Comment=OpenOffice.org $(VER) Extension,' \
+ -e 's/ / /' \
+ < $$dirname/extension.desktop \
+ >
$(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
|| exit 1
+ for i in 16x16 22x22 24x24 32x32 48x48; do \
+ install -D -m644
$(CURDIR)/ooo-build/desktop/mimetypes/$$i/application-vnd.openofficeorg.extension.png
\
+
$(PKGDIR)-common/usr/share/icons/hicolor/$$i/mimetypes/$$i/application-vnd.openofficeorg.extension.png;
\
+ done
+ perl -pi -e
"s/Icon=openofficeorg.*-extension/Icon=application-vnd.openofficeorg.extension.png/"
$(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
sed -i -e 's/Application;//'
$(PKGDIR)-common/usr/share/applications/ooo$(VER)-extension.desktop
sed -i -e 's/Office;/Office;System;/'
$(PKGDIR)-common/usr/share/applications/ooo$(VER)-extension.desktop
endif
