On 31/01/13 12:50, Christian Perrier wrote: > Well, I'm probably not the git wizard I pretend I am, then..:-). I > probably messed up while creating the two branches we now need
Seems when you initially tried to revert, you edited the changelog but missed the important bits. Then branched for wheezy. And unfortunately also toggled the master branch the wrong way, back to gnome :( Attached are the changes needed for each branch. Regards, -- Steven Chamberlain ste...@pyro.eu.org
diff --git a/debian/control b/debian/control index 1459820..16525ff 100644 --- 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 --- 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.
diff --git a/debian/control b/debian/control index 16525ff..1459820 100644 --- 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-xfce-desktop | task-gnome-desktop | task-kde-desktop | task-lxde-desktop, + task-gnome-desktop | task-kde-desktop | task-lxde-desktop | task-xfce-desktop, # For use by third-party apps. xdg-utils, # mdns/zeroconf stuff diff --git a/debian/templates b/debian/templates index 24fe044..423aa87 100644 --- 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: xfce +Default: gnome Description: The desktop environment to install when the desktop task is selected This can be preseeded to change the default.