[totem] data: Fix validation of GSettings schemas

[Bastien Nocera <hadess src gnome org>]

commit a41bfb31ae7b13a5b16d82bfa8f56717aa959014
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Sep 27 16:52:08 2013 +0200

    data: Fix validation of GSettings schemas
    
    The appdata translation added in
    45b043865b3be7437fc9b0ae1ea08c8048668d84 uses the @INTLTOOL_XML_RULE  
    This causes GSettings schemas to also embed translations within
    the XML file, which causes them to stop validating.
    
    Move the appdata to a sub-directory to avoid the clashing XML
    translation rules to appear in the same sub-directory.

 configure.ac                            |    1 +
 data/Makefile.am                        |   11 +----------
 data/appdata/Makefile.am                |    7 +++++++
 data/{ => appdata}/totem.appdata.xml.in |    0
 po/POTFILES.in                          |    2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 475066a..efd4b39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -692,6 +692,7 @@ data/Makefile
 data/org.gnome.totem.gschema.xml.in
 data/totem.desktop.in.in
 data/totem.pc
+data/appdata/Makefile
 data/icons/Makefile
 data/icons/16x16/Makefile
 data/icons/22x22/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 651b651..2668a9c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = icons
+SUBDIRS = icons appdata
 
 EXTRA_DIST =
 CLEANFILES =
@@ -65,15 +65,6 @@ CLEANFILES += \
        $(desktop_in_files)     \
        $(desktop_DATA)
 
-# AppData
- INTLTOOL_XML_RULE@
-appdatadir = $(datadir)/appdata
-dist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = totem.appdata.xml.in
-EXTRA_DIST += $(appdata_in_files})
-CLEANFILES += \
-       totem.appdata.xml
-
 # Thumbnailer
 thumbnailerdir = $(datadir)/thumbnailers
 thumbnailer_in_files = totem.thumbnailer.in
diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am
new file mode 100644
index 0000000..ce22ea0
--- /dev/null
+++ b/data/appdata/Makefile.am
@@ -0,0 +1,7 @@
+# AppData
+ INTLTOOL_XML_RULE@
+appdatadir = $(datadir)/appdata
+dist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appdata_in_files = totem.appdata.xml.in
+EXTRA_DIST = $(appdata_in_files})
+CLEANFILES = totem.appdata.xml
diff --git a/data/totem.appdata.xml.in b/data/appdata/totem.appdata.xml.in
similarity index 100%
rename from data/totem.appdata.xml.in
rename to data/appdata/totem.appdata.xml.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a984ccd..8f69c02 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,7 +7,7 @@ data/org.gnome.totem.gschema.xml.in.in
 [type: gettext/glade]data/playlist.ui
 [type: gettext/glade]data/preferences.ui
 [type: gettext/glade]data/properties.ui
-data/totem.appdata.xml.in
+data/appdata/totem.appdata.xml.in
 data/totem.desktop.in.in.in
 [type: gettext/glade]data/totem.ui
 [type: gettext/glade]data/uri.ui