[debian-edu-commits] debian-edu/ 05/08: gschema.override files: Allow more then one gschema.override file for Debian Edu artwork (context: one for GDM, one for MATE, etc.).

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository debian-edu-artwork.

commit b81f6a56a9a95cde133c2b3bd7102654ed78ca18
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue May 13 18:38:01 2014 +0200

    gschema.override files: Allow more then one gschema.override file for Debian Edu artwork (context: one for GDM, one for MATE, etc.).
---
 art/gdm-theme/20-debian-edu-artwork-settings                      | 3 ---
 ...an-edu.gschema.override => 20_debian-edu+gdm.gschema.override} | 0
 art/gdm-theme/Makefile.am                                         | 8 ++------
 debian/changelog                                                  | 3 +++
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/art/gdm-theme/20-debian-edu-artwork-settings b/art/gdm-theme/20-debian-edu-artwork-settings
deleted file mode 100644
index 10fe6ae..0000000
--- a/art/gdm-theme/20-debian-edu-artwork-settings
+++ /dev/null
@@ -1,3 +0,0 @@
-#[org/gnome/desktop/background]
-#picture-uri='file:///usr/share/images/desktop-base/debian-edu-wallpaper02_1600x1200.svg'
-#picture-options='zoom'
diff --git a/art/gdm-theme/20_debian-edu.gschema.override b/art/gdm-theme/20_debian-edu+gdm.gschema.override
similarity index 100%
rename from art/gdm-theme/20_debian-edu.gschema.override
rename to art/gdm-theme/20_debian-edu+gdm.gschema.override
diff --git a/art/gdm-theme/Makefile.am b/art/gdm-theme/Makefile.am
index 322ea0c..8591dd2 100644
--- a/art/gdm-theme/Makefile.am
+++ b/art/gdm-theme/Makefile.am
@@ -1,8 +1,4 @@
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/gdm/dconf
-	$(INSTALL_DATA) 20-debian-edu-artwork-settings \
-		$(DESTDIR)$(datadir)/gdm/dconf/20-debian-edu-artwork-settings
-
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/glib-2.0/schemas
-	$(INSTALL_DATA) 20_debian-edu.gschema.override \
-		$(DESTDIR)$(datadir)/glib-2.0/schemas/20_debian-edu.gschema.override
+	$(INSTALL_DATA) 20_debian-edu+gdm.gschema.override \
+		$(DESTDIR)$(datadir)/glib-2.0/schemas/20_debian-edu+gdm.gschema.override
diff --git a/debian/changelog b/debian/changelog
index b42d1ac..2b35929 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ debian-edu-artwork (0.46~git20140513.HASH+1) UNRELEASED; urgency=low
   * New artwork version (0.46):
     - Drop buildcruft files. Use CDBS autoreconf ruleset to create
       those files during package build on-the-fly.
+    - gschema.override files: Allow more then one gschema.override
+      file for Debian Edu artwork (context: one for GDM, one for MATE,
+      etc.).
   * debian/control:
     + Add myself (Mike Gabriel) to Uploaders: field.
   * debian/changelog:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git