Re: Replace shared-mime-info with newer release before sarge releases?
On Sun, 2005-04-24 at 01:13 +0100, Stewart Jeacocke wrote:
> On Sat, 2005-04-23 at 23:01 +0200, J.H.M. Dassen (Ray) wrote:
> Here's a good starting point:
> > http://www.xinara.org/~ray/tmp/shared-mime-info_0.16-1debian1.diff.gz
> Ray has picked up the old incorrect patch for the xsl bug (#281894,
> #282986, #294908). The mime type for xsl should be application/xml
> (application/xslt+xml doesn't work with firefox)
I noticed a couple of problems with Ray's package and have attached a
couple of patches and a revised changelog entry which fix them.
Unfortunately, my admittedly clueless, attempts at modifying the package
have failed so I can't provide a diff.gz file.
Problems:
1) He thought that the x-eps fix was included in the 0.16 release.
However, it is still only in CVS HEAD. I have included a patch which
fixes most of the issues.
2) As previously noted he picked up the old incorrect patch for the xsl
bug. I have attached a corrected patch to this email.
--- shared-mime-info-0.16/freedesktop.org.xml.in.orig 2005-04-24 11:04:36.597702608 +0100
+++ shared-mime-info-0.16/freedesktop.org.xml.in 2005-04-24 11:05:48.124828832 +0100
@@ -1829,6 +1829,7 @@
</magic>
</mime-type>
<mime-type type="image/x-eps">
+ <sub-class-of type="application/postscript"/>
<_comment>Encapsulated PostScript image</_comment>
<magic priority="50">
<match type="string" value="%!" offset="0">
diff -ru shared-mime-info-0.16.old/freedesktop.org.xml.in shared-mime-info-0.16/freedesktop.org.xml.in
--- shared-mime-info-0.16.old/freedesktop.org.xml.in 2005-04-23 21:48:50.000000000 +0200
+++ shared-mime-info-0.16/freedesktop.org.xml.in 2005-04-23 21:50:24.000000000 +0200
@@ -2491,8 +2491,7 @@
<glob pattern="*.fo"/>
<glob pattern="*.xslfo"/>
</mime-type>
- <mime-type type="text/x-xslt">
- <sub-class-of type="text/plain"/>
+ <mime-type type="application/xml">
<_comment>XSLT stylesheet</_comment>
<sub-class-of type="text/xml"/>
<glob pattern="*.xslt"/>
shared-mime-info (0.16-1debian1) unstable; urgency=low
* New upstream release. (Closes: #305118)
Changes include:
* Corrected MIME type for MS Word files. (Closes: #276744)
* Support for Open Document files as used by OpenOffice 2.0 added.
(Closes: #264313)
* Magic for magic for audio/x-scpls (MP3 ShoutCast playlist) has been
added. (Closes: #257034)
Followed changes made in Ubuntu:
* [debian/patches/000_install-strip.patch] Removed, should not be needed.
* [debian/patches/004_lotus-mime.patch] Removed, the changes are in the
upstream code.
Debian changes:
* [debian/patches/004_xslt-fix.patch] Added. Corrects MIME type for XSL
files. (Closes: #281894, #282986, #294908)
* [debian/patches/006_spreadsheet-related.patch] Added. Additions and
enhancements for several spreadsheet related types. (Closes: #258587)
* [debian/patches/007_x-crw.patch] Added: Cannon RAW files. (Closes: #256049)
* [debian/patches/008_subclass-x-eps.patch] Added. Makes x-eps a subclass of
application/postscript (Closes: #259652)
Reply to: