[gnome-raw-thumbnailer] Bump to 3.0.0 Update thumbnailer for Gnome 3



commit 362eb84865248fe9cbbc09c07a68592c8fdb9374
Author: Hub Figuiere <hub figuiere net>
Date:   Fri Dec 16 21:36:58 2011 -0800

    Bump to 3.0.0
    Update thumbnailer for Gnome 3

 .gitignore                                  |    4 +--
 configure.ac                                |   10 ++---
 data/Makefile.am                            |   51 +++++++++-----------------
 data/{mime-types.txt => mime-type-list.txt} |    0
 data/raw.thumbnailer.in                     |    3 ++
 data/thumbnailer.sh                         |   16 ++++++++
 6 files changed, 42 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index afb188b..a0752f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,9 +23,7 @@ po/POTFILES
 po/stamp-it
 po/.intltool-merge-cache
 src/raw-thumbnailer
-data/raw-thumbnailer.schemas
-data/raw-thumbnailer.schemas.in
-data/update-gconf.sh
+data/raw-thumbnailer
 .deps
 .libs
 *~
diff --git a/configure.ac b/configure.ac
index 73484ca..fd2ed24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,11 @@
-AC_INIT(src/raw-thumbnailer.c)
+AC_INIT(raw-thumbnailer, 3.0.0)
 
 AM_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE(raw-thumbnailer, 0.99.2)
-
+AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-bzip2 dist-xz])
 AM_MAINTAINER_MODE
+m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
+AM_SILENT_RULES([yes])
 
 AC_PROG_INTLTOOL([0.21])
 
@@ -34,9 +35,6 @@ AC_SUBST(GETTEXT_PACKAGE)
 AM_GLIB_GNU_GETTEXT
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], ["definition of GETTEXT_PACKAGE"])
 
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
-AM_GCONF_SOURCE_2
-
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
diff --git a/data/Makefile.am b/data/Makefile.am
index ce66794..0305202 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,41 +1,26 @@
 
-
-update-gconf.sh: raw-thumbnailer.schemas.in
-
-raw-thumbnailer.schemas.in: schemas.sh mime-types.txt mime-functions.sh
-	$(srcdir)/schemas.sh $(srcdir)/mime-types.txt $(bindir)     \
-	> $@                                                            \
-	2> update-gconf.sh
-
-
-generated_schema_in_files = raw-thumbnailer.schemas.in 
-schema_in_files = $(generated_schema_in_files)
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
- INTLTOOL_SCHEMAS_RULE@
-
+EXTRA_DIST =
+CLEANFILES =
 
 mimedir = $(prefix)/share/mime/packages
 mime_DATA = raw-thumbnailer.xml
 
-install-data-local: $(schema_DATA)
-if GCONF_SCHEMAS_INSTALL
-	if test -z "$(DESTDIR)" ; then \
-	for p in $^ ; do \
-		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
-	done \
-	fi
-endif
+EXTRA_DIST += raw-thumbnailer.xml
+
+# Thumbnailer
+thumbnailerdir = $(datadir)/thumbnailers
+thumbnailer_in_files = raw.thumbnailer.in
+thumbnailer_DATA = $(thumbnailer_in_files:.thumbnailer.in=.thumbnailer)
 
-EXTRA_DIST = \
-	mime-types.txt                  \
-	schemas.sh                      \
-	mime-functions.sh               \
-	raw-thumbnailer.xml 
+raw.thumbnailer: $(thumbnailer_in_files) mime-type-list.txt thumbnailer.sh
+	$(AM_V_GEN)sed -e "s|\ BINDIR\@|$(bindir)|" $< > $@ &&\
+	$(SHELL) $(srcdir)/thumbnailer.sh $(srcdir)/mime-type-list.txt >> $@
 
-CLEANFILES = \
-        $(generated_schema_in_files)    \
-        $(schema_DATA)                  \
-        raw-thumbnailer.schemas.in      \
-        update-gconf.sh
+EXTRA_DIST += \
+	$(thumbnailer_in_files) \
+	mime-type-list.txt \
+	mime-functions.sh \
+	thumbnailer.sh
 
+CLEANFILES += \
+	$(thumbnailer_DATA)
diff --git a/data/mime-types.txt b/data/mime-type-list.txt
similarity index 100%
rename from data/mime-types.txt
rename to data/mime-type-list.txt
diff --git a/data/raw.thumbnailer.in b/data/raw.thumbnailer.in
new file mode 100644
index 0000000..00b2a72
--- /dev/null
+++ b/data/raw.thumbnailer.in
@@ -0,0 +1,3 @@
+[Thumbnailer Entry]
+TryExec= BINDIR@/raw-thumbnailer
+Exec= BINDIR@/raw-thumbnailer -s %s %u %o
diff --git a/data/thumbnailer.sh b/data/thumbnailer.sh
new file mode 100644
index 0000000..517615b
--- /dev/null
+++ b/data/thumbnailer.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+. `dirname $0`/mime-functions.sh
+
+echo_mime () {
+	printf "$i;";
+}
+
+printf MimeType=;
+
+get_mimetypes $1;
+for i in $MIMETYPES ; do
+	echo_mime;
+done
+
+echo ""



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]