------------------------------------------------------------
revno: 1315
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-11-24 22:11:41 +0100
message:
merge; fix header
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.194
committer: Rene Engelhard <[EMAIL PROTECTED]>
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
------------------------------------------------------------
revno: 1022.1.195
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-11-18 02:21:00 +0100
message:
dh_installmime
modified:
rules
------------------------------------------------------------
revno: 1022.1.196
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-11-24 00:06:55 +0100
message:
mention pythonloader-no-DEBUG.diff
modified:
changelog
------------------------------------------------------------
revno: 1022.1.197
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
------------------------------------------------------------
revno: 1022.1.198
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-11-24 22:00:12 +0100
message:
one YYxxYY too much
modified:
rules
=== modified file 'changelog'
--- a/changelog 2008-11-23 22:52:36 +0000
+++ b/changelog 2008-11-24 21:11:41 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:3.0.0-3.4pre) experimental; urgency=low
+openoffice.org (1:3.0.0-4.5pre) experimental; urgency=low
* ooo-build:
- update (r14582)
@@ -10,7 +10,7 @@
- src: update GSIs from ftp.linux.cz
* debian/rules:
- update ENABLE_GIO conditional, either we want gio or gnome-vfs
- - install extension.desktop again (to
+ - 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)
=== modified file 'rules'
--- a/rules 2008-11-23 22:52:36 +0000
+++ b/rules 2008-11-24 21:11:41 +0000
@@ -2967,7 +2967,7 @@
>
$(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;
\
+
$(PKGDIR)-common/usr/share/icons/hicolor/$$i/mimetypes/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
endif
