[gdm/wip/wayland-rebase: 5/15] Revert "move over to using 'dconf compile' and file-db"

[Jasper St. Pierre <jstpierre src gnome org>]

commit 59be35c6b4998596a94f58661476d5ebaf2067a2
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Feb 12 18:46:22 2014 -0500

    Revert "move over to using 'dconf compile' and file-db"
    
    This reverts commit feb6ddaff33a3e58a20e94264313322534963f98.
    
    Conflicts:
        data/Makefile.am

 configure.ac                                       |    1 -
 data/.gitignore                                    |    1 -
 data/{dconf/defaults => }/00-upstream-settings     |    0
 .../defaults/locks => }/00-upstream-settings-locks |    0
 data/Makefile.am                                   |   56 ++++++++++++++------
 data/dconf-profile                                 |    2 +
 data/dconf/.gitignore                              |    1 -
 data/dconf/gdm.in                                  |    2 -
 8 files changed, 42 insertions(+), 21 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0850ce7..75f29f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1569,7 +1569,6 @@ data/pixmaps/Makefile
 data/pixmaps/16x16/Makefile
 data/pixmaps/32x32/Makefile
 data/pixmaps/48x48/Makefile
-data/dconf/gdm
 common/Makefile
 po/Makefile.in
 tests/Makefile
diff --git a/data/.gitignore b/data/.gitignore
index c95bb39..d9c62cb 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1,2 +1 @@
 /gdm.service
-/greeter-dconf-defaults
diff --git a/data/dconf/defaults/00-upstream-settings b/data/00-upstream-settings
similarity index 100%
rename from data/dconf/defaults/00-upstream-settings
rename to data/00-upstream-settings
diff --git a/data/dconf/defaults/locks/00-upstream-settings-locks b/data/00-upstream-settings-locks
similarity index 100%
rename from data/dconf/defaults/locks/00-upstream-settings-locks
rename to data/00-upstream-settings-locks
diff --git a/data/Makefile.am b/data/Makefile.am
index 1b79bc3..048509c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -43,19 +43,6 @@ dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf)
 @INTLTOOL_SCHEMAS_RULE@
 @INTLTOOL_XML_NOMERGE_RULE@
 
-# dconf database and profile
-dconf_db_files = \
-       dconf/defaults/00-upstream-settings             \
-       dconf/defaults/locks/00-upstream-settings-locks
-
-dconfdbdir = $(pkgdatadir)
-dconfdb_DATA = greeter-dconf-defaults
-greeter-dconf-defaults: $(dconf_db_files)
-       $(AM_V_GEN) dconf compile $@ $(srcdir)/dconf/defaults
-
-dconfprofiledir = $(DATADIR)/dconf/profile
-dconfprofile_DATA = dconf/gdm
-
 gsettings_SCHEMAS = org.gnome.login-screen.gschema.xml
 @GSETTINGS_RULES@
 
@@ -154,7 +141,6 @@ pam_files = $(pam_lfs_files)
 endif
 
 EXTRA_DIST +=                  \
-       $(dconf_db_files)       \
        $(schemas_in_files)     \
        $(schemas_DATA)         \
        $(dbusconf_in_files)    \
@@ -166,6 +152,9 @@ EXTRA_DIST +=                       \
        PreSession.in           \
        PostSession.in          \
        PostLogin               \
+       dconf-profile \
+       00-upstream-settings \
+       00-upstream-settings-locks \
        org.gnome.login-screen.gschema.xml.in \
        $(NULL)
 
@@ -176,7 +165,6 @@ CLEANFILES =                                \
        PreSession                      \
        PostSession                     \
        $(gsettings_SCHEMAS)            \
-       greeter-dconf-defaults          \
        $(NULL)
 
 DISTCLEANFILES =                       \
@@ -220,13 +208,19 @@ uninstall-hook:
        $(DESTDIR)$(xauthdir) \
        $(DESTDIR)$(PAM_PREFIX)/pam.d
 
+       -rmdir \
+       $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d/locks \
+       $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d \
+       $(DESTDIR)$(sysconfdir)/dconf/db \
+       $(DESTDIR)$(sysconfdir)/dconf
+
        if test -n "$(systemdsystemunit)"; then \
                rm -f $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/$(systemdsystemunit); \
                rmdir $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR) || : ; \
        fi
 
 
-install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession $(systemdsystemunit)
+install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession 00-upstream-settings 
00-upstream-settings-locks $(systemdsystemunit)
        if test '!' -d $(DESTDIR)$(gdmconfdir); then \
                $(mkinstalldirs) $(DESTDIR)$(gdmconfdir); \
                chmod 755 $(DESTDIR)$(gdmconfdir); \
@@ -325,8 +319,38 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession $(system
                chown gdm:gdm $(DESTDIR)$(workingdir)/.local/share/applications || : ; \
        fi
 
+       if test '!' -d $(DESTDIR)$(sysconfdir)/dconf/profile; then \
+               $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/dconf/profile; \
+               chmod 0755 $(DESTDIR)$(sysconfdir)/dconf/profile; \
+               chown root:root $(DESTDIR)$(sysconfdir)/dconf/profile || : ; \
+       fi
+
+       if test '!' -d $(DESTDIR)$(sysconfdir)/dconf/db; then \
+               $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/dconf/db; \
+               chmod 0755 $(DESTDIR)$(sysconfdir)/dconf/db; \
+               chown root:root $(DESTDIR)$(sysconfdir)/dconf/db || : ; \
+       fi
+
+       if test '!' -d $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d; then \
+               $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d; \
+               chmod 0755 $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d; \
+               chown root:root $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d || : ; \
+       fi
+
+       if test '!' -d $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d/locks; then \
+               $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d/locks; \
+               chmod 0755 $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d/locks; \
+               chown root:root $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d/locks || : ; \
+       fi
+
        if test '!' -d $(DESTDIR)$(cachedir); then \
                $(mkinstalldirs) $(DESTDIR)$(cachedir); \
                chmod 1755 $(DESTDIR)$(cachedir); \
                chown root:gdm $(DESTDIR)$(cachedir) || : ; \
        fi
+
+       $(INSTALL_DATA) $(srcdir)/dconf-profile $(DESTDIR)$(sysconfdir)/dconf/profile/gdm
+       $(INSTALL_DATA) $(srcdir)/00-upstream-settings $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d
+       $(INSTALL_DATA) $(srcdir)/00-upstream-settings-locks $(DESTDIR)$(sysconfdir)/dconf/db/gdm.d/locks
+       test -z "$(DESTDIR)" && dconf update || :
+
diff --git a/data/dconf-profile b/data/dconf-profile
new file mode 100644
index 0000000..e4ac220
--- /dev/null
+++ b/data/dconf-profile
@@ -0,0 +1,2 @@
+user-db:user
+system-db:gdm