./packages/openofficeorg/3.0.1/experimental r1385: don't add double text/rtf
------------------------------------------------------------
revno: 1385
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2009-01-21 03:51:22 +0100
message:
don't add double text/rtf
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-01-21 02:37:17 +0000
+++ b/changelog 2009-01-21 02:51:22 +0000
@@ -9,6 +9,8 @@
and we bump .shlibs anyway
- create .so symlinks in UREs dir in -dev so that we have some even if
the SDK mechanism which creates a dir in $HOME fails.
+ - stop adding a extra text/rtf as writer.desktop now already contains
+ it upstream (closes: #512417)
* debian/control.in:
- make -common conflict against dictionaries-common (<< 0.98.14)
- move from Breaks: to Conflicts: as otherwise the experimental buildds
@@ -16,7 +18,7 @@
* merge from Ubuntu:
- make ure only Suggest a JRE
- -- Rene Engelhard <rene@debian.org> Wed, 21 Jan 2009 02:06:39 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 21 Jan 2009 03:49:36 +0100
openoffice.org (1:3.0.1~rc2-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2009-01-21 02:37:17 +0000
+++ b/rules 2009-01-21 02:51:22 +0000
@@ -2186,8 +2186,6 @@
echo 'X-KDE-Protocols=file,http,smb,ftp,webdav' >> $$f; \
fi; \
done
- sed -i -e 's,;application/rtf,;application/rtf;text/rtf,' \
- $(PKGDIR)-writer/usr/share/applications/ooo$(VER)-writer.desktop
sed -i -e 's/Office;/Office;Graphics;/' $(PKGDIR)-draw/usr/share/applications/ooo$(VER)-draw.desktop
# invalid, according to lintian. make it shut up.
for i in writer calc impress draw math base; do \
Reply to: