lp://staging/ubuntu/intrepid-proposed/xfce4-session
- Get this branch:
- bzr branch lp://staging/ubuntu/intrepid-proposed/xfce4-session
Branch merges
Branch information
Recent revisions
- 39. By Lionel Le Folgoc
-
* debian/
xubuntu- po/*: ship xubuntu-specific po files.
* debian/rules: replace upstream po files with them (LP: #228784) - 38. By Gauvain Pocentek
-
* 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 - 37. By Lionel Le Folgoc
-
* 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. - 36. By Lionel Le Folgoc
-
* 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. - 35. By Lionel Le Folgoc
-
* 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. - 34. By Lionel Le Folgoc
-
[ Cody A.W. Somerville ]
* 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[ Lionel Le Folgoc ]
* 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. - 33. By Cody A.W. Somerville
-
* 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 - 32. By Lionel Le Folgoc
-
debian/
patches/ 00_logout_ dialog. patch: split the row of buttons into two.
(LP: #138485) - 31. By Lionel Le Folgoc
-
debian/
pixmaps/ xfce4-autostart -editor. png.uue, debian/rules: add a menu
icon (from Jozsef Mak) for the autostart-editor. (LP: #58251,#105493)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntu/karmic/xfce4-session