← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xfce4-utils/jaunty

« back to all changes in this revision

Viewing changes to gdm/XFce4.in

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2009-02-07 11:23:12 UTC
  • mfrom: (1.1.17 upstream)
  • Revision ID: james.westby@ubuntu.com-20090207112312-2mn6cn61863f49wi
Tags: 4.5.99.1-0ubuntu1
https://launchpad.net/bugs/264594
https://launchpad.net/bugs/232364
* Merge with Debian pkg-xfce UNRELEASED, remaining Ubuntu changes:
  - debian/control:
    + use our Vcs-* fields
    + build-depends on libdbus-glib-1-dev (>= 0.33)
    + allow gnome-screensaver to satisfy the screensaver Recommends. Prevents
      derivatives from pulling in xscreensaver. (LP: #264594)
  - debian/patches/00_xdg_data_dirs.patch: make sure to add /etc/xdg/xubuntu
    even if XDG_DATA_DIRS is already set
  - debian/patches/04_avoid-xcblib-hang.patch: avoid race condition and
    deadlock in libxcb by launching dbus-launch before gnome-screensaver
    (which should occur anyhow). (LP: #232364)
  - debian/patches/series: refreshed
  - debian/rules:
    + pass --with-vendor-info=Xubuntu to ./configure
    + do not replace firefox calls with iceweasel
  - debian/Xubuntu: added
* debian/patches/02_xfce4-about_return_version.patch: dropped, merged
  upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gdm/XFce4.in
1
 
#!/bin/sh
2
 
########################################################################
3
 
#
4
 
# XFce 4file for GDM.  Usually in /etc/X11/gdm/Sessions.
5
 
#
6
 
# Add support for XIM; Modified by Babyfai Cheung.  2002/03/10 
7
 
########################################################################
8
 
## Launch an XIM input server if needed
9
 
 
10
 
# This's for RedHat and Slackware
11
 
for i in /etc/X11/xinit/xinitrc.d/* ; do
12
 
    if [ -x "$i" ]; then
13
 
        . "$i"
14
 
    fi
15
 
done
16
 
 
17
 
# This's for Mandrake
18
 
if [ -x /etc/X11/xinit/XIM ]; then
19
 
   . /etc/X11/xinit/XIM
20
 
fi
21
 
 
22
 
exec BIN_DIR/startxfce4
23