[debian-edu-commits] debian-edu/ 09/09: Hide red swirl logo in GDM3. The Debian Edu background images already contain a logo.

[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 219bdd2b42ee63350c6852c577923b5a4bea40e2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Oct 6 00:35:39 2014 +0200

    Hide red swirl logo in GDM3. The Debian Edu background images already contain a logo.
---
 art-common/gdm-theme/20_debian-edu+gdm.gschema.override | 8 ++++++--
 art-common/gdm-theme/95-debian-edu-settings             | 3 +++
 art-common/gdm-theme/Makefile.am                        | 3 +++
 debian/changelog                                        | 2 ++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/art-common/gdm-theme/20_debian-edu+gdm.gschema.override b/art-common/gdm-theme/20_debian-edu+gdm.gschema.override
index 6ac9eaf..12efe11 100644
--- a/art-common/gdm-theme/20_debian-edu+gdm.gschema.override
+++ b/art-common/gdm-theme/20_debian-edu+gdm.gschema.override
@@ -2,8 +2,12 @@
 
 # - Dont't show default red swirl logo, cause the swirl is already shipped
 #   with the Debian Edu theme.
-logo='/usr/share/icons/gnome/48x48/devices/computer.png'
-fallback-logo='/usr/share/icons/gnome/48x48/devices/computer.png'
+
+# in Debian jessie this here won't work... (leaving it here for reference)
+#logo='/usr/share/icons/gnome/48x48/devices/computer.png'
+#fallback-logo='/usr/share/icons/gnome/48x48/devices/computer.png'
+#
+# -> we need to tweak /usr/share/gdm/dconf/ intead...
 
 # - Disable user list
 disable-user-list=true
diff --git a/art-common/gdm-theme/95-debian-edu-settings b/art-common/gdm-theme/95-debian-edu-settings
new file mode 100644
index 0000000..3764f69
--- /dev/null
+++ b/art-common/gdm-theme/95-debian-edu-settings
@@ -0,0 +1,3 @@
+[org/gnome/login-screen]
+logo=''
+fallback-logo=''
diff --git a/art-common/gdm-theme/Makefile.am b/art-common/gdm-theme/Makefile.am
index 8591dd2..2dde989 100644
--- a/art-common/gdm-theme/Makefile.am
+++ b/art-common/gdm-theme/Makefile.am
@@ -2,3 +2,6 @@ install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/glib-2.0/schemas
 	$(INSTALL_DATA) 20_debian-edu+gdm.gschema.override \
 		$(DESTDIR)$(datadir)/glib-2.0/schemas/20_debian-edu+gdm.gschema.override
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/gdm/dconf
+	$(INSTALL_DATA) 95-debian-edu-settings \
+		$(DESTDIR)$(datadir)/gdm/dconf/95-debian-edu-settings
diff --git a/debian/changelog b/debian/changelog
index 15f5e21..d09fcfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,8 @@ debian-edu-artwork (0.49-1) UNRELEASED; urgency=medium
   * Move dpkg-statoverride code into package scripts of bin:package
     debian-edu-artwork (was: bin:package debian-edu-artwork-lines).
   * Fix background-image scaling in GDM3 login screen.
+  * Hide red swirl logo in GDM3. The Debian Edu background images
+    already contain a logo.
   * debian/control:
     + Add Homepage: field. Pointing to a wiki page, we need to put
       some work in.

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