~xubuntu-dev/xfce4-utils/lucid

Viewing all changes in revision 47.

  • Committer: Lionel Le Folgoc
  • Date: 2009-11-15 14:38:50 UTC
  • Revision ID: mrpouit@ubuntu.com-20091115143850-9kdwkera0mabxmo2
* Merge from Debian testing, 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/rules:
    + pass --with-vendor-info=Xubuntu to ./configure
    + do not replace firefox calls with iceweasel
  - debian/Xubuntu: added
  - debian/patches:
    + xubuntu_update-xdg-config-and-data-dirs.patch: prepend
      "/etc/xdg/xubuntu" to XDG_{CONFIG,DATA}_DIRS to allow
      xubuntu-default-settings config files to override upstream ones; also
      include /etc/xdg so that any settings that are not defined in the
      XDG_CONFIG_DIRS directory can be defined by /etc/xdg. (LP: #350962)
    + 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)
    + series: refreshed.
* debian/Xubuntu: replace mailto address with an url to pkg-xfce's website.
* debian/patches:
  - 02_use-Xsessions.options-for-ssh-agent-handling.patch refreshed to
    patch xinitrc.in.in.
* debian/control:
  - update standards version to 3.8.3.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: