[debian-edu-commits] debian-edu/ 398/437: * Configuration of gdm3: - Drop file /etc/gdm3/greeter.gsettings, as this approach fails, if gdm3 is installed after the artwork package; remove diversion. - Use schema override file to configure gdm3: /usr/share/glib-2.0/schemas/20_debian-edu.gschema.override - Call 'glib-compile-schemas /usr/share/glib-2.0/schemas/' to activate the overrides (function in script 'update-artwork').

Mike Gabriel sunweaver at debian.org
Sun Mar 2 23:49:56 UTC 2014 

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 19dc07fcc85bc60b6823b5e9c1bbf2fee678152a
Author: Wolfgang Schweer <w.schweer at gmx.de>
Date:   Sun Jul 7 23:26:56 2013 +0000

    * Configuration of gdm3:
      - Drop file /etc/gdm3/greeter.gsettings, as this approach fails, if
        gdm3 is installed after the artwork package; remove diversion.
      - Use schema override file to configure gdm3:
        /usr/share/glib-2.0/schemas/20_debian-edu.gschema.override
      - Call 'glib-compile-schemas /usr/share/glib-2.0/schemas/' to activate
        the overrides (function in script 'update-artwork').
---
 art/gdm-theme/20_debian-edu.gschema.override |  9 +++++
 art/gdm-theme/Makefile.am                    |  8 ++--
 art/gdm-theme/greeter.gsettings              | 57 ----------------------------
 debian/changelog                             | 12 ++++++
 debian/debian-edu-artwork.preinst            |  5 ---
 debian/update-artwork                        |  6 +++
 6 files changed, 31 insertions(+), 66 deletions(-)

diff --git a/art/gdm-theme/20_debian-edu.gschema.override b/art/gdm-theme/20_debian-edu.gschema.override
new file mode 100644
index 0000000..2785b84
--- /dev/null
+++ b/art/gdm-theme/20_debian-edu.gschema.override
@@ -0,0 +1,9 @@
+[org.gnome.login-screen]
+
+# - Dont't show default red swirl logo, cause the swirl is already shipped
+#   with the Debian Edu theme.
+#logo=''
+#fallback-logo=''
+
+# - Disable user list
+disable-user-list=true
diff --git a/art/gdm-theme/Makefile.am b/art/gdm-theme/Makefile.am
index 36c8ee5..322ea0c 100644
--- a/art/gdm-theme/Makefile.am
+++ b/art/gdm-theme/Makefile.am
@@ -1,8 +1,8 @@
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gdm3
-	$(INSTALL_DATA) greeter.gsettings \
-		$(DESTDIR)$(sysconfdir)/gdm3/greeter.gsettings
-
 	$(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
diff --git a/art/gdm-theme/greeter.gsettings b/art/gdm-theme/greeter.gsettings
deleted file mode 100644
index 2f19a1c..0000000
--- a/art/gdm-theme/greeter.gsettings
+++ /dev/null
@@ -1,57 +0,0 @@
-# These are the options for the greeter session that can be set 
-# through GSettings. Any GSettings setting that is used by the 
-# greeter session can be set here.
-
-
-# Theming options
-# ===============
-#  - Change the GTK+ theme
-# [org.gnome.desktop.interface]
-# gtk-theme='Adwaita'
-#  - Use another background
-# [org.gnome.desktop.background]
-# picture-uri='file:///usr/share/themes/Adwaita/backgrounds/stripes.jpg'
-# picture-options='zoom'
-#  - Or no background at all
-# [org.gnome.desktop.background]
-# picture-options='none'
-# primary-color='#000000'
-
-# Greeter session choice
-# ======================
-# Use 'gdm-shell' for the GNOME Shell version.
-# Never use anything not starting with 'gdm-'.
-[org.gnome.desktop.session]
-session-name='gdm-fallback'
-# session-name='gdm-shell'
-
-# Login manager options
-# =====================
-[org.gnome.login-screen]
-#logo='/usr/share/icons/gnome/48x48/places/debian-swirl.png'
-#fallback-logo='/usr/share/icons/gnome/48x48/places/debian-swirl.png'
-
-# - Disable user list
-disable-user-list=true
-# - Disable restart buttons
-# disable-restart-buttons=true
-# - Show a login welcome message
-# banner-message-enable=true
-# banner-message-text='Welcome'
-
-# Prevent the power management icon from showing up
-[org.gnome.power-manager]
-icon-policy='never'
-
-# Disabling sound in the greeter
-#[org.gnome.desktop.sound]
-event-sounds=false
-
-# The metacity compositor doesn’t go well with the greeter
-# so just to be sure
-[org.gnome.metacity]
-compositing-manager=false
-
-# No workspaces
-[org.gnome.desktop.wm.preferences]
-num-workspaces=1
diff --git a/debian/changelog b/debian/changelog
index fc0a54d..5497465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+debian-edu-artwork (0.0.40-1) UNRELEASED; urgency=low
+
+  * Configuration of gdm3:
+    - Drop file /etc/gdm3/greeter.gsettings, as this approach fails, if
+      gdm3 is installed after the artwork package; remove diversion.
+    - Use schema override file to configure gdm3:
+      /usr/share/glib-2.0/schemas/20_debian-edu.gschema.override
+    - Call 'glib-compile-schemas /usr/share/glib-2.0/schemas/' to activate
+      the overrides (function in script 'update-artwork').
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 08 Jul 2013 00:40:14 +0200
+
 debian-edu-artwork (0.0.39-1) unstable; urgency=low
 
   [ Wolfgang Schweer ]
diff --git a/debian/debian-edu-artwork.preinst b/debian/debian-edu-artwork.preinst
index ec4ee43..7fbb1e1 100644
--- a/debian/debian-edu-artwork.preinst
+++ b/debian/debian-edu-artwork.preinst
@@ -5,11 +5,6 @@ set -e
 if [ "$1" = install ] || [ $1 = upgrade ]
 then
         dpkg-divert --package debian-edu-artwork --rename \
-            --divert /etc/gdm3/greeter.gsettings.edu-diverted \
-            --add /etc/gdm3/greeter.gsettings
-        dpkg-divert --package debian-edu-artwork --rename \
             --divert /usr/share/images/desktop-base/login-background.svg.edu-diverted \
             --add /usr/share/images/desktop-base/login-background.svg
 fi
-
-#DEBHELPER#
diff --git a/debian/update-artwork b/debian/update-artwork
index 00aa25d..67cade4 100644
--- a/debian/update-artwork
+++ b/debian/update-artwork
@@ -97,17 +97,23 @@ restore_ksplash() {
 	/usr/share/kde4/apps/kdm/themes/debian-edu/background.svg
 }
 
+compile_gschemas() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+}
+
 case "$1" in
   configure)
     change_ldm_background
     change_grub_background
     change_desktop_background
     change_ksplash
+    compile_gschemas
     ;;
   remove)
     restore_ldm_background
     restore_grub_background
     restore_desktop_background
     restore_ksplash
+    compile_gschemas
     ;;
 esac

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

More information about the debian-edu-commits mailing list