r27895 - in /desktop/experimental/gdm3/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed May 11 22:15:16 UTC 2011
Author: joss
Date: Wed May 11 22:15:09 2011
New Revision: 27895
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27895
Log:
* Build-depend on gnome-settings-daemon-dev and
gsettings-desktop-schemas.
* Rename 21_schemas_usr.patch to 90_config_comments.patch, to match
its true meaning and the fact it won’t be forwarded.
* Allow to tune the GSettings configuration like for GConf.
+ 91_dconf_override.patch: new Debian-specific patch. Turn the
make-dconf-override-db script into one that creates a GSettings
override file. Drop the dconf profile entirely.
+ Install the result in /usr/share/gdm/greeter-settings.
+ 92_gsettings_path.patch: new Debian-specific patch. Set
GSETTINGS_SCHEMA_DIR in the welcome session instead of
DCONF_PROFILE.
+ Require gsettings-desktop-schemas and libglib2.0-bin in the binary
package.
+ greeter.gsettings: new file. Set the Debian GSettings defaults.
+ Install it in /etc/gdm3 and link it in
/usr/share/gdm/greeter-settings.
+ gdm3.init: regenerate the schemas if needed in /var/lib/gdm3.
* greeter.gconf-defaults: remove settings that are necessarily in
GSettings now.
Added:
desktop/experimental/gdm3/debian/greeter.gsettings
desktop/experimental/gdm3/debian/patches/90_config_comments.patch
- copied unchanged from r27885, desktop/experimental/gdm3/debian/patches/21_schemas_usr.patch
desktop/experimental/gdm3/debian/patches/91_dconf_override.patch
desktop/experimental/gdm3/debian/patches/92_gsettings_path.patch
Removed:
desktop/experimental/gdm3/debian/patches/21_schemas_usr.patch
Modified:
desktop/experimental/gdm3/debian/TODO
desktop/experimental/gdm3/debian/changelog
desktop/experimental/gdm3/debian/control
desktop/experimental/gdm3/debian/control.in
desktop/experimental/gdm3/debian/gdm3.dirs
desktop/experimental/gdm3/debian/gdm3.init
desktop/experimental/gdm3/debian/gdm3.install
desktop/experimental/gdm3/debian/gdm3.links
desktop/experimental/gdm3/debian/greeter.gconf-defaults
desktop/experimental/gdm3/debian/patches/series
desktop/experimental/gdm3/debian/rules
Modified: desktop/experimental/gdm3/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/TODO?rev=27895&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/TODO [utf-8] (original)
+++ desktop/experimental/gdm3/debian/TODO [utf-8] Wed May 11 22:15:09 2011
@@ -1,10 +1,7 @@
-Must be solved before going to unstable
- * Handle the DConf stuff in a more flexible way, allowing for system
- overrides like for GConf.
- * Set some sensible DConf defaults accordingly.
-
-Must be dealt with before wheezy
+Should be dealt with before wheezy
+ * Make TTY management suck less
* Restore 11_xephyr_nested.patch
+ Needs to be made compatible with the xhost stuff
+ Don’t forget to add back the necessary code in
20_endsession_respawn.patch and 19_configure_xserver.patch
+ * Get rid of gconf
Modified: desktop/experimental/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/changelog?rev=27895&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog [utf-8] Wed May 11 22:15:09 2011
@@ -1,4 +1,4 @@
-gdm3 (3.0.0-2) UNRELEASED; urgency=low
+gdm3 (3.0.0-2) experimental; urgency=low
* 18_switch_kill_greeter.patch: remove the 2 second timeout, it is
useless now.
@@ -7,8 +7,28 @@
* 30_utf8_locale.patch: dropped, it’s useless now. Furthermore the
official locale name is now bl_AH.utf8, it’s extracted directly from
the locales package by accountsservice.
-
- -- Josselin Mouette <joss at debian.org> Wed, 04 May 2011 21:09:36 +0200
+ * Build-depend on gnome-settings-daemon-dev and
+ gsettings-desktop-schemas.
+ * Rename 21_schemas_usr.patch to 90_config_comments.patch, to match
+ its true meaning and the fact it won’t be forwarded.
+ * Allow to tune the GSettings configuration like for GConf.
+ + 91_dconf_override.patch: new Debian-specific patch. Turn the
+ make-dconf-override-db script into one that creates a GSettings
+ override file. Drop the dconf profile entirely.
+ + Install the result in /usr/share/gdm/greeter-settings.
+ + 92_gsettings_path.patch: new Debian-specific patch. Set
+ GSETTINGS_SCHEMA_DIR in the welcome session instead of
+ DCONF_PROFILE.
+ + Require gsettings-desktop-schemas and libglib2.0-bin in the binary
+ package.
+ + greeter.gsettings: new file. Set the Debian GSettings defaults.
+ + Install it in /etc/gdm3 and link it in
+ /usr/share/gdm/greeter-settings.
+ + gdm3.init: regenerate the schemas if needed in /var/lib/gdm3.
+ * greeter.gconf-defaults: remove settings that are necessarily in
+ GSettings now.
+
+ -- Josselin Mouette <joss at debian.org> Thu, 12 May 2011 00:09:50 +0200
gdm3 (3.0.0-1) experimental; urgency=low
Modified: desktop/experimental/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control?rev=27895&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control [utf-8] Wed May 11 22:15:09 2011
@@ -24,6 +24,7 @@
libfontconfig1-dev (>= 2.5.0),
libupower-glib-dev (>= 0.9.0),
libaccountsservice-dev (>= 0.6.5),
+ gnome-settings-daemon-dev (>= 2.91.2),
libpolkit-gobject-1-dev (>= 0.92),
libpolkit-gtk-1-dev (>= 0.92),
libx11-dev,
@@ -42,7 +43,8 @@
libattr1-dev [linux-any],
iso-codes,
libaudit-dev [linux-any],
- docbook-xml
+ docbook-xml,
+ gsettings-desktop-schemas
Standards-Version: 3.9.0
Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/gdm3/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/
@@ -62,6 +64,8 @@
librsvg2-common,
gconf2 (>= 2.26.2-3),
accountsservice (>= 0.6.9-2),
+ gsettings-desktop-schemas,
+ libglib2.0-bin (>= 2.26),
dconf-gsettings-backend
Recommends: zenity,
xserver-xephyr,
Modified: desktop/experimental/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control.in?rev=27895&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control.in [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control.in [utf-8] Wed May 11 22:15:09 2011
@@ -19,6 +19,7 @@
libfontconfig1-dev (>= 2.5.0),
libupower-glib-dev (>= 0.9.0),
libaccountsservice-dev (>= 0.6.5),
+ gnome-settings-daemon-dev (>= 2.91.2),
libpolkit-gobject-1-dev (>= 0.92),
libpolkit-gtk-1-dev (>= 0.92),
libx11-dev,
@@ -37,7 +38,8 @@
libattr1-dev [linux-any],
iso-codes,
libaudit-dev [linux-any],
- docbook-xml
+ docbook-xml,
+ gsettings-desktop-schemas
Standards-Version: 3.9.0
Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/gdm3/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/
@@ -57,6 +59,8 @@
librsvg2-common,
gconf2 (>= 2.26.2-3),
accountsservice (>= 0.6.9-2),
+ gsettings-desktop-schemas,
+ libglib2.0-bin (>= 2.26),
dconf-gsettings-backend
Recommends: zenity,
xserver-xephyr,
Modified: desktop/experimental/gdm3/debian/gdm3.dirs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.dirs?rev=27895&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.dirs [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.dirs [utf-8] Wed May 11 22:15:09 2011
@@ -3,4 +3,5 @@
etc/gdm3/PreSession
etc/gdm3/PostSession
usr/share/gdm/BuiltInSessions
+usr/share/gdm/greeter-settings
var/lib/gdm3
Modified: desktop/experimental/gdm3/debian/gdm3.init
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.init?rev=27895&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.init [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.init [utf-8] Wed May 11 22:15:09 2011
@@ -32,6 +32,7 @@
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
gen_config() {
+ # GConf part is generated with update-gconf-defaults
if [ -d /var/lib/gdm3/.gconf.mandatory ]; then
update-gconf-defaults \
--source=/usr/share/gdm/greeter-config \
@@ -41,6 +42,27 @@
fi
if [ -f /var/lib/gdm3/.gconf.mandatory/%gconf-tree.xml ]; then
chown Debian-gdm:Debian-gdm /var/lib/gdm3/.gconf.mandatory/%gconf-tree.xml
+ fi
+
+ # GSettings part is generated with glib-compile-schemas
+ if [ -d /var/lib/gdm3 ]; then
+ needed=no
+ if [ -f /var/lib/gdm3/gschemas.compiled ]; then
+ for f in /usr/share/glib-2.0/schemas/gschemas.compiled /usr/share/gdm/greeter-settings /usr/share/gdm/greeter-settings/*.gschema.override; do
+ if [ "$f" -nt /var/lib/gdm3/gschemas.compiled ]; then
+ needed=yes
+ break
+ fi
+ done
+ else
+ needed=yes
+ fi
+ if [ "$needed" = yes ]; then
+ tmpdir=$(mktemp -d --tmpdir gdm-XXXXXX)
+ ln -s /usr/share/glib-2.0/schemas/*.xml /usr/share/glib-2.0/schemas/*.override /usr/share/gdm/greeter-settings/*.override $tmpdir/
+ glib-compile-schemas --targetdir=/var/lib/gdm3 $tmpdir
+ rm -rf $tmpdir
+ fi
fi
}
Modified: desktop/experimental/gdm3/debian/gdm3.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.install?rev=27895&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.install [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.install [utf-8] Wed May 11 22:15:09 2011
@@ -1,5 +1,6 @@
debian/Xsession etc/gdm3
debian/greeter.gconf-defaults etc/gdm3
+debian/greeter.gsettings etc/gdm3
debian/default.desktop usr/share/gdm/BuiltInSessions
data/session-setup.entries usr/share/gdm/greeter-config
debian/insserv.conf.d etc
Modified: desktop/experimental/gdm3/debian/gdm3.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.links?rev=27895&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.links [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.links [utf-8] Wed May 11 22:15:09 2011
@@ -1,1 +1,2 @@
/etc/gdm3/greeter.gconf-defaults /usr/share/gdm/greeter-config/20_debian
+/etc/gdm3/greeter.gsettings /usr/share/gdm/greeter-settings/yy_debian.gschema.override
Modified: desktop/experimental/gdm3/debian/greeter.gconf-defaults
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/greeter.gconf-defaults?rev=27895&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/greeter.gconf-defaults [utf-8] (original)
+++ desktop/experimental/gdm3/debian/greeter.gconf-defaults [utf-8] Wed May 11 22:15:09 2011
@@ -1,15 +1,13 @@
-# Use a specific background
-#/desktop/gnome/background/picture_filename /usr/share/images/desktop-base/login-background.svg
-#/desktop/gnome/background/picture_options zoom
+# These are the options for the greeter session that can be set
+# through GConf. Any GConf setting that is used by the greeter
+# session can be set here.
+#
+# Most options should be set through GSettings now, but some
+# applications, including the greeter itself, still use GConf.
-# Theming options
-#/desktop/gnome/interface/gtk_theme Clearlooks
# Greeter options
/apps/gdm/simple-greeter/logo_icon_name debian-swirl
-
-# Play system beeps - especially the one when the greeter is ready
-/desktop/gnome/sound/event_sounds true
# Some other possible options
#/apps/gdm/simple-greeter/banner_message_enable true
Added: desktop/experimental/gdm3/debian/greeter.gsettings
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/greeter.gsettings?rev=27895&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/greeter.gsettings (added)
+++ desktop/experimental/gdm3/debian/greeter.gsettings [utf-8] Wed May 11 22:15:09 2011
@@ -1,0 +1,17 @@
+# 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.
+
+
+# Set a specific background
+[org.gnome.desktop.background]
+picture-uri='file:///usr/share/images/desktop-base/login-background.svg'
+picture-options='zoom'
+
+# Theming options
+#[org.gnome.desktop.interface]
+#gtk-theme='Adwaita'
+
+# Prevent the power management icon from showing up
+[org.gnome.power-manager]
+icon-policy='never'
Added: desktop/experimental/gdm3/debian/patches/91_dconf_override.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/91_dconf_override.patch?rev=27895&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/patches/91_dconf_override.patch (added)
+++ desktop/experimental/gdm3/debian/patches/91_dconf_override.patch [utf-8] Wed May 11 22:15:09 2011
@@ -1,0 +1,98 @@
+Index: gdm-3.0.0/data/Makefile.am
+===================================================================
+--- gdm-3.0.0.orig/data/Makefile.am 2011-05-11 22:14:01.807002942 +0200
++++ gdm-3.0.0/data/Makefile.am 2011-05-11 22:15:26.103415033 +0200
+@@ -120,12 +120,6 @@ MAINTAINERCLEANFILES = \
+ dconf-override-db \
+ Makefile.in
+
+-dconf-override-db: $(srcdir)/make-dconf-override-db.sh
+- $(srcdir)/make-dconf-override-db.sh
+-
+-dist-hook: $(srcdir)/dconf-override-db
+- cp $(srcdir)/dconf-override-db $(distdir)
+-
+ uninstall-hook:
+ rm -f \
+ $(DESTDIR)$(GDM_CUSTOM_CONF) \
+@@ -137,19 +131,13 @@ uninstall-hook:
+ $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm \
+ $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin \
+ $(DESTDIR)$(workingdir)/.gconf.path \
+- $(DESTDIR)$(sysconfdir)/dconf/db/gdm \
+- $(DESTDIR)$(sysconfdir)/dconf/profile/gdm \
+ -rf \
+ $(DESTDIR)$(workingdir)/.gconf.mandatory \
+ $(DESTDIR)$(workingdir)/.config/dconf \
+ $(DESTDIR)$(screenshotdir) \
+ $(DESTDIR)$(xauthdir)
+
+- -rmdir \
+- $(DESTDIR)$(sysconfdir)/dconf/db \
+- $(DESTDIR)$(sysconfdir)/dconf
+-
+-install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path dconf-override-db
++install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path
+ if test '!' -d $(DESTDIR)$(gdmconfdir); then \
+ $(mkinstalldirs) $(DESTDIR)$(gdmconfdir); \
+ chmod 755 $(DESTDIR)$(gdmconfdir); \
+@@ -247,18 +235,6 @@ install-data-hook: gdm.conf-custom Xsess
+ chown gdm:gdm $(DESTDIR)$(workingdir)/.config/dconf || : ; \
+ 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)$(cachedir); then \
+ $(mkinstalldirs) $(DESTDIR)$(cachedir); \
+ chmod 1755 $(DESTDIR)$(cachedir); \
+@@ -272,6 +248,3 @@ install-data-hook: gdm.conf-custom Xsess
+ chmod 1750 $(DESTDIR)$(workingdir)/.gconf.mandatory
+ chmod 1640 $(DESTDIR)$(workingdir)/.gconf.mandatory/*.xml
+
+- $(INSTALL_DATA) $(srcdir)/dconf-override-db $(DESTDIR)$(sysconfdir)/dconf/db/gdm
+- $(INSTALL_DATA) $(srcdir)/dconf-profile $(DESTDIR)$(sysconfdir)/dconf/profile/gdm
+-
+Index: gdm-3.0.0/data/make-dconf-override-db.sh
+===================================================================
+--- gdm-3.0.0.orig/data/make-dconf-override-db.sh 2011-05-11 22:16:11.311636062 +0200
++++ gdm-3.0.0/data/make-dconf-override-db.sh 2011-05-11 22:26:09.582560838 +0200
+@@ -2,10 +2,16 @@
+
+ set -e
+
+-export XDG_CONFIG_HOME=$(mktemp -d --tmpdir="$PWD")
+-eval `dbus-launch --sh-syntax`
+-
+-trap 'rm -rf $XDG_CONFIG_HOME; kill $DBUS_SESSION_BUS_PID' ERR
++gsettings()
++{
++ if [ "$1" = set ]; then
++ echo "[$2]"
++ echo "$3"="$4"
++ echo
++ else
++ /usr/bin/gsettings "$@"
++ fi
++}
+
+ gsettings set org.gnome.power-manager show-actions false
+
+@@ -49,8 +55,3 @@ gsettings set org.gnome.settings-daemon.
+ gsettings set org.gnome.settings-daemon.plugins.sound active true
+ gsettings set org.gnome.settings-daemon.plugins.xrandr active true
+ gsettings set org.gnome.settings-daemon.plugins.xsettings active true
+-
+-mv $XDG_CONFIG_HOME/dconf/user dconf-override-db
+-rm -rf $XDG_CONFIG_HOME
+-
+-kill $DBUS_SESSION_BUS_PID
Added: desktop/experimental/gdm3/debian/patches/92_gsettings_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/92_gsettings_path.patch?rev=27895&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/patches/92_gsettings_path.patch (added)
+++ desktop/experimental/gdm3/debian/patches/92_gsettings_path.patch [utf-8] Wed May 11 22:15:09 2011
@@ -1,0 +1,13 @@
+Index: gdm-3.0.0/daemon/gdm-welcome-session.c
+===================================================================
+--- gdm-3.0.0.orig/daemon/gdm-welcome-session.c 2011-05-11 22:40:05.686648361 +0200
++++ gdm-3.0.0/daemon/gdm-welcome-session.c 2011-05-11 22:42:43.327419018 +0200
+@@ -439,7 +439,7 @@ get_welcome_environment (GdmWelcomeSessi
+ g_hash_table_insert (hash, g_strdup ("WINDOWPATH"), g_strdup (g_getenv ("WINDOWPATH")));
+ g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true"));
+ g_hash_table_insert (hash, g_strdup ("GVFS_DISABLE_FUSE"), g_strdup ("1"));
+- g_hash_table_insert (hash, g_strdup ("DCONF_PROFILE"), g_strdup ("gdm"));
++ g_hash_table_insert (hash, g_strdup ("GSETTINGS_SCHEMA_DIR"), g_strdup ("/var/lib/gdm3"));
+
+ g_hash_table_foreach (hash, (GHFunc)listify_hash, env);
+ g_hash_table_destroy (hash);
Modified: desktop/experimental/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/series?rev=27895&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/series [utf-8] Wed May 11 22:15:09 2011
@@ -12,6 +12,8 @@
18_switch_kill_greeter.patch
#19_configure_xserver.patch
20_endsession_respawn.patch
-21_schemas_usr.patch
22_noconsole.patch
29_grep_path.patch
+90_config_comments.patch
+91_dconf_override.patch
+92_gsettings_path.patch
Modified: desktop/experimental/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/rules?rev=27895&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/rules [utf-8] (original)
+++ desktop/experimental/gdm3/debian/rules [utf-8] Wed May 11 22:15:09 2011
@@ -56,6 +56,8 @@
rm -f debian/gdm3/usr/share/gdm/autostart/LoginWindow/gnome-session-check-accelerated.desktop
cd debian/gdm3/usr/share/gdm/greeter-config && \
mv session-setup.entries 10_upstream.entries
+ data/make-dconf-override-db.sh > \
+ debian/gdm3/usr/share/gdm/greeter-settings/xx_upstream.gschema.override
INFILES := $(wildcard debian/*.desktop.in)
OUTFILES := $(INFILES:.desktop.in=.desktop)
More information about the pkg-gnome-commits
mailing list