Commit a901192e authored by Jonathan Blandford Blandford's avatar Jonathan Blandford Blandford
Browse files

Tue Jan 20 10:22:44 2004 Jonathan Blandford <jrb@gnome.org>

        * configure.in: Patch from Alex Larsson <alexl@redhat.com> to
        conditionally disable running update-mimedb for packages.

        * freedesktop.org.xml.in: Patch from Alex Larsson
        <alexl@redhat.com> to fix up RIFF and shell magic, as well as
        merging diff files and patch files.
parent aa2b9809
Tue Jan 20 10:22:44 2004 Jonathan Blandford <jrb@gnome.org>
* configure.in: Patch from Alex Larsson <alexl@redhat.com> to
conditionally disable running update-mimedb for packages.
* freedesktop.org.xml.in: Patch from Alex Larsson
<alexl@redhat.com> to fix up RIFF and shell magic, as well as
merging diff files and patch files.
Wed Jan 14 16:45:26 2004 Jonathan Blandford <jrb@gnome.org>
* configure.in: I already tagged CVS so I'm releasing 0.13.1 to
......@@ -17,7 +26,7 @@ Wed Jan 14 16:23:22 2004 Jonathan Blandford <jrb@gnome.org>
* Makefile.am: Make pass distcheck.
* freedesktop.or.xml.in: Update DTD to deal with xml:lang
* freedesktop.org.xml.in: Update DTD to deal with xml:lang
Tue Jan 13 16:32:03 2004 Jonathan Blandford <jrb@gnome.org>
......
......@@ -31,7 +31,9 @@ LDFLAGS = @LDFLAGS@ `@PKG_CONFIG@ --libs libxml-2.0 glib-2.0`
@INTLTOOL_DESKTOP_RULE@
install-data-hook:
if ENABLE_UPDATE_MIMEDB
$(DESTDIR)"$(bindir)/update-mime-database" "$(DESTDIR)${mimedir}"
endif
uninstall-hook:
for media in text application image audio inode video message model multipart; do rm -f "$(DESTDIR)${mimedir}/$${media}/"*.xml; done
......
......@@ -64,6 +64,12 @@ if test "x$GCC" = "xyes"; then
esac
fi
]
AC_ARG_ENABLE(update-mimedb,
AC_HELP_STRING([--disable-update-mimedb],
[disable the update-mime-database after install [default=no]]),,
enable_update_mimedb=yes)
AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
......
This diff is collapsed.
......@@ -964,6 +964,10 @@ command to generate the output files.
<_comment>Lzopped File</_comment>
<glob pattern="*.lzo"/>
</mime-type>
<mime-type type="application/x-magicpoint">
<_comment>MagicPoint presentation</_comment>
<glob pattern="*.mgp"/>
</mime-type>
<mime-type type="application/x-macbinary">
<_comment>MacBinary file</_comment>
<magic priority="50">
......@@ -1201,6 +1205,12 @@ command to generate the output files.
<match type="string" value="/bin/csh" offset="1:16"/>
<match type="string" value="/bin/zsh" offset="1:16"/>
<match type="string" value="/bin/sh" offset="1:16"/>
<match type="string" value="#!/usr/bin/env sh" offset="0"/>
<match type="string" value="#!/usr/bin/env bash" offset="0"/>
<match type="string" value="#!/usr/bin/env csh" offset="0"/>
<match type="string" value="#!/usr/bin/env tcsh" offset="0"/>
<match type="string" value="#!/usr/bin/env zsh" offset="0"/>
</magic>
<glob pattern="*.sh"/>
<glob pattern="*.csh"/>
......@@ -1412,7 +1422,7 @@ command to generate the output files.
<glob pattern="*.it"/>
</mime-type>
<mime-type type="audio/midi">
<alias type='audio/x-midi'/>
<alias type="audio/x-midi"/>
<_comment>MIDI audio</_comment>
<magic priority="50">
<match type="string" value="MThd" offset="0"/>
......@@ -1468,7 +1478,8 @@ command to generate the output files.
</mime-type>
<mime-type type="audio/x-riff">
<_comment>RIFF audio</_comment>
<magic priority="50">
<!-- need to be lower prio than avi -->
<magic priority="45">
<match type="string" value="RIFF" offset="0"/>
</magic>
</mime-type>
......@@ -2036,17 +2047,6 @@ command to generate the output files.
<_comment>DCL script</_comment>
<glob pattern="*.dcl"/>
</mime-type>
<mime-type type="text/x-diff">
<_comment>Differences between files</_comment>
<magic priority="50">
<match type="string" value="diff\t" offset="0"/>
<match type="string" value="***\t" offset="0"/>
<match type="string" value="Only in\t" offset="0"/>
<match type="string" value="Common subdirectories: " offset="0"/>
</magic>
<glob pattern="*.diff"/>
<glob pattern="*.patch"/>
</mime-type>
<mime-type type="text/x-dsl">
<_comment>DSSSL document</_comment>
<glob pattern="*.dsl"/>
......@@ -2126,14 +2126,19 @@ command to generate the output files.
<glob pattern="*.pas"/>
</mime-type>
<mime-type type="text/x-patch">
<_comment>source code patch</_comment>
<_comment>Differences between files</_comment>
<magic priority="50">
<match type="string" value="diff\t" offset="0"/>
<match type="string" value="diff " offset="0"/>
<match type="string" value="Index:" offset="0"/>
<match type="string" value="***\t" offset="0"/>
<match type="string" value="*** " offset="0"/>
<match type="string" value="Only in\t" offset="0"/>
<match type="string" value="Only in " offset="0"/>
<match type="string" value="Common subdirectories: " offset="0"/>
<match type="string" value="Index:" offset="0"/>
</magic>
<glob pattern="*.diff"/>
<glob pattern="*.patch"/>
</mime-type>
<mime-type type="text/x-readme">
<_comment>README document</_comment>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment