[Goodies-commits] r2486 - in thunar-thumbnailers/trunk: . agr-thumbnailer mime raw-thumbnailer
Erlend Davidson
erland at xfce.org
Mon Feb 5 22:38:06 CET 2007
Author: erland
Date: 2007-02-05 21:38:06 +0000 (Mon, 05 Feb 2007)
New Revision: 2486
Added:
thunar-thumbnailers/trunk/mime/
thunar-thumbnailers/trunk/mime/Makefile.am
thunar-thumbnailers/trunk/mime/thunar-thumbnailers.xml
Removed:
thunar-thumbnailers/trunk/agr-thumbnailer/thunar-thumbnailers-agr.xml
thunar-thumbnailers/trunk/raw-thumbnailer/thunar-thumbnailers-raw.xml
Modified:
thunar-thumbnailers/trunk/Makefile.am
thunar-thumbnailers/trunk/agr-thumbnailer/Makefile.am
thunar-thumbnailers/trunk/configure.in.in
thunar-thumbnailers/trunk/raw-thumbnailer/Makefile.am
Log:
Mimetypes are installed for all types thunar-thumbnailers can thumbnail, even if that thumbnailer isn't installed.
Modified: thunar-thumbnailers/trunk/Makefile.am
===================================================================
--- thunar-thumbnailers/trunk/Makefile.am 2007-02-04 15:39:43 UTC (rev 2485)
+++ thunar-thumbnailers/trunk/Makefile.am 2007-02-05 21:38:06 UTC (rev 2486)
@@ -6,7 +6,8 @@
ps-thumbnailer \
raw-thumbnailer \
fig-thumbnailer \
- agr-thumbnailer
+ agr-thumbnailer \
+ mime
distclean-local:
rm -rf *.spec *.cache *~
@@ -15,9 +16,4 @@
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
@rm -f $(PACKAGE)-$(VERSION).tar.gz
-mimedir = $(datadir)/mime
-
-install-data-local:
- update-mime-database $(mimedir)
-
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Modified: thunar-thumbnailers/trunk/agr-thumbnailer/Makefile.am
===================================================================
--- thunar-thumbnailers/trunk/agr-thumbnailer/Makefile.am 2007-02-04 15:39:43 UTC (rev 2485)
+++ thunar-thumbnailers/trunk/agr-thumbnailer/Makefile.am 2007-02-05 21:38:06 UTC (rev 2486)
@@ -1,13 +1,10 @@
# $Id: Makefile.am 2296 2007-01-03 11:30:08Z benny $
-mimedir = $(datadir)/mime
-mimepackdir = $(mimedir)/packages
desktopdir = $(datadir)/thumbnailers
if ENABLE_GRACE
libexec_SCRIPTS=agr-thumbnailer
desktop_in_files=agr-thumbnailer.desktop.in
- mimepack_DATA=thunar-thumbnailers-agr.xml
endif
%.desktop: %.desktop.in
@@ -16,8 +13,7 @@
EXTRA_DIST = \
$(desktop_in_files) \
- $(libexec_SCRIPTS) \
- $(mimepack_DATA)
+ $(libexec_SCRIPTS)
DISTCLEANFILES = \
$(desktop_DATA)
Deleted: thunar-thumbnailers/trunk/agr-thumbnailer/thunar-thumbnailers-agr.xml
Modified: thunar-thumbnailers/trunk/configure.in.in
===================================================================
--- thunar-thumbnailers/trunk/configure.in.in 2007-02-04 15:39:43 UTC (rev 2485)
+++ thunar-thumbnailers/trunk/configure.in.in 2007-02-05 21:38:06 UTC (rev 2486)
@@ -92,4 +92,5 @@
raw-thumbnailer/Makefile
fig-thumbnailer/Makefile
agr-thumbnailer/Makefile
+mime/Makefile
])
Added: thunar-thumbnailers/trunk/mime/Makefile.am
===================================================================
--- thunar-thumbnailers/trunk/mime/Makefile.am (rev 0)
+++ thunar-thumbnailers/trunk/mime/Makefile.am 2007-02-05 21:38:06 UTC (rev 2486)
@@ -0,0 +1,11 @@
+# $Id: Makefile.am 2296 2007-01-03 11:30:08Z benny $
+
+mimedir = $(datadir)/mime
+mimepackdir = $(mimedir)/packages
+mimepack_DATA=thunar-thumbnailers.xml
+
+EXTRA_DIST = \
+ $(mimepack_DATA)
+
+install-data-local:
+ update-mime-database $(mimedir)
\ No newline at end of file
Added: thunar-thumbnailers/trunk/mime/thunar-thumbnailers.xml
===================================================================
--- thunar-thumbnailers/trunk/mime/thunar-thumbnailers.xml (rev 0)
+++ thunar-thumbnailers/trunk/mime/thunar-thumbnailers.xml 2007-02-05 21:38:06 UTC (rev 2486)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="text/x-agr">
+ <comment>Grace project file</comment>
+ <comment xml:lang="en">Grace project file</comment>
+ <comment xml:lang="en-GB">Grace project file</comment>
+ <glob pattern="*.agr"/>
+ </mime-type>
+ <mime-type type="image/x-canon-crw">
+ <comment>Canon raw image</comment>
+ <comment xml:lang="en">Canon raw image</comment>
+ <comment xml:lang="en-GB">Canon raw image</comment>
+ <glob pattern="*.cr2"/>
+ </mime-type>
+ <mime-type type="image/x-canon-crw">
+ <comment>Canon raw image</comment>
+ <comment xml:lang="en">Canon raw image</comment>
+ <comment xml:lang="en-GB">Canon raw image</comment>
+ <glob pattern="*.crw"/>
+ </mime-type>
+ <mime-type type="image/x-fuji-raf">
+ <comment>Fuji raw image</comment>
+ <comment xml:lang="en">Fuji raw image</comment>
+ <comment xml:lang="en-GB">Fuji raw image</comment>
+ <glob pattern="*.raf"/>
+ </mime-type>
+ <mime-type type="image/x-minolta-mrw">
+ <comment>Minolta raw image</comment>
+ <comment xml:lang="en">Minolta raw image</comment>
+ <comment xml:lang="en-GB">Minolta raw image</comment>
+ <glob pattern="*.mrw"/>
+ </mime-type>
+ <mime-type type="image/x-nikon-nef">
+ <comment>Nikon raw image</comment>
+ <comment xml:lang="en">Nikon raw image</comment>
+ <comment xml:lang="en-GB">Nikon raw image</comment>
+ <glob pattern="*.nef"/>
+ </mime-type>
+ <mime-type type="image/x-kodac-dcr">
+ <comment>Kodak raw image</comment>
+ <comment xml:lang="en">Kodac raw image</comment>
+ <comment xml:lang="en-GB">Kodac raw image</comment>
+ <glob pattern="*.dcr"/>
+ </mime-type>
+ <mime-type type="image/x-kodac-kdc">
+ <comment>Kodak raw image</comment>
+ <comment xml:lang="en">Kodac raw image</comment>
+ <comment xml:lang="en-GB">Kodac raw image</comment>
+ <glob pattern="*.kdc"/>
+ </mime-type>
+ <mime-type type="image/x-olympus-orf">
+ <comment>Olympus raw image</comment>
+ <comment xml:lang="en">Olympus raw image</comment>
+ <comment xml:lang="en-GB">Olympus raw image</comment>
+ <glob pattern="*.orf"/>
+ </mime-type>
+</mime-info>
Modified: thunar-thumbnailers/trunk/raw-thumbnailer/Makefile.am
===================================================================
--- thunar-thumbnailers/trunk/raw-thumbnailer/Makefile.am 2007-02-04 15:39:43 UTC (rev 2485)
+++ thunar-thumbnailers/trunk/raw-thumbnailer/Makefile.am 2007-02-05 21:38:06 UTC (rev 2486)
@@ -1,11 +1,7 @@
# $Id: Makefile.am 2296 2007-01-03 11:30:08Z benny $
-mimedir = $(datadir)/mime
-mimepackdir = $(mimedir)/packages
-
if ENABLE_RAW
libexec_SCRIPTS=raw-thumbnailer
- mimepack_DATA=thunar-thumbnailers-raw.xml
endif
desktopdir = $(datadir)/thumbnailers
@@ -20,8 +16,7 @@
EXTRA_DIST = \
$(desktop_in_files) \
- $(libexec_SCRIPTS) \
- $(mimepack_DATA)
+ $(libexec_SCRIPTS)
DISTCLEANFILES = \
$(desktop_DATA)
Deleted: thunar-thumbnailers/trunk/raw-thumbnailer/thunar-thumbnailers-raw.xml
More information about the Goodies-commits
mailing list