r32617 - in /desktop/unstable/gdm3/debian: changelog gdm3.init gdm3.postinst patches/92_gsettings_path.patch rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Feb 20 22:06:03 UTC 2012
Author: joss
Date: Mon Feb 20 22:06:03 2012
New Revision: 32617
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32617
Log:
+ Install the dconf stuff in /usr/share/gdm.
* gdm3.postinst:
+ Remove the old gsettings file upon upgrade.
* gdm3.init:
+ Replace the gsettings generation by a dconf-based one.
+ Do a conversion for the configuration file so that it remains
compatible.
* 92_gsettings_path.patch: updated to force the dconf directory to be
in the GDM runtime directory.
Modified:
desktop/unstable/gdm3/debian/changelog
desktop/unstable/gdm3/debian/gdm3.init
desktop/unstable/gdm3/debian/gdm3.postinst
desktop/unstable/gdm3/debian/patches/92_gsettings_path.patch
desktop/unstable/gdm3/debian/rules
Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=32617&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Mon Feb 20 22:06:03 2012
@@ -24,8 +24,6 @@
* 29_grep_path.patch: dropped, merged upstream.
* 91_dconf_override.patch: dropped, the configuration generation has
completely changed.
- * 92_gsettings_path.patch: updated to force the gsettings backend to
- 'memory', avoiding to start the dconf backend at all.
* 93_xdg_data_dirs.patch: dropped, similar functionality merged
upstream.
* Drop the dconf-gsettings-backend dependency.
@@ -47,6 +45,15 @@
with the Debianized PAM stack.
+ Remove the associated PAM files.
+ Disable dh_makeshlibs.
+ + Install the dconf stuff in /usr/share/gdm.
+ * gdm3.postinst:
+ + Remove the old gsettings file upon upgrade.
+ * gdm3.init:
+ + Replace the gsettings generation by a dconf-based one.
+ + Do a conversion for the configuration file so that it remains
+ compatible.
+ * 92_gsettings_path.patch: updated to force the dconf directory to be
+ in the GDM runtime directory.
* gdm3.install:
+ Stop installing MIME files by hand.
* 93_private_lib.patch: new patch. Install the shared library in a
Modified: desktop/unstable/gdm3/debian/gdm3.init
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.init?rev=32617&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.init [utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.init [utf-8] Mon Feb 20 22:06:03 2012
@@ -44,12 +44,15 @@
chown Debian-gdm:Debian-gdm /var/lib/gdm3/.gconf.mandatory/%gconf-tree.xml
fi
- # GSettings part is generated with glib-compile-schemas
+ # GSettings part uses dconf update to generate a gdm profile
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
+ if [ -f /var/lib/gdm3/dconf/db/gdm ]; then
+ for f in \
+ /usr/share/gdm/dconf /usr/share/gdm/dconf/*-settings \
+ /usr/share/gdm/dconf/locks /usr/share/gdm/dconf/locks/*-locks \
+ /etc/gdm3/greeter.gsettings; do
+ if [ "$f" -nt /var/lib/gdm3/dconf/db/gdm ]; then
needed=yes
break
fi
@@ -58,10 +61,16 @@
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
+ rm -rf /var/lib/gdm3/dconf
+ mkdir -p /var/lib/gdm3/dconf/profile /var/lib/gdm3/dconf/db/gdm.d/locks
+ ln -s /usr/share/gdm/dconf-profile /var/lib/gdm3/dconf/profile/gdm
+ ln -s /usr/share/gdm/dconf/*-settings /var/lib/gdm3/dconf/db/gdm.d/
+ ln -s /usr/share/gdm/dconf/locks/*-locks /var/lib/gdm3/dconf/db/gdm.d/locks/
+ # The configuration file in /etc uses org.gnome.blah gsettings syntax.
+ # Convert it to org/gnome/blah dconf syntax.
+ awk '/\[.*\]/ { gsub("\\.","/"); } ! /^#/ { print;}' \
+ /etc/gdm3/greeter.gsettings > /var/lib/gdm3/dconf/db/gdm.d/90-debian-settings
+ dconf update /var/lib/gdm3/dconf/db
fi
fi
}
@@ -100,6 +109,8 @@
/var/run/gdm3.pid --name gdm3
start-stop-daemon --stop --signal HUP --quiet --name gconfd-2 \
--user Debian-gdm --oknodo
+ start-stop-daemon --stop --signal HUP --quiet --name dconf-service \
+ --user Debian-gdm --oknodo
set -e
log_end_msg $?
;;
Modified: desktop/unstable/gdm3/debian/gdm3.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.postinst?rev=32617&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.postinst [utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.postinst [utf-8] Mon Feb 20 22:06:03 2012
@@ -45,6 +45,11 @@
S=30
K=01
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl "3.2"; then
+ # Remove 3.0 gsettings configuration - now we use dconf
+ rm -f /var/lib/gdm3/gschemas.compiled
+fi
+
mkdir -p /var/lib/gdm3/.gconf.mandatory
cat > /var/lib/gdm3/.gconf.path << "EOF"
# System-wide settings set in /usr/share/gdm/greeter-config
Modified: desktop/unstable/gdm3/debian/patches/92_gsettings_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/92_gsettings_path.patch?rev=32617&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/92_gsettings_path.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/92_gsettings_path.patch [utf-8] Mon Feb 20 22:06:03 2012
@@ -1,14 +1,12 @@
Index: gdm-3.2.1.1/daemon/gdm-welcome-session.c
===================================================================
--- gdm-3.2.1.1.orig/daemon/gdm-welcome-session.c 2011-10-19 17:41:52.000000000 +0200
-+++ gdm-3.2.1.1/daemon/gdm-welcome-session.c 2011-12-18 23:53:11.546797520 +0100
-@@ -322,7 +322,8 @@ build_welcome_environment (GdmWelcomeSes
-
++++ gdm-3.2.1.1/daemon/gdm-welcome-session.c 2012-02-20 23:05:20.151709517 +0100
+@@ -323,6 +323,7 @@ build_welcome_environment (GdmWelcomeSes
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_BACKEND"), g_strdup ("memory"));
-+ g_hash_table_insert (hash, g_strdup ("GSETTINGS_SCHEMA_DIR"), g_strdup ("/var/lib/gdm3"));
+ g_hash_table_insert (hash, g_strdup ("DCONF_PROFILE"), g_strdup ("gdm"));
++ g_hash_table_insert (hash, g_strdup ("DCONF_DIR"), g_strdup ("/var/lib/gdm3/dconf"));
return hash;
}
Modified: desktop/unstable/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/rules?rev=32617&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/rules [utf-8] (original)
+++ desktop/unstable/gdm3/debian/rules [utf-8] Mon Feb 20 22:06:03 2012
@@ -56,7 +56,10 @@
dh_installpam -pgdm3 --name=gdm3-autologin
rm -rf debian/gdm3/var/lib/gdm3/.[cgl]*
rm -rf debian/gdm3/var/run
- rm -rf debian/gdm3/etc/dconf
+ cd debian/gdm3 && \
+ mv etc/dconf/profile/gdm usr/share/gdm/dconf-profile && \
+ mv etc/dconf/db/gdm.d usr/share/gdm/dconf &&
+ rmdir etc/dconf/db etc/dconf/profile etc/dconf
rm -rf debian/gdm3/usr/include
rm -rf debian/gdm3/usr/lib/pkgconfig
rm -f debian/gdm3/usr/sbin/gdm
@@ -67,9 +70,6 @@
rm -f lib*.a lib*.la lib*.so
cd debian/gdm3/usr/share/gdm/greeter-config && \
mv session-setup.entries 10_upstream.entries
- awk '/\[.*\]/ { gsub("/","."); } ! /^#/ { print;}' \
- data/00-upstream-settings > \
- 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