diff options
| author | Bastien Nocera <hadess@hadess.net> | 2008-06-02 17:23:31 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2008-06-02 17:23:31 +0000 |
| commit | 9d4b8feec9e95e854f63efa76ec4361f1b62c9d5 (patch) | |
| tree | 03e520c7c590c6088c7d7e7d91c06f4af30d0e04 | |
| parent | 0f39f669e23e998ed7e88d65a2951b4b1849e9fe (diff) | |
| download | shared-mime-info-9d4b8feec9e95e854f63efa76ec4361f1b62c9d5.tar.gz | |
* freedesktop.org.xml.in: Fix pack200 magic, remove useless gtkrc
mime-type (doesn't match gtk+ 2.0 config files, and no need for
mime-types for dot files)
* Makefile.am: When the test suite fails, relaunch it with more
verbose so we can fix the error
* tests/list: MicroDVD subs can now be matched
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | freedesktop.org.xml.in | 10 | ||||
| -rw-r--r-- | tests/list | 2 |
4 files changed, 14 insertions, 11 deletions
@@ -1,5 +1,16 @@ 2008-06-02 Bastien Nocera <hadess@hadess.net> + * freedesktop.org.xml.in: Fix pack200 magic, remove useless gtkrc + mime-type (doesn't match gtk+ 2.0 config files, and no need for + mime-types for dot files) + + * Makefile.am: When the test suite fails, relaunch it with more + verbose so we can fix the error + + * tests/list: MicroDVD subs can now be matched + +2008-06-02 Bastien Nocera <hadess@hadess.net> + * shared-mime-info-spec.xml: Patch from Matthias Clasen <mclasen@redhat.com> to update the spec to match the current implementation diff --git a/Makefile.am b/Makefile.am index fee7a6ef..4fe07a90 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,7 +66,7 @@ check: mkdir -p $(top_builddir)/temp-mime-dir/mime/packages ; \ cp -a $(top_builddir)/freedesktop.org.xml $(top_builddir)/temp-mime-dir/mime/packages/ ; \ XDG_DATA_DIRS="$(top_builddir)/temp-mime-dir/" $(top_builddir)/update-mime-database "$(top_builddir)/temp-mime-dir/mime/" ; \ - XDG_DATA_DIRS="$(top_builddir)/temp-mime-dir/" ../xdgmime/src/test-mime-data -v tests/list || exit 1; \ + XDG_DATA_DIRS="$(top_builddir)/temp-mime-dir/" ../xdgmime/src/test-mime-data -v tests/list || (XDG_DATA_DIRS="$(top_builddir)/temp-mime-dir/" ../xdgmime/src/test-mime-data -v -v tests/list ; exit 1); \ rm -rf "$(top_builddir)/temp-mime-dir/" ; \ fi @if `grep comment $(srcdir)/freedesktop.org.xml.in | grep -v _comment | grep -q -v '<!'` ; then \ diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in index f435595f..9a1cc7f1 100644 --- a/freedesktop.org.xml.in +++ b/freedesktop.org.xml.in @@ -1612,9 +1612,7 @@ command to generate the output files. <_comment>Pack200 Java archive</_comment> <generic-icon name="package-x-generic"/> <magic priority="50"> - <match type="host16" value="0xcafe" offset="0"> - <match type="host16" value="0xd00d" offset="2"/> - </match> + <match type="big32" value="0xcafed00d" offset="0"/> </magic> <glob pattern="*.pack"/> </mime-type> @@ -4122,12 +4120,6 @@ command to generate the output files. <glob pattern="*.html"/> <glob pattern="*.htm"/> </mime-type> - <mime-type type="text/x-gtkrc"> - <_comment>GTK+ configuration</_comment> - <sub-class-of type="text/plain"/> - <glob pattern="gtkrc"/> - <glob pattern=".gtkrc"/> - </mime-type> <mime-type type="text/x-google-video-pointer"> <_comment>Google Video Pointer</_comment> <magic priority="50"> @@ -65,7 +65,7 @@ subtitle.srt application/x-subrip # Copied from http://msdn2.microsoft.com/en-us/library/ms971327.aspx subtitle.smi application/x-sami x # Copied from http://www1.mplayerhq.hu/MPlayer/samples/sub/Lola.sub/Run.Lola.Run.1998.DVDivX-SChiZO.sub -subtitle-microdvd.sub text/x-microdvd x +subtitle-microdvd.sub text/x-microdvd # Copied from http://www1.mplayerhq.hu/MPlayer/samples/sub/manyfmts/FOVH%20MoviePlayer.sub subtitle-mpsub.sub text/x-mpsub x # Copied from http://en.wikipedia.org/wiki/SubStation_Alpha |