diff --git a/debian/changelog b/debian/changelog index 8abc97cd..1bc13c52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ -tasksel (2.46) UNRELEASED; urgency=low +tasksel (2.46) unstable; urgency=low + [ Jordi Mallach ] * [ Translations of tasks ] - updated Catalan translation (Jordi Mallach) - -- Jordi Mallach Sat, 20 May 2006 23:19:26 +0200 + [ Joey Hess ] + * tasksel-data: Conflict with old versions of tasksel. + * Move laptop-detect depends to tasksel-data as that's what uses it. + * Loosen dependencies between tasksel and -data, think this should be ok. + + -- Joey Hess Sun, 21 May 2006 21:26:43 -0500 tasksel (2.45) unstable; urgency=low diff --git a/debian/control b/debian/control index a06fa974..d07b44b6 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: po-debconf, debhelper (>= 5), gettext, dpkg-dev (>= 1.9.0) Package: tasksel Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, liblocale-gettext-perl, aptitude (>= 0.2.15-1), laptop-detect, tasksel-data +Depends: ${shlibs:Depends}, ${misc:Depends}, liblocale-gettext-perl, aptitude (>= 0.2.15-1), tasksel-data Conflicts: debconf (<< 1.4.27), base-config (<< 2.32) Description: Tool for selecting tasks for installation on Debian system This package provides 'tasksel', a simple interface for users who @@ -18,8 +18,8 @@ Description: Tool for selecting tasks for installation on Debian system Package: tasksel-data Architecture: all -Depends: tasksel (= ${source:Version}) -Conflicts: tasksel-data +Depends: tasksel, laptop-detect +Conflicts: tasksel-data, tasksel (<< 2.46) Description: Official tasks used for installation on Debian systems This package provides the tasks for 'tasksel' to use to provide a simple interface for users who want to pick general tasks for diff --git a/tasks/po/he.po b/tasks/po/he.po index fc67c4f3..620d435e 100644 --- a/tasks/po/he.po +++ b/tasks/po/he.po @@ -8,13 +8,13 @@ msgid "" msgstr "" "Project-Id-Version: tasksel-tasks\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-24 14:24-0400\n" +"POT-Creation-Date: 2006-05-21 21:27-0500\n" "PO-Revision-Date: 2006-05-18 16:03-0500\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" # Description #. Description