./packages/openofficeorg/2.4.1/unstable r1216: actually install openoffice.org.xml for shared-mime-info
------------------------------------------------------------
revno: 1216
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-11-18 02:07:38 +0100
message:
actually install openoffice.org.xml for shared-mime-info
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-11-17 21:37:40 +0000
+++ b/changelog 2008-11-18 01:07:38 +0000
@@ -5,6 +5,8 @@
* 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)
* debian/control.in:
- conflict against cacao-oj6-jre (closes: #495694)
=== modified file 'rules'
--- a/rules 2008-11-17 21:31:12 +0000
+++ b/rules 2008-11-18 01:07:38 +0000
@@ -2430,8 +2430,8 @@
for i in $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/misc/openoffice.org/*.keys; do \
cat $$i >> $(PKGDIR)-common/usr/share/mime-info/openoffice.keys; \
done
-# install -m644 $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/misc/desktopshare/openoffice.org.xml \
-# $(PKGDIR)-common/usr/share/mime/packages
+ install -m644 $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/misc/openoffice.org/openoffice.org.xml \
+ $(PKGDIR)-common/usr/share/mime/packages
mkdir -p $(PKGDIR)-common/usr/share/applications
sed 's/@VER@/$(VER)/g' debian/template.desktop.in \
Reply to: