~ubuntu-branches/ubuntu/maverick/gnome-session/maverick

« back to all changes in this revision

Viewing changes to debian/55gnome-session_gnomerc

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-05-08 19:54:30 UTC
  • mfrom: (1.1.53 upstream) (2.1.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20090508195430-dgym2akyp3v19iyp
Tags: 2.26.1-1ubuntu1
* Sync with Debian Experimental.
* debian/control{.in}:
  - Add XS-Vcs-Bzr URL.
  - Dropped build-depends on libgnomeui-dev, gnome-keyring.
  - Added build-depends on xtrans-dev.
* debian/copyright:
  - Added new authors.
* debian/gnome-session.gconf-defaults:
  - Set gnome-wm as the default WM.
* debian/patches/19_gnome-wm-tweaking.patch:
  - Use GConf key to set default WM.
* debian/patches/80_new_upstream_session_dialog.patch:
  - Bugzilla patch to change the session dialog.
* debian/patches/81_gnome_wm_install.patch:
  - Install gnome-wm.desktop.
* debian/patches/90_no_debug_flood_by_default.patch:
  - Ship patch to disable debugging by default. This patch should
    be re-enabled during the gnome-session development cycle.
* debian/patches/90_relibtoolize.patch:
  - Dropped in favour of 98_autotools.patch.
* debian/patches/95_dbus_request_shutdown.patch:
  - Add "RequestShutdown" and "RequestReboot" DBus methods to
    allow other applications to shutdown or reboot the machine
    via the session manager.
* debian/patches/98_autotools.patch:
  - Required autotools update.
* debian/gnome-session.install:
  - Don't install /etc/gnome/defaults.list - this is installed
    by desktop-file-utils.
* debian/gnome-session.links:
  - Don't create hanging /usr/share/gnome/applications/defaults.list
    symlink.
* debian/rules:
  - Don't move autostart files to /usr/share/gnome/autostart. The
    upstream default is to install them in to /etc/xdg/autostart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
9
9
  if [ -r "$GNOMERC" ]; then
10
10
    . "$GNOMERC"
11
11
  fi
 
12
  # We prepend /usr/share/gnome since it actually points to /etc so
 
13
  # it is configurable.
 
14
  if [ -z "$XDG_DATA_DIRS" ]; then
 
15
    XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
 
16
  else
 
17
    XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS"
 
18
  fi
 
19
  export XDG_DATA_DIRS
12
20
fi