diff --exclude=CVS -Nurp concordance/libconcord/configure.ac concordance-mod/libconcord/configure.ac --- concordance/libconcord/configure.ac 2009-03-08 20:52:41.000000000 +0200 +++ concordance-mod/libconcord/configure.ac 2009-07-12 17:58:03.000000000 +0300 @@ -2,6 +2,23 @@ AC_INIT([libconcord], [0.21], [bug-autom AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_PROG_LIBTOOL AC_PROG_CXX +# +# allow the user to disable the mime database update +# +AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no) +HAVE_NEW_MIME=no +AC_ARG_ENABLE(mime-update, + AS_HELP_STRING([--disable-mime-update], + [Disable the MIME database update])], + [disable_mime=yes], + [disable_mime=no]) +if test "x$disable_mime" = "xno"; then + if test "x$UPDATE_MIME_DATABASE" != "xno"; then + HAVE_NEW_MIME=yes + AC_DEFINE(HAVE_NEW_MIME,1,[update mime database?]) + fi +fi +AM_CONDITIONAL(HAVE_NEW_MIME, test x$HAVE_NEW_MIME = xyes) a=1 AC_CHECK_HEADER(usb.h, [], [a=0]) AC_CHECK_LIB(usb, usb_init, [], [a=0]) diff --exclude=CVS -Nurp concordance/libconcord/libconcord.xml concordance-mod/libconcord/libconcord.xml --- concordance/libconcord/libconcord.xml 1970-01-01 02:00:00.000000000 +0200 +++ concordance-mod/libconcord/libconcord.xml 2009-07-12 18:10:27.000000000 +0300 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> + <mime-type type="application/x-easyzapper-hex"> + <comment>Logitech Harmony remote control update file (EZHex)</comment> + <glob pattern="*.ezhex"/> + </mime-type> + <mime-type type="application/x-easyzapper-upgrade"> + <comment>Logitech Harmony remote control update file (EZUp)</comment> + <glob pattern="*.ezup"/> + </mime-type> + <mime-type type="application/x-easyzapper-tutor"> + <comment>Logitech Harmony remote control update file (EZTut)</comment> + <glob pattern="*.eztut"/> + </mime-type> +</mime-info> diff --exclude=CVS -Nurp concordance/libconcord/Makefile.am concordance-mod/libconcord/Makefile.am --- concordance/libconcord/Makefile.am 2009-03-08 20:52:41.000000000 +0200 +++ concordance-mod/libconcord/Makefile.am 2009-07-12 17:58:03.000000000 +0300 @@ -37,3 +37,25 @@ install_consolekit: consolekit install_u $(install_sh_DATA) libconcord.perms \ $(DESTDIR)$(datarootdir)/hal/fdi/policy/10osvendor/99-libconcord.perms +# MIME stuff + +newmimedir = $(datadir)/mime/packages +newmime_DATA = libconcord.xml + +EXTRA_DIST = \ + $(mime_DATA) \ + $(newmime_DATA) + +install-data-hook: +if HAVE_NEW_MIME + if test -z "$(DESTDIR)"; then \ + $(UPDATE_MIME_DATABASE) "$(datadir)/mime"; \ + fi +endif + +uninstall-hook: +if HAVE_NEW_MIME + if test -z "$(DESTDIR)"; then \ + $(UPDATE_MIME_DATABASE) "$(datadir)/mime"; \ + fi +endif
