-
Committer:
Lionel Le Folgoc
-
Date:
2009-01-31 09:48:51 UTC
-
Revision ID:
mrpouit@ubuntu.com-20090131094851-7s85pwhrfwfnt64i
* 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.
- debian/patches/07_fix-autostart-editor-crash.patch: fix a
xfce4-autostart-editor crash with desktop files containing a "Type" which
is not "Application".
* Fix broken translations (LP: #313688):
- debian/rules, debian/xubuntu-po/*: don't install these files, they contain
broken strings
- debian/patches/xubuntu-fix-logout-dialog-translations.patch: use this
minimal patch instead (taken from hardy-updates and slightly updated to
apply cleanly).
* Add 09_gnome_keyring_daemon_2_25_compat.patch which prevents
xfce4-session from spawning gnome-keyring-daemon on it's own.
It gets spawned by PAM during login, so it shouldn't be started
again by XFCE. (LP: #316222)
* Merge with Debian Xfce SVN UNRELASED, Ubuntu changes remaining:
- debian/patches:
+ add 00_logout_dialog.patch, 99_configure.patch: add suspend/hibernate
& 'switch user' options to logout dialog
+ add 02_xubuntu_splash.patch: install the xubuntu session splash
+ add 07_fix-autostart-editor-crash.patch: fix a xfce4-autostart-editor
crash with desktop files containing a "Type" which is not
"Application"
+ xubuntu-default-config.patch: default GNOME services set to true to
have accessibility services launched if installed
+ series: refreshed
- debian/pixmaps/*, debian/rules: add a menu icon (from Jozsef Mak) for
the autostart-editor and icons for the logout dialog
- debian/rules:
+ remove the config files, shipped with xubuntu-default-settings
+ do not ship uneeded icons
+ add "NoDisplay=true" to desktop files to hide them by default
+ pass --enable-gnome to configure scrips
+ replace upstream po files with xubuntu specific ones
- debian/control:
+ build-depend on libdbus-glib-1-dev, libgconf2-dev, sharutils
+ depends on hal instead of recommends
- debian/xubuntu-po/*: ship xubuntu-specific po files.
* Rearranged rules to make lintian happy
* debian/control:
+ Changed build-deps xbase-clients -> libx11-dev + x11-xserver-utils + libice-dev
+ xfce4-session: added dependency on x11-xserver-utils
* debian/patches:
+ add 06_fix-es-translation.patch: dropped, merged upstream
+ 99_configure.patch: refreshed
* new upstream bugfix release
* debian/patches:
- 07_startup-speed added, speed up startup by not waiting for forks().
- series edited to correctly include 06_rephrase-tip.
- 08_fix-fortune-path added, use absolute path when calling fortune.
closes: #497199
* debian/control:
- add build-dep on intltool.
* debian/xubuntu-po/*: ship xubuntu-specific po files.
* debian/rules: replace upstream po files with them (LP: #228784)
* Merge from debian unstable, remaining changes:
- debian/patches:
+ add 00_logout_dialog.patch, 99_configure.patch: add suspend/hibernate
& 'switch user' options to logout dialog
+ add 02_xubuntu_splash.patch: install the xubuntu session splash
+ add 06_fix-es-translation.patch: fix two broken strings
+ add 07_fix-autostart-editor-crash.patch: fix a xfce4-autostart-editor
crash with desktop files containing a "Type" which is not
"Application"
+ xubuntu-default-config.patch: default GNOME services set to true to
have accessibility services launched if installed
+ series: refreshed
- debian/pixmaps/*, debian/rules: add a menu icon (from Jozsef Mak) for
the autostart-editor and icons for the logout dialog
- debian/rules:
+ remove the config files, shipped with xubuntu-default-settings
+ do not ship uneeded icons
+ add "NoDisplay=true" to desktop files to hide them by default
+ pass --enable-gnome to configure scrips
- debian/control:
+ adhere to DebianMaintainerField
+ build-depend on libdbus-glib-1-dev, libgconf2-dev, sharutils
+ depends on hal instead of recommends
* debian/patches:
- 06_fix-es-translation.patch: fix two broken strings (LP: #214857)
- 07_fix-autostart-editor-crash.patch: fix a xfce4-autostart-editor crash
with desktop files containing a "Type" which is not "Application", thanks
Urs Fleisch for the patch (LP: #206867)
- series: refreshed.
* Merge from Debian unstable, remaining Ubuntu changes:
- debian/patches:
+ add 00_logout_dialog.patch, 99_configure.patch: add suspend/hibernate &
'switch user' options to logout dialog
+ 02_use-mice-as-default-engine.patch: dropped, we don't enable any
splash by default
+ add 02_xubuntu_splash.patch: install the xubuntu session splash
+ xubuntu-default-config.patch (formerly 05_default_config.patch):
default GNOME services set to true to have accessibility services
launched if installed
- debian/pixmaps/xfce4-autostart-editor.png.uue, debian/rules: add a menu
icon (from Jozsef Mak) for the autostart-editor
- debian/rules: pass --enable-gnome to configure scripts, and do not ship
uneeded config files and icons
- debian/control:
+ adhere to DebianMaintainerField
+ build-depend on libdbus-glib-1-dev, libgconf2-dev, sharutils
+ depends on hal instead of recommends
+ drop conflicts on desktop-base (<< 0.3.20).
* debian/rules:
- do not install the .desktop files which only create dups of the settings
manager items
- drop empty dirs.
* debian/lintian: drop unused overrides.
* debian/patches/series: refreshed.
* Merge from Debian unstable, remaining changes:
- use our xfce.mk class
- debian/patches/00_logout_dialog.patch: add suspend/hibernate & 'switch user'
options to logout dialog
- debian/patches/02_use-mice-as-default-engine.patch: dropped, we don't
enable any splash by default
- debian/patches/02_xubuntu_splash.patch: install the xubuntu session splash
- debian/patches/05_default_config.patch: default GNOME services set to
true to have accessibility services launched if installed
- debian/pixmaps/xfce4-autostart-editor.png.uue, debian/rules: add a menu
icon (from Jozsef Mak) for the autostart-editor
- debian/patches/series:dropped, we don't use quilt
- debian/compat: bump to 5
- debian/control:
+ update Maintainer field
+ update the Vcs-* headers
+ bump debhelper b-d to >= 5, add libdbus-glib-1-dev, libgconf2-dev,
sharutils and drop quilt, chrpath, fortune-mod & libdbus-1-dev
+ depend on hal instead of recommend
+ do not conflict on desktop-base (<< 0.3.20).
* debian/control: b-d on autotools-dev.
* debian/patches/02_xubuntu_splash.patch, debian/patches/99_configure.patch:
updated.
* debian/watch: Added from 4.4.1-2
* debian/patches/01_correct_shadows.patch: Re-added
* debian/postinst: Removed debian delta
* debian/control: Reduced debian delta
* debian/control:
- add XS-Vcs-Bzr & XS-Vcs-Browser fields
- don't recommend procps anymore
- bump debhelper b-d to >= 5.
* debian/compat: bump to 5.
* debian/rules: don't remove xfsm-shutdown-helper.
* Merge from Debian unstable, remaining changes:
- debian/patches/00_logout_dialog.patch
. add suspend/hibernate options to logout dialog
. add 'switch user' button to the logout dialog.
. updated to include a call to _()
. split the row of buttons into two
- debian/patches/02_xubuntu_splash.patch
+ Install the xubuntu session splash
- debian/patches/05_default_config.patch
. Default GNOME services set to true to have accessibility
services launched if installed
- debian/pixmaps/xfce4-autostart-editor.png.uue, debian/rules
. a menu icon (from Jozsef Mak) for the autostart-editor
- debian/rules: Use cdbs with xfce.mk
- debian/control:
. Update Maintainer field
. Depend on hal instead of recommend
. Recommend procps
. Conflicts & Replaces xfce4-toys
* Added debian/patches/02_xubuntu_splash.patch from edgy
LP: #148400
* Removed obsolete patches:
- debian/patches/01_correct_shadows.patch
- debian/patches/02_use-mice-as-default-engine.patch
* debian/patches/00_logout_dialog.patch: split the row of buttons into two.
(LP: #138485)
* debian/pixmaps/xfce4-autostart-editor.png.uue, debian/rules: add a menu
icon (from Jozsef Mak) for the autostart-editor. (LP: #58251,#105493)
* debian/patches/00_logout_dialog.patch: updated to include a call to _(),
otherwise the buttons aren't translated. (LP: #93553)
* Merge from debian unstable, remaining changes:
- debian/patches/00_logout_dialog.patch:
. add suspend/hibernate options to logout dialog
. add 'switch user' button to the logout dialog.
- debian/patches/03_default_config.patch: Default GNOME compatibility
to true to have accessibility services launched if installed
- use cdbs with xfce.mk
* debian/patches/02_xubuntu_splash.patch:
Drop xubuntu splash animation, we are not using it anyway
* debian/patches/00_logout_dialog.patch:
Add 'switch user' button to the logout dialog.
* debian/control: Update Maintainer field
* 00_suspend_hibernate.patch: add missing configuration bits
* New upstream release
* New upstream release, part of Xfce 4.4 RC2
* 01_drop_libgnome.patch: dropped, included upstream
* 00_suspend_hibernate.patch, 03_default_config.patch,
02_xubuntu_splash.patch, 99_configure.patch: updated
* debian/patches/03_default_config.patch: Default GNOME compatibility
to true to have accessibility services launched if installed
* debian/patches/00_suspend_hibernate.patch: Disable sleep hotkey
leave that to gnome-power-manager if installed
* debian/patches/03_default_config: Add entries for GNOME/KDE compatibility
defaulting to false.
* debian/patches/03_disable_splash.patch:
Disable splash screen at startup as it slows things down.
* Rebuild against dbus 0.90
* New svn snapshot, HAL support for shutdown/reboot patch merged
upstream. Provide our remaining changes as proper patches.
* debian/patches/00_suspend_hibernate:
-add suspend/hibernate options to logout dialog
-provide toggles in the session settings dialog for disabling these buttons
-handle Sleep hotkey via HAL
-fix kiosk mode bug present in previous patches (LP #47834)
* debian/patches/01_drop_libgnome:
-just depend on libgconf instead of full libgnome as the latter is not
actually being used
* debian/patches/02_xubuntu_splash:
-add xubuntu splash animation
* debian/rules:
-in post-install replace the logout dialog buttons provided upstream
with the Human themed buttons from the Ubuntu dialog.
-configure with support for gconf to get accessibility settings
* debian/control:
-build-depend on libgconf2-dev and sharutils
* Upstream svn snapshot (4.4 beta2)
* Add support for laptop sleep button via HAL
* Bump standards version to 3.7.2
* Bump library depends to 4.3.90.2
* Upstream svn snapshot (translation updates and bugfixes, including
correct handling of autostart .desktop files - LP #42350, add thunar
to default session)
* Provide the Xubuntu splash screen in addition to, not instead of
the Xfce default one. Use new steel color theme for splash
* Copy the nice logout dialog icons from the Human theme
* Bump version and depends to 4.3.90.1
* Rebuild for new libxfce4util
* Do not show tips at startup
* Fix widgets in logout dialog sometimes getting unclickable
even if focused.
* Depend on fortune-mod as it is used for displaying the tips.
* Check reply when talking to HAL and do not print warning
messages about not being able to shutdown when in fact we are.
* Use xfce CDBS class which generates POT file and adds .desktop
entries for langpack support
* Add suspend/hibernate buttons to logout dialog and
user settings to disable them.
* Do not suggest sudo anymore
* Add preview image for xubuntu session splash screen
* Convert to CDBS packaging
* Move helper binaries to usr/lib/xfce4 instead of /usr/sbin
* Build depend on libdbus, depend on HAL
* Use HAL for shutdown/restart in session logout
* Upstream svn snapshot
* Conflict/Replace xfce4-toys
* No longer recommend xfce4-iconbox
* Add libxml-parser-perl as build dependency
* Upstream svn snapshot
* Bump all depends to 4.3
* Upstream svn snapshot
* UVF exception granted