[debian-edu-commits] r81457 - in branches/wheezy/debian-edu-artwork: art/gdm-theme debian
schweer-guest at alioth.debian.org
schweer-guest at alioth.debian.org
Sun Jul 7 23:26:56 UTC 2013
Author: schweer-guest
Date: 2013-07-07 23:26:56 +0000 (Sun, 07 Jul 2013)
New Revision: 81457
Added:
branches/wheezy/debian-edu-artwork/art/gdm-theme/20-debian-edu-artwork-settings
branches/wheezy/debian-edu-artwork/art/gdm-theme/20_debian-edu.gschema.override
Removed:
branches/wheezy/debian-edu-artwork/art/gdm-theme/20-debian-edu-artwork-settings
branches/wheezy/debian-edu-artwork/art/gdm-theme/greeter.gsettings
Modified:
branches/wheezy/debian-edu-artwork/art/gdm-theme/Makefile.am
branches/wheezy/debian-edu-artwork/debian/changelog
branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst
branches/wheezy/debian-edu-artwork/debian/update-artwork
Log:
* 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').
Deleted: branches/wheezy/debian-edu-artwork/art/gdm-theme/20-debian-edu-artwork-settings
===================================================================
--- branches/wheezy/debian-edu-artwork/art/gdm-theme/20-debian-edu-artwork-settings 2013-07-07 22:10:55 UTC (rev 81456)
+++ branches/wheezy/debian-edu-artwork/art/gdm-theme/20-debian-edu-artwork-settings 2013-07-07 23:26:56 UTC (rev 81457)
@@ -1,3 +0,0 @@
-[org/gnome/desktop/background]
-picture-uri='file:///usr/share/images/desktop-base/debian-edu-wallpaper02_1600x1200.svg'
-picture-options='zoom'
Added: branches/wheezy/debian-edu-artwork/art/gdm-theme/20-debian-edu-artwork-settings
===================================================================
--- branches/wheezy/debian-edu-artwork/art/gdm-theme/20-debian-edu-artwork-settings (rev 0)
+++ branches/wheezy/debian-edu-artwork/art/gdm-theme/20-debian-edu-artwork-settings 2013-07-07 23:26:56 UTC (rev 81457)
@@ -0,0 +1,3 @@
+[org/gnome/desktop/background]
+picture-uri='file:///usr/share/images/desktop-base/debian-edu-wallpaper02_1600x1200.svg'
+picture-options='zoom'
Added: branches/wheezy/debian-edu-artwork/art/gdm-theme/20_debian-edu.gschema.override
===================================================================
--- branches/wheezy/debian-edu-artwork/art/gdm-theme/20_debian-edu.gschema.override (rev 0)
+++ branches/wheezy/debian-edu-artwork/art/gdm-theme/20_debian-edu.gschema.override 2013-07-07 23:26:56 UTC (rev 81457)
@@ -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
Modified: branches/wheezy/debian-edu-artwork/art/gdm-theme/Makefile.am
===================================================================
--- branches/wheezy/debian-edu-artwork/art/gdm-theme/Makefile.am 2013-07-07 22:10:55 UTC (rev 81456)
+++ branches/wheezy/debian-edu-artwork/art/gdm-theme/Makefile.am 2013-07-07 23:26:56 UTC (rev 81457)
@@ -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
Deleted: branches/wheezy/debian-edu-artwork/art/gdm-theme/greeter.gsettings
===================================================================
--- branches/wheezy/debian-edu-artwork/art/gdm-theme/greeter.gsettings 2013-07-07 22:10:55 UTC (rev 81456)
+++ branches/wheezy/debian-edu-artwork/art/gdm-theme/greeter.gsettings 2013-07-07 23:26:56 UTC (rev 81457)
@@ -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
Modified: branches/wheezy/debian-edu-artwork/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/changelog 2013-07-07 22:10:55 UTC (rev 81456)
+++ branches/wheezy/debian-edu-artwork/debian/changelog 2013-07-07 23:26:56 UTC (rev 81457)
@@ -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 ]
Modified: branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst 2013-07-07 22:10:55 UTC (rev 81456)
+++ branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst 2013-07-07 23:26:56 UTC (rev 81457)
@@ -5,11 +5,6 @@
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#
Modified: branches/wheezy/debian-edu-artwork/debian/update-artwork
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/update-artwork 2013-07-07 22:10:55 UTC (rev 81456)
+++ branches/wheezy/debian-edu-artwork/debian/update-artwork 2013-07-07 23:26:56 UTC (rev 81457)
@@ -97,17 +97,23 @@
/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
More information about the debian-edu-commits
mailing list