Browse Source

Merge conflicts

tags/3.13
Christian PERRIER 9 years ago
parent
commit
98f1823189
3 changed files with 16 additions and 9 deletions
  1. +9
    -1
      debian/changelog
  2. +5
    -6
      debian/control
  3. +2
    -2
      debian/templates

+ 9
- 1
debian/changelog View File

@@ -1,8 +1,16 @@
tasksel (3.13) UNRELEASED; urgency=low

[ Christian Perrier ]
* Replace gdm3 by lightdm in lxde-desktop task. Closes: #683349

-- Christian Perrier <bubulle@debian.org> Tue, 31 Jul 2012 16:47:00 -0400
[ Joey Hess ]
* Change default desktop to xfce.
* Don't force browser-plugin-gnash onto desktops that don't themselves
pull it in. This means gnome still installs it, but kde, xfce,
and lxde do not. Closes: #655841

-- Joey Hess <joeyh@debian.org> Sat, 28 Jul 2012 12:20:32 -0400
>>>>>>> 2a962cc65cdba010177f27e8824ba10d9a799a08

tasksel (3.12) unstable; urgency=low



+ 5
- 6
debian/control View File

@@ -41,8 +41,11 @@ Depends: ${misc:Depends},
desktop-base,
menu
Recommends:
# The default desktop is gnome, but any can be used with this task.
task-gnome-desktop | task-kde-desktop | task-lxde-desktop | task-xfce-desktop,
# One of the actual desktop tasks is needed to get a full desktop environment.
# 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,
# For use by third-party apps.
xdg-utils,
# mdns/zeroconf stuff
@@ -57,10 +60,6 @@ Recommends:
# sound
alsa-utils,
alsa-base,
# flash -- Note that gnome recommends browser-plugin-gnash;
# if this is changed here to a different flash player, it should
# also be changed there.
browser-plugin-gnash,
# ensure pm-utils is available
pm-utils



+ 2
- 2
debian/templates View File

@@ -17,8 +17,8 @@ _Description: Choose software to install:

Template: tasksel/desktop
Type: multiselect
Choices: gnome, kde, xfce
Default: gnome
Choices: gnome, kde, xfce, lxde
Default: xfce
Description: The desktop environment to install when the desktop task is selected
This can be preseeded to change the default.



Loading…
Cancel
Save