diffstat for xfce4-utils-4.8.3 xfce4-utils-4.8.3 changelog | 17 ++++++++ control | 4 +- maintscript | 1 patches/series | 1 patches/xubuntu_set-xdg-current-desktop.patch | 52 ++++++++++++++++++++++++++ postinst | 5 -- postrm | 5 -- preinst | 5 -- 8 files changed, 74 insertions(+), 16 deletions(-) diff -Nru xfce4-utils-4.8.3/debian/changelog xfce4-utils-4.8.3/debian/changelog --- xfce4-utils-4.8.3/debian/changelog 2011-10-24 20:49:39.000000000 +0000 +++ xfce4-utils-4.8.3/debian/changelog 2012-02-14 15:33:21.000000000 +0000 @@ -1,3 +1,20 @@ +xfce4-utils (4.8.3-1ubuntu2) precise; urgency=low + + * Use maintscript support in dh_installdeb rather than writing out + dpkg-maintscript-helper commands by hand. We now simply Pre-Depend on a + new enough version of dpkg rather than using 'dpkg-maintscript-helper + supports' guards, leading to more predictable behaviour on upgrades. + + -- Colin Watson Tue, 14 Feb 2012 15:33:19 +0000 + +xfce4-utils (4.8.3-1ubuntu1) precise; urgency=low + + * debian/patches: + - xubuntu_set-xdg-current-desktop.patch: export XDG_CURRENT_DESKTOP=XFCE, + can be useful with alacarte and gnome-menus. lp: #927172 + + -- Lionel Le Folgoc Sun, 05 Feb 2012 17:57:14 +0100 + xfce4-utils (4.8.3-1) unstable; urgency=low [ Lionel Le Folgoc ] diff -Nru xfce4-utils-4.8.3/debian/control xfce4-utils-4.8.3/debian/control --- xfce4-utils-4.8.3/debian/control 2011-10-24 20:48:14.000000000 +0000 +++ xfce4-utils-4.8.3/debian/control 2012-02-14 15:33:41.000000000 +0000 @@ -1,7 +1,8 @@ Source: xfce4-utils Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Lionel Le Folgoc Build-Depends: debhelper (>= 8.9.4), libxfce4util-dev (>= 4.8.0), @@ -16,6 +17,7 @@ Package: xfce4-utils Section: xfce Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, xterm|x-terminal-emulator, x11-xserver-utils, xinit, exo-utils, procps Recommends: xfwm4, xfce4-panel, thunar, xscreensaver | xlockmore | diff -Nru xfce4-utils-4.8.3/debian/maintscript xfce4-utils-4.8.3/debian/maintscript --- xfce4-utils-4.8.3/debian/maintscript 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-utils-4.8.3/debian/maintscript 2012-02-14 15:32:48.000000000 +0000 @@ -0,0 +1 @@ +rm_conffile /etc/xdg/autostart/xfconf-migration-4.6.desktop 4.8.1-1 diff -Nru xfce4-utils-4.8.3/debian/patches/series xfce4-utils-4.8.3/debian/patches/series --- xfce4-utils-4.8.3/debian/patches/series 2011-03-31 06:02:37.000000000 +0000 +++ xfce4-utils-4.8.3/debian/patches/series 2012-02-05 16:53:53.000000000 +0000 @@ -2,3 +2,4 @@ 02_xfhelp-rename-module.patch 03_xfterm4-bug.patch 04_debianize-scripts.patch +xubuntu_set-xdg-current-desktop.patch diff -Nru xfce4-utils-4.8.3/debian/patches/xubuntu_set-xdg-current-desktop.patch xfce4-utils-4.8.3/debian/patches/xubuntu_set-xdg-current-desktop.patch --- xfce4-utils-4.8.3/debian/patches/xubuntu_set-xdg-current-desktop.patch 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-utils-4.8.3/debian/patches/xubuntu_set-xdg-current-desktop.patch 2012-02-05 16:55:57.000000000 +0000 @@ -0,0 +1,52 @@ +Description: export XDG_CURRENT_DESKTOP=XFCE + Not yet forwarded, needs some testing first. +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xfce4-utils/+bug/927172 +Forwarded: no +Last-Update: 2012-02-05 +Author: Lionel Le Folgoc + +--- xfce4-utils-4.8.3.orig/scripts/xinitrc ++++ xfce4-utils-4.8.3/scripts/xinitrc +@@ -22,6 +22,12 @@ if test "x$DESKTOP_SESSION" = "x"; then + export DESKTOP_SESSION + fi + ++# set XDG_CURRENT_DESKTOP for alacarte ++if test "x$XDG_CURRENT_DESKTOP" = "x"; then ++ XDG_CURRENT_DESKTOP="XFCE" ++ export XDG_CURRENT_DESKTOP ++fi ++ + # $XDG_CONFIG_HOME defines the base directory relative to which user specific + # configuration files should be stored. If $XDG_CONFIG_HOME is either not set + # or empty, a default equal to $HOME/.config should be used. +--- xfce4-utils-4.8.3.orig/scripts/xinitrc.in ++++ xfce4-utils-4.8.3/scripts/xinitrc.in +@@ -22,6 +22,12 @@ if test "x$DESKTOP_SESSION" = "x"; then + export DESKTOP_SESSION + fi + ++# set XDG_CURRENT_DESKTOP for alacarte ++if test "x$XDG_CURRENT_DESKTOP" = "x"; then ++ XDG_CURRENT_DESKTOP="XFCE" ++ export XDG_CURRENT_DESKTOP ++fi ++ + # $XDG_CONFIG_HOME defines the base directory relative to which user specific + # configuration files should be stored. If $XDG_CONFIG_HOME is either not set + # or empty, a default equal to $HOME/.config should be used. +--- xfce4-utils-4.8.3.orig/scripts/xinitrc.in.in ++++ xfce4-utils-4.8.3/scripts/xinitrc.in.in +@@ -22,6 +22,12 @@ if test "x$DESKTOP_SESSION" = "x"; then + export DESKTOP_SESSION + fi + ++# set XDG_CURRENT_DESKTOP for alacarte ++if test "x$XDG_CURRENT_DESKTOP" = "x"; then ++ XDG_CURRENT_DESKTOP="XFCE" ++ export XDG_CURRENT_DESKTOP ++fi ++ + # $XDG_CONFIG_HOME defines the base directory relative to which user specific + # configuration files should be stored. If $XDG_CONFIG_HOME is either not set + # or empty, a default equal to $HOME/.config should be used. diff -Nru xfce4-utils-4.8.3/debian/postinst xfce4-utils-4.8.3/debian/postinst --- xfce4-utils-4.8.3/debian/postinst 2011-04-11 13:58:39.000000000 +0000 +++ xfce4-utils-4.8.3/debian/postinst 2012-02-14 15:32:58.000000000 +0000 @@ -7,11 +7,6 @@ x-session-manager.1.gz /usr/share/man/man1/startxfce4.1.gz fi -if dpkg-maintscript-helper supports rm_conffile; then - dpkg-maintscript-helper rm_conffile \ - /etc/xdg/autostart/xfconf-migration-4.6.desktop "4.8.1-1" -- "$@" -fi - #DEBHELPER# exit 0 diff -Nru xfce4-utils-4.8.3/debian/postrm xfce4-utils-4.8.3/debian/postrm --- xfce4-utils-4.8.3/debian/postrm 2011-04-11 13:58:39.000000000 +0000 +++ xfce4-utils-4.8.3/debian/postrm 2012-02-14 15:33:02.000000000 +0000 @@ -1,11 +1,6 @@ #!/bin/sh set -e -if dpkg-maintscript-helper supports rm_conffile; then - dpkg-maintscript-helper rm_conffile \ - /etc/xdg/autostart/xfconf-migration-4.6.desktop "4.8.1-1" -- "$@" -fi - if [ "$1" = "purge" ]; then rm -f /etc/dm/Sessions/xfce4.desktop fi diff -Nru xfce4-utils-4.8.3/debian/preinst xfce4-utils-4.8.3/debian/preinst --- xfce4-utils-4.8.3/debian/preinst 2011-06-18 07:06:10.000000000 +0000 +++ xfce4-utils-4.8.3/debian/preinst 2012-02-14 15:32:55.000000000 +0000 @@ -10,11 +10,6 @@ fi -if dpkg-maintscript-helper supports rm_conffile; then - dpkg-maintscript-helper rm_conffile \ - /etc/xdg/autostart/xfconf-migration-4.6.desktop "4.8.1-1" -- "$@" -fi - # Remove symlinks for el which appeared in 4.8.2-1 case "$1" in install|upgrade)