[gnome-flashback] move gschema file to data dir

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 510252b46ef60f96372fb9991b910c3a60d3d252
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Oct 16 18:49:31 2014 +0300

    move gschema file to data dir

 data/Makefile.am                                   |   15 +++++++++++++++
 .../org.gnome.gnome-flashback.gschema.xml.in.in    |    0
 gnome-flashback/Makefile.am                        |   19 -------------------
 po/POTFILES.in                                     |    2 +-
 po/POTFILES.skip                                   |    2 +-
 5 files changed, 17 insertions(+), 21 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index ab321a3..2628c42 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -30,8 +30,20 @@ xsession_DATA        = $(xsession_in_files:.desktop.in=.desktop)
 
 %.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d 
-u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
 
+ INTLTOOL_XML_NOMERGE_RULE@
+
+gsettings_schemas_in_in = org.gnome.gnome-flashback.gschema.xml.in.in
+gsettings_schemas_in    = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
+gsettings_SCHEMAS       = $(gsettings_schemas_in:.xml.in=.xml)
+
+%.gschema.xml.in: %.gschema.xml.in.in Makefile
+       $(AM_V_GEN) $(SED) -e 's^\ GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
+
+ GSETTINGS_RULES@
+
 EXTRA_DIST = \
        $(desktop_in_files) \
+       $(gsettings_schemas_in_in) \
        $(session_in_files) \
        $(xsession_in_in_files)
 
@@ -39,6 +51,9 @@ CLEANFILES = \
        $(desktop_DATA) \
        gnome-flashback-compiz \
        gnome-flashback-metacity \
+       $(gsettings_schemas_in) \
+       $(gsettings_SCHEMAS) \
+       *.gschema.valid \
        $(session_DATA) \
        $(xsession_in_files) \
        $(xsession_DATA)
diff --git a/gnome-flashback/org.gnome.gnome-flashback.gschema.xml.in.in 
b/data/org.gnome.gnome-flashback.gschema.xml.in.in
similarity index 100%
rename from gnome-flashback/org.gnome.gnome-flashback.gschema.xml.in.in
rename to data/org.gnome.gnome-flashback.gschema.xml.in.in
diff --git a/gnome-flashback/Makefile.am b/gnome-flashback/Makefile.am
index 824cfc6..48f1b50 100644
--- a/gnome-flashback/Makefile.am
+++ b/gnome-flashback/Makefile.am
@@ -26,23 +26,4 @@ gnome_flashback_LDADD = \
        $(top_builddir)/gnome-flashback/libidle-monitor/libidle-monitor.la \
        $(top_builddir)/gnome-flashback/libsound-applet/libsound-applet.la
 
- INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_schemas_in_in = org.gnome.gnome-flashback.gschema.xml.in.in
-gsettings_schemas_in    = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS       = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-       $(AM_V_GEN) $(SED) -e 's^\ GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
- GSETTINGS_RULES@
-
-EXTRA_DIST = \
-       $(gsettings_schemas_in_in)
-
-CLEANFILES = \
-       $(gsettings_schemas_in) \
-       $(gsettings_SCHEMAS) \
-       *.gschema.valid
-
 -include $(top_srcdir)/git.mk
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 39e39b4..c89a15b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,10 +7,10 @@ data/gnome-flashback-compiz.session.in
 data/gnome-flashback-init.desktop.in
 data/gnome-flashback-metacity.desktop.in.in
 data/gnome-flashback-metacity.session.in
+data/org.gnome.gnome-flashback.gschema.xml.in.in
 gnome-flashback/libend-session-dialog/flashback-inhibit-dialog.c
 [type: gettext/glade]gnome-flashback/libend-session-dialog/flashback-inhibit-dialog.ui
 gnome-flashback/libsound-applet/gvc-applet.c
 gnome-flashback/libsound-applet/gvc-channel-bar.c
 gnome-flashback/libsound-applet/gvc-stream-status-icon.c
 gnome-flashback/libsound-applet/gvc/gvc-mixer-control.c
-gnome-flashback/org.gnome.gnome-flashback.gschema.xml.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 789db59..99b59c9 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -2,4 +2,4 @@
 # Please keep this file sorted alphabetically.
 data/gnome-flashback-compiz.desktop.in
 data/gnome-flashback-metacity.desktop.in
-gnome-flashback/org.gnome.gnome-flashback.gschema.xml.in
+data/org.gnome.gnome-flashback.gschema.xml.in