Browse Source

move desc files to avoid aptitude crash

Tasksel no longer looks for desc files in /usr/share/taksel/, instead it looks
in /usr/share/taksel/descs/. This was necessary because aptitude crashes on the
new debian-tasks.desc file without Description fields.
tags/3.00
Joey Hess 10 years ago
parent
commit
1c832eabbe
3 changed files with 8 additions and 4 deletions
  1. +2
    -2
      Makefile
  2. +4
    -0
      debian/changelog
  3. +2
    -2
      tasksel.pl

+ 2
- 2
Makefile View File

@@ -47,9 +47,9 @@ install:
done

install-data:
install -d $(DESTDIR)$(TASKDIR) \
install -d $(DESTDIR)$(TASKDIR)/descs \
$(DESTDIR)/usr/lib/tasksel/tests
install -m 0644 $(TASKDESC) $(DESTDIR)$(TASKDIR)
install -m 0644 $(TASKDESC) $(DESTDIR)$(TASKDIR)/descs
for test in tests/*; do \
[ "$$test" = "tests/new-install" ] && continue; \
[ "$$test" = "tests/debconf" ] && continue; \


+ 4
- 0
debian/changelog View File

@@ -21,6 +21,10 @@ tasksel (3.00) experimental; urgency=low
* Don't generate Task field overrides for tasks that have only Key
packages. In other words, the Task field overrides are not needed,
and are going away.
* Tasksel no longer looks for desc files in /usr/share/taksel/,
instead it looks in /usr/share/taksel/descs/. This was necessary
because aptitude crashes on the new debian-tasks.desc file without
Description fields.

[ Christian Perrier ]
* Replace aspell-fi by libenchant-voikko in finnish task


+ 2
- 2
tasksel.pl View File

@@ -11,8 +11,8 @@ textdomain('tasksel');
my $debconf_helper="/usr/lib/tasksel/tasksel-debconf";
my $testdir="/usr/lib/tasksel/tests";
my $packagesdir="/usr/lib/tasksel/packages";
my $descdir="/usr/share/tasksel";
my $localdescdir="/usr/local/share/tasksel";
my $descdir="/usr/share/tasksel/descs";
my $localdescdir="/usr/local/share/tasksel/descs";
my $statusfile="/var/lib/dpkg/status";
my $infodir="/usr/lib/tasksel/info";
my $testmode=0;


Loading…
Cancel
Save