[passepartout] moved the mime type handling into a subfolder

[Sven Herzberg <herzi src gnome org>]

commit 0c4e2bc705d588021fb34ddaf46425a809ecba48
Author: Sven Herzberg <herzi lanedo com>
Date:   Thu Apr 23 12:10:30 2009 +0200

    moved the mime type handling into a subfolder
    
    * configure.ac,
    * .gitignore,
    * Makefile.am,
    * data/.gitignore,
    * data/Makefile.am,
    * passepartout.xml.in -> data/passepartout.xml.in,
    * po/POTFILES.in: moved the file; the manual will be called passepartout.xml as
      well, and so we shouldn't have it in the toplevel .gitignore file
---
 .gitignore                                      |    1 -
 Makefile.am                                     |   15 ++---------
 configure.ac                                    |    1 +
 data/.gitignore                                 |    2 +
 data/Makefile.am                                |   28 +++++++++++++++++++++++
 passepartout.xml.in => data/passepartout.xml.in |    0
 po/POTFILES.in                                  |    2 +-
 7 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index f129f28..b9d65b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 *.a
 *.desktop
 *.o
-*.xml
 *autom4te.cache
 .deps
 aclocal.m4
diff --git a/Makefile.am b/Makefile.am
index 6bae247..859b583 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS=\
+	data \
        src \
        doc \
        logotype \
@@ -10,11 +11,6 @@ applications_DATA=$(applications_in_files:.in=)
 applicationsdir=$(datarootdir)/applications
 @INTLTOOL_DESKTOP_RULE@
 
-mime_in_files=passepartout.xml.in
-mime_DATA=$(mime_in_files:.in=)
-mimedir=$(datarootdir)/mime/packages
- INTLTOOL_XML_RULE@
-
 check-local: $(applications_DATA)
 	@echo "[TEST] $<"
 	@tmpfile=`mktemp`; \
@@ -22,21 +18,17 @@ check-local: $(applications_DATA)
 		cat $$tmpfile >&2; \
 		false; \
 	fi
-# FIXME: add a check rule for the mime specification
 
 update-databases:
 if DATABASE_UPDATES
 	@if test -z "$(DESTDIR)"; then \
-		echo "$(UPDATE_MIME_DATABASE) $(datadir)/mime"; \
-		$(UPDATE_MIME_DATABASE) $(datadir)/mime; \
 		echo "$(UPDATE_DESKTOP_DATABASE) $(datadir)/applications"; \
 		$(UPDATE_DESKTOP_DATABASE) $(datadir)/applications; \
 		exit; \
 	fi
 endif
 	@echo "******" >&2
-	@echo "*** don't forget to run \"$(UPDATE_MIME_DATABASE) $(datadir)/mime\"" >&2
-	@echo "*** don't forget to run \"$(UPDATE_DESKTOP_DATABASE)\"" >&2
+	@echo "*** don't forget to run \"$(UPDATE_DESKTOP_DATABASE) $(datadir)/applications\"" >&2
 	@echo "******" >&2
 
 install-data-hook: update-databases
@@ -55,9 +47,8 @@ EXTRA_DIST=\
 	po/ChangeLog \
 	$(applications_in_files) \
 	$(intltool_in_files) \
-	$(mime_in_files) \
 	$(NULL)
-CLEANFILES=$(applications_DATA) $(mime_DATA)
+CLEANFILES=$(applications_DATA)
 DISTCLEANFILES=$(intltool_in_files:.in=)
 
 # AM_GLIB_GNU_GETTEXT requires a ChangeLog for "dist"
diff --git a/configure.ac b/configure.ac
index 5511f51..49cf6f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,6 +149,7 @@ dnl  --------
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
 AC_CONFIG_FILES([Makefile
+		 data/Makefile
 	         src/Makefile	
                  src/ps/Makefile
                  src/util/Makefile
diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644
index 0000000..b83de71
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1,2 @@
+*.xml
+
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..8d57f35
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,28 @@
+# FIXME: add a check rule for the mime specification
+mime_in_files=passepartout.xml.in
+mime_DATA=$(mime_in_files:.in=)
+mimedir=$(datarootdir)/mime/packages
+ INTLTOOL_XML_RULE@
+
+update-databases:
+if DATABASE_UPDATES
+	@if test -z "$(DESTDIR)"; then \
+		echo "$(UPDATE_MIME_DATABASE) $(datadir)/mime"; \
+		$(UPDATE_MIME_DATABASE) $(datadir)/mime; \
+		exit; \
+	fi
+endif
+	@echo "******" >&2
+	@echo "*** don't forget to run \"$(UPDATE_MIME_DATABASE) $(datadir)/mime\"" >&2
+	@echo "******" >&2
+
+install-data-hook: update-databases
+uninstall-hook: update-databases
+
+EXTRA_DIST=\
+	$(mime_in_files) \
+	$(NULL)
+CLEANFILES=\
+	$(mime_DATA) \
+	$(NULL)
+
diff --git a/passepartout.xml.in b/data/passepartout.xml.in
similarity index 100%
rename from passepartout.xml.in
rename to data/passepartout.xml.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2d889ec..8626a93 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,5 @@
 passepartout.desktop.in
-passepartout.xml.in
+data/passepartout.xml.in
 src/pptout/aboutdialog.cc
 src/pptout/main.cc
 src/pptout/window.cc