-
Committer:
Bazaar Package Importer
-
Author(s):
Lionel Le Folgoc
-
Date:
2009-02-06 14:58:36 UTC
-
mfrom:
(1.1.14 upstream)
-
Revision ID:
james.westby@ubuntu.com-20090206145836-gop49lxywvt1qutg
Tags: 4.5.99.1-0ubuntu1
* Merge from Debian pkg-xfce UNRELEASED (r2639). Remaining Ubuntu changes:
- debian/control: use our Vcs-* fields
- debian/rules: do not install a desktop-base config file, it'll be shipped
by xubuntu-default-settings.
- debian/patches/02_xubuntu_splash.patch: install the xubuntu session
splash (updated to apply cleanly).
- debian/patches/07_fix-autostart-editor-crash.patch: fix a
xfce4-autostart-editor crash with desktop files containing a "Type" which
is not "Application" (updated to apply cleanly.
- debian/patches/series: refreshed.
- enable GNOME services support:
+ debian/rules: pass --enable-gnome
+ debian/control: b-d on libgconf2-dev.
* Bugs fixed by this new release:
- "[edgy] Spelling mistake in error message." (LP: #64477)