r22409 - in /desktop/experimental/gdm/debian: 59gdm-xdg-data-dirs Xsession changelog gdm.install

[lethalman-guest at users.alioth.debian.org]

Author: lethalman-guest
Date: Sat Nov 21 08:48:58 2009
New Revision: 22409

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22409
Log:
Use /etc/gdm/Xsession instead of /etc/X11/Xsession.d/... to add /usr/share/gdm
to XDG_DATA_DIRS.

Removed:
    desktop/experimental/gdm/debian/59gdm-xdg-data-dirs
Modified:
    desktop/experimental/gdm/debian/Xsession
    desktop/experimental/gdm/debian/changelog
    desktop/experimental/gdm/debian/gdm.install

Modified: desktop/experimental/gdm/debian/Xsession
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm/debian/Xsession?rev=22409&op=diff
==============================================================================
--- desktop/experimental/gdm/debian/Xsession [utf-8] (original)
+++ desktop/experimental/gdm/debian/Xsession [utf-8] Sat Nov 21 08:48:58 2009
@@ -185,6 +185,14 @@
   set default $*
 fi
 
+# Add /usr/share/gdm to XDG_DATA_DIRS
+if [ -z "$XDG_DATA_DIRS" ]; then
+  XDG_DATA_DIRS=/usr/share/gdm/:/usr/local/share/:/usr/share/
+else
+  XDG_DATA_DIRS="$XDG_DATA_DIRS":/usr/share/gdm/
+fi
+export XDG_DATA_DIRS
+
 # use run-parts to source every file in the session directory; we source
 # instead of executing so that the variables and functions defined above
 # are available to the scripts, and so that they can pass variables to each

Modified: desktop/experimental/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm/debian/changelog?rev=22409&op=diff
==============================================================================
--- desktop/experimental/gdm/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm/debian/changelog [utf-8] Sat Nov 21 08:48:58 2009
@@ -30,19 +30,19 @@
   * debian/patches/90_relibtoolize.patch:
     - Update for 05_default_keyboard_layout_xkl.patch libxklavier changes to
       Makefile.am.
-  * debian/59gdm-xdg-data-dirs, debian/gdmflexiserver.svg,
+  * debian/Xsession, debian/gdmflexiserver.svg,
     debian/gdmflexiserver.desktop, debian/gdm.install:
-    - /etc/X11/Xsession.d/59gdm-xdg-data-dirs will add /usr/share/gdm to
-      XDG_DATA_DIRS so that /usr/share/gdm/applications/gdmflexiserver.desktop
-      appears only in gdm sessions with icon
+    - /etc/gdm/Xsession will add /usr/share/gdm to XDG_DATA_DIRS so that
+      /usr/share/gdm/applications/gdmflexiserver.desktop appears only in gdm
+      sessions with icon
       /usr/share/icons/hicolor/scalable/apps/gdmflexiserver.svg.
-    - TODO: gdmflexiserver doesn’t appear in the menus.
+    - TODO: gdmflexiserver doesn't appear in the menus.
   * debian/gdmflexiserver.1.pod:
     - Added for lintian, even if most of the options are currently ignored.
   * debian/TODO:
     - gdmflexiserver is ignoring many options, including xnest.
 
- -- Luca Bruno <lethalman88 at gmail.com>  Fri, 20 Nov 2009 23:31:21 +0100
+ -- Luca Bruno <lethalman88 at gmail.com>  Sat, 21 Nov 2009 09:31:13 +0100
 
 gdm (2.26.1-1) UNRELEASED; urgency=low
 

Modified: desktop/experimental/gdm/debian/gdm.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm/debian/gdm.install?rev=22409&op=diff
==============================================================================
--- desktop/experimental/gdm/debian/gdm.install [utf-8] (original)
+++ desktop/experimental/gdm/debian/gdm.install [utf-8] Sat Nov 21 08:48:58 2009
@@ -3,7 +3,6 @@
 debian/moreblue-orbit-gdm.svg           usr/share/images/desktop-base
 debian/gdmXnestWrapper                  usr/share/gdm/
 debian/greeter.gconf-defaults		etc/gdm
-debian/59gdm-xdg-data-dirs		etc/X11/Xsession.d
 debian/gdmflexiserver.desktop		usr/share/gdm/applications
 debian/gdmflexiserver.svg		usr/share/icons/hicolor/scalable/apps
 data/session-setup.entries		usr/share/gdm/greeter-config