------------------------------------------------------------
revno: 1311
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-11-18 01:29:22 +0100
message:
fix icon and install openoffice.org.xml; fix merge error
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-11-17 23:13:59 +0000
+++ b/changelog 2008-11-18 00:29:22 +0000
@@ -10,13 +10,12 @@
- update ENABLE_GIO conditional, either we want gio or gnome-vfs
- install extension.desktop again (to
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop) and
- install icons for it from ooo-build (though nautilus/KDE4 doesn't
- recognize it)
- - don't add | java2-runtime to JAVA_RUNTIME_DEPENDS as we don't work
+ install icons for it from ooo-build. Also actually install
+ openoffice.org.xml for shared-mime-info (closes: #502737)
+ - don't add | java5-runtime to JAVA_RUNTIME_DEPENDS as we don't work
with cacao-oj6
* debian/startcenter.desktop.in:
- - MimeType=application/vnd.openoffice.org.extension so that at leat
- Mozilla and KDE3 know what to do with oxts (closes: #502737)
+ - MimeType=application/vnd.openoffice.org.extension
* debian/control.postgresql.in:
- only suggest postgresql
* debian/control.in:
=== modified file 'rules'
--- a/rules 2008-11-17 23:13:59 +0000
+++ b/rules 2008-11-18 00:29:22 +0000
@@ -2607,7 +2607,8 @@
install -m644 $$f $(CURDIR)/$(PKGDIR)-common/usr/share/icons/$$f ||
exit 1 ;\
done && cd ../../.. && rm -rf usr etc
- # install .applications, .keys and .mime
+ # install .applications, .keys, .mime and openoffice.org.xml for
+ # shared-mime-info
mkdir -p $(PKGDIR)-common/usr/share/application-registry && \
cat $(SOURCE_TREE)/sysui/desktop/mimetypes/openoffice.applications \
| sed -e s/OFFICENAME/ooffice/g \
@@ -2621,8 +2622,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/startcenter.desktop.in \
@@ -2968,7 +2969,7 @@
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=openofficeorg3.*-extension/Icon=application-vnd.openofficeorg.extension.png/"
$(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
+ perl -pi -e
"s/Icon=openofficeorg.*-extension/Icon=application-vnd.openofficeorg.extension.png/"
$(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
endif
# fix permission
