Browse Source

Merge remote-tracking branch 'origin/master' into task-packages

Conflicts:
	tasks/finnish
tags/3.00
Joey Hess 10 years ago
parent
commit
2d8487bde0
2 changed files with 6 additions and 1 deletions
  1. +5
    -0
      debian/changelog
  2. +1
    -1
      debian/control

+ 5
- 0
debian/changelog View File

@@ -1,5 +1,6 @@
tasksel (3.00) UNRELEASED; urgency=low

[ Joey Hess ]
* Task packages are back! For now, the task-* metapackages are only
used to hold Depends and Recommends; all other task info that tasksel
uses remains in debian-tasks.desc. Plan is to migrate the rest into
@@ -12,6 +13,10 @@ tasksel (3.00) UNRELEASED; urgency=low
* Moved acpid to Recommends of task-laptop from Depends, anticipating
kFreeBSD laptops.

[ Christian Perrier ]
* Replace aspell-fi by libenchant-voikko in finnish task
Closes: #585840

-- Joey Hess <joeyh@debian.org> Sat, 26 Feb 2011 23:33:30 -0400

tasksel (2.89) unstable; urgency=low


+ 1
- 1
debian/control View File

@@ -358,7 +358,7 @@ Depends:
Recommends:
tmispell-voikko,
voikko-fi,
aspell-fi
libenchant-voikko

Package: task-albanian-desktop
Architecture: all


Loading…
Cancel
Save