r22498 - in /desktop/experimental/gdm/debian: TODO changelog default.desktop gdm.dirs gdm.install patches/09_default_session.patch patches/series

lethalman-guest at users.alioth.debian.org lethalman-guest at users.alioth.debian.org
Fri Dec 4 13:44:55 UTC 2009


Author: lethalman-guest
Date: Fri Dec  4 13:44:54 2009
New Revision: 22498

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22498
Log:
* debian/default.desktop, debian/gdm.install, debian/gdm.dirs,
  debian/patches/09_default_session.patch:
  - Ubuntu patch to use default.desktop instead of gnome.desktop as default
    session.
  - Install our default.desktop under /usr/share/gdm/BuiltInSessions,
    Xsession.d scripts will start the system default session.
  - TODO: The default session is always GNOME

Added:
    desktop/experimental/gdm/debian/default.desktop
    desktop/experimental/gdm/debian/patches/09_default_session.patch
Modified:
    desktop/experimental/gdm/debian/TODO
    desktop/experimental/gdm/debian/changelog
    desktop/experimental/gdm/debian/gdm.dirs
    desktop/experimental/gdm/debian/gdm.install
    desktop/experimental/gdm/debian/patches/series

Modified: desktop/experimental/gdm/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm/debian/TODO?rev=22498&op=diff
==============================================================================
--- desktop/experimental/gdm/debian/TODO [utf-8] (original)
+++ desktop/experimental/gdm/debian/TODO [utf-8] Fri Dec  4 13:44:54 2009
@@ -5,9 +5,6 @@
    => There are so many regressions, we probably need to ship the new 
       version in a new package named e.g. gdm3.
  
- * The default session is always GNOME
-   => Fixed by Ubuntu’s 15_default_session.patch
-
  * There is no configuration GUI
    => Ubuntu has one, in 08_use_polkit_for_settings.patch and 
       09_gdmsetup.patch.

Modified: desktop/experimental/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm/debian/changelog?rev=22498&op=diff
==============================================================================
--- desktop/experimental/gdm/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm/debian/changelog [utf-8] Fri Dec  4 13:44:54 2009
@@ -31,6 +31,13 @@
     - Added to only show frequent users in greeter that logged in with GDM.
     - TODO: 03_hide_system_users.patch to avoid showing system users in recent
       connections
+  * debian/default.desktop, debian/gdm.install, debian/gdm.dirs,
+    debian/patches/09_default_session.patch:
+    - Ubuntu patch to use default.desktop instead of gnome.desktop as default
+      session.
+    - Install our default.desktop under /usr/share/gdm/BuiltInSessions,
+      Xsession.d scripts will start the system default session.
+    - TODO: The default session is always GNOME
   * debian/patches/90_relibtoolize.patch:
     - Update for 05_default_keyboard_layout_xkl.patch libxklavier changes to
       Makefile.am.
@@ -46,7 +53,7 @@
   * debian/TODO:
     - gdmflexiserver is ignoring many options, including xnest.
 
- -- Luca Bruno <lethalman88 at gmail.com>  Sat, 21 Nov 2009 13:01:41 +0100
+ -- Luca Bruno <lethalman88 at gmail.com>  Fri, 04 Dec 2009 14:24:12 +0100
 
 gdm (2.26.1-1) UNRELEASED; urgency=low
 

Added: desktop/experimental/gdm/debian/default.desktop
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm/debian/default.desktop?rev=22498&op=file
==============================================================================
--- desktop/experimental/gdm/debian/default.desktop (added)
+++ desktop/experimental/gdm/debian/default.desktop [utf-8] Fri Dec  4 13:44:54 2009
@@ -1,0 +1,6 @@
+[Desktop Entry]
+Name=System Default
+Comment=This session logs you into system default session
+Exec=default
+Icon=
+Type=Application

Modified: desktop/experimental/gdm/debian/gdm.dirs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm/debian/gdm.dirs?rev=22498&op=diff
==============================================================================
--- desktop/experimental/gdm/debian/gdm.dirs [utf-8] (original)
+++ desktop/experimental/gdm/debian/gdm.dirs [utf-8] Fri Dec  4 13:44:54 2009
@@ -4,3 +4,4 @@
 etc/gdm/Init
 etc/gdm/PreSession
 etc/gdm/PostSession
+usr/share/gdm/BuiltInSessions

Modified: desktop/experimental/gdm/debian/gdm.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm/debian/gdm.install?rev=22498&op=diff
==============================================================================
--- desktop/experimental/gdm/debian/gdm.install [utf-8] (original)
+++ desktop/experimental/gdm/debian/gdm.install [utf-8] Fri Dec  4 13:44:54 2009
@@ -5,4 +5,5 @@
 debian/greeter.gconf-defaults		etc/gdm
 debian/gdmflexiserver.desktop		usr/share/gdm/applications
 debian/gdmflexiserver.svg		usr/share/icons/hicolor/scalable/apps
+debian/default.desktop			usr/share/gdm/BuiltInSessions
 data/session-setup.entries		usr/share/gdm/greeter-config

Added: desktop/experimental/gdm/debian/patches/09_default_session.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm/debian/patches/09_default_session.patch?rev=22498&op=file
==============================================================================
--- desktop/experimental/gdm/debian/patches/09_default_session.patch (added)
+++ desktop/experimental/gdm/debian/patches/09_default_session.patch [utf-8] Fri Dec  4 13:44:54 2009
@@ -1,0 +1,15 @@
+Description: Prefer "default.desktop", so that other desktop environments like XFCE can use gdm, too, without being forced to start GNOME.
+Ubuntu: https://launchpad.net/bugs/403291
+Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=594733
+diff -urN gdm-2.28.1.orig/daemon/gdm-session-direct.c gdm-2.28.1/daemon/gdm-session-direct.c
+--- gdm-2.28.1.orig/daemon/gdm-session-direct.c	2009-10-20 00:12:45.000000000 +0200
++++ gdm-2.28.1/daemon/gdm-session-direct.c	2009-12-04 14:18:27.000000000 +0100
+@@ -615,7 +615,7 @@
+         int           i;
+         char         *name;
+ 
+-        name = g_strdup ("gnome");
++        name = g_strdup ("default");
+         if (get_session_command_for_name (name, NULL)) {
+                 return name;
+         }

Modified: desktop/experimental/gdm/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm/debian/patches/series?rev=22498&op=diff
==============================================================================
--- desktop/experimental/gdm/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gdm/debian/patches/series [utf-8] Fri Dec  4 13:44:54 2009
@@ -6,4 +6,5 @@
 06_first_vt.patch
 07_libexec-paths.patch
 08_frequent-users_greeter.patch
+09_default_session.patch
 90_relibtoolize.patch




More information about the pkg-gnome-commits mailing list