Revert "temporarily revert xfce default"

This reverts commit 56f8dffd7e7d0cd013a1251e1f12a4a1124262d7 that was
reverting antoher commit that was de-reverting another commit.

In short, back to Xfce default in unstable.

diff --git a/debian/changelog b/debian/changelog
index 8de85d2..795977c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tasksel (3.15) UNRELEASED; urgency=low
+
+  [ Joey Hess ]
+  * Change default desktop to xfce.
+
+ -- Christian Perrier <bubulle@debian.org>  Sun, 11 Nov 2012 12:01:59 +0100
+
 tasksel (3.14) unstable; urgency=low
 
   [ Joey Hess ]

diff --git a/debian/control b/debian/control
index 7665be1..0418d21 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Recommends:
 # The order here is significant when installing this task manually;
 # when tasksel installs this task it instead selects one of these based
 # on the tasksel/desktop debconf setting.
-       task-gnome-desktop | task-kde-desktop | task-lxde-desktop | task-xfce-desktop,
+       task-xfce-desktop | task-gnome-desktop | task-kde-desktop | task-lxde-desktop,
 # For use by third-party apps.
        xdg-utils,
 # mdns/zeroconf stuff

diff --git a/debian/templates b/debian/templates
index 423aa87..24fe044 100644 (file)
--- a/debian/templates
+++ b/debian/templates
@@ -18,7 +18,7 @@ _Description: Choose software to install:
 Template: tasksel/desktop
 Type: multiselect
 Choices: gnome, kde, xfce, lxde
-Default: gnome
+Default: xfce
 Description: The desktop environment to install when the desktop task is selected
  This can be preseeded to change the default.