r32216 - in /desktop/unstable/gdm3/debian: changelog control control.in gdm3.install greeter.gsettings patches/91_dconf_override.patch patches/92_gsettings_path.patch patches/93_xdg_data_dirs.patch patches/series rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun Dec 18 23:14:24 UTC 2011 

Author: joss
Date: Sun Dec 18 23:14:23 2011
New Revision: 32216

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32216
Log:
* 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.
* greeter.gsettings:
  + Force gdm-fallback as the default session.
  + Document how to use gdm-shell.
* rules:
  + Generate xx_upstream.gschema.override from the new 
    00-upstream-settings file (much simpler).
  + Remove /etc/dconf from the installed files.
* gdm3.install:
  + Stop installing MIME files by hand.

Removed:
    desktop/unstable/gdm3/debian/patches/91_dconf_override.patch
    desktop/unstable/gdm3/debian/patches/93_xdg_data_dirs.patch
Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/control
    desktop/unstable/gdm3/debian/control.in
    desktop/unstable/gdm3/debian/gdm3.install
    desktop/unstable/gdm3/debian/greeter.gsettings
    desktop/unstable/gdm3/debian/patches/92_gsettings_path.patch
    desktop/unstable/gdm3/debian/patches/series
    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=32216&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Sun Dec 18 23:14:23 2011
@@ -20,6 +20,22 @@
   * 18_parametrize_create_display.patch: updated for the new version.
   * 19_static_transient_display.patch: unfuzzed.
   * 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.
+  * greeter.gsettings:
+    + Force gdm-fallback as the default session.
+    + Document how to use gdm-shell.
+  * rules:
+    + Generate xx_upstream.gschema.override from the new 
+      00-upstream-settings file (much simpler).
+    + Remove /etc/dconf from the installed files.
+  * gdm3.install:
+    + Stop installing MIME files by hand.
   * WORK IN PROGRESS. DO NOT UPLOAD.
 
  -- Josselin Mouette <joss at debian.org>  Thu, 24 Nov 2011 22:29:47 +0100

Modified: desktop/unstable/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/control?rev=32216&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/control [utf-8] (original)
+++ desktop/unstable/gdm3/debian/control [utf-8] Sun Dec 18 23:14:23 2011
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: gnome-pkg-tools (>= 0.16.3),
                debhelper (>= 8),
                cdbs,
@@ -65,7 +65,6 @@
          accountsservice (>= 0.6.12),
          gsettings-desktop-schemas,
          libglib2.0-bin (>= 2.26),
-         dconf-gsettings-backend,
          x11-xserver-utils
 Recommends: zenity,
             xserver-xephyr,

Modified: desktop/unstable/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/control.in?rev=32216&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/control.in [utf-8] (original)
+++ desktop/unstable/gdm3/debian/control.in [utf-8] Sun Dec 18 23:14:23 2011
@@ -60,7 +60,6 @@
          accountsservice (>= 0.6.12),
          gsettings-desktop-schemas,
          libglib2.0-bin (>= 2.26),
-         dconf-gsettings-backend,
          x11-xserver-utils
 Recommends: zenity,
             xserver-xephyr,

Modified: desktop/unstable/gdm3/debian/gdm3.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.install?rev=32216&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.install [utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.install [utf-8] Sun Dec 18 23:14:23 2011
@@ -3,6 +3,4 @@
 debian/greeter.gsettings		etc/gdm3
 debian/default.desktop			usr/share/gdm/BuiltInSessions
 data/session-setup.entries		usr/share/gdm/greeter-config
-data/mimeapps.list			usr/share/gdm/applications
-data/mime-dummy-handler.desktop		usr/share/gdm/applications
 debian/insserv.conf.d			etc

Modified: desktop/unstable/gdm3/debian/greeter.gsettings
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/greeter.gsettings?rev=32216&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/greeter.gsettings [utf-8] (original)
+++ desktop/unstable/gdm3/debian/greeter.gsettings [utf-8] Sun Dec 18 23:14:23 2011
@@ -7,6 +7,13 @@
 #[org.gnome.desktop.interface]
 #gtk-theme='Adwaita'
 
+# 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'
+
 # Prevent the power management icon from showing up
 [org.gnome.power-manager]
 icon-policy='never'

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=32216&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] Sun Dec 18 23:14:23 2011
@@ -1,13 +1,14 @@
-Index: gdm-3.0.0/daemon/gdm-welcome-session.c
+Index: gdm-3.2.1.1/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")));
+--- 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
+ 
          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_foreach (hash, (GHFunc)listify_hash, env);
-         g_hash_table_destroy (hash);
+         return hash;
+ }

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=32216&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Sun Dec 18 23:14:23 2011
@@ -13,6 +13,5 @@
 21_static_display_purge.patch
 22_noconsole.patch
 90_config_comments.patch
-91_dconf_override.patch
 92_gsettings_path.patch
 93_xdg_data_dirs.patch

Modified: desktop/unstable/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/rules?rev=32216&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/rules [utf-8] (original)
+++ desktop/unstable/gdm3/debian/rules [utf-8] Sun Dec 18 23:14:23 2011
@@ -52,13 +52,15 @@
 	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
 	rm -f debian/gdm3/usr/sbin/gdm
 	rm -f debian/gdm3/etc/pam.d/gdm
 	rm -f debian/gdm3/etc/pam.d/gdm-autologin
 	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 > \
+	awk '/\[.*\]/ { gsub("/","."); } ! /^#/ { print;}' \
+		data/00-upstream-settings > \
 		debian/gdm3/usr/share/gdm/greeter-settings/xx_upstream.gschema.override
 
 INFILES := $(wildcard debian/*.desktop.in)

More information about the pkg-gnome-commits mailing list