Browse Source

* Allow includes in tasks to refer to other tasks.

* Use this to make the desktop task's list of printer drivers be taken
  from the print-server tasks's list.
tags/2.59
Joey Hess 15 years ago
parent
commit
121493704b
3 changed files with 30 additions and 18 deletions
  1. +4
    -1
      debian/changelog
  2. +11
    -5
      doincludes.pl
  3. +15
    -12
      tasks/desktop

+ 4
- 1
debian/changelog View File

@@ -21,13 +21,16 @@ tasksel (2.59) UNRELEASED; urgency=low
* Remove gimp-print from print server task, since it's only a gimp printing
plugin. It remains in the desktop task, which includes the gimp.
Closes: #400251
* Allow includes in tasks to refer to other tasks.
* Use this to make the desktop task's list of printer drivers be taken
from the print-server tasks's list.

[ Christian Perrier ]
* Portuguese task additions. Closes: #400317, #400542
- Replace old apsell-pt by aspell-pt-pt
- Add iportuguese, wportuguese and myspell-pt-pt

-- Christian Perrier <bubulle@kheops.perrier.eu.org> Mon, 27 Nov 2006 08:14:34 +0100
-- Joey Hess <joeyh@debian.org> Mon, 27 Nov 2006 15:33:10 -0500

tasksel (2.58) unstable; urgency=low



+ 11
- 5
doincludes.pl View File

@@ -24,6 +24,8 @@ my %depends;
close AVAIL;
}

use Cwd;
my $topdir=getcwd;
use File::Find;
find(\&processfile, $dir);

@@ -49,18 +51,22 @@ sub processfile {
if ($skipping) {
die "$file: nested includes near $_\n";
}
if (! exists $depends{$pkg}) {
warn "$file: #include $1 skipped; no such package. Leaving what was there alone.\n";
$skipping=-1;
if (-e $pkg) {
push @lines, "# Automatically added by doincludes.pl; do not edit.\n";
push @lines, map { chomp; " $_\n" }
`$topdir/listpackages.pl $pkg`;
}
elsif (! exists $depends{$pkg}) {
warn "$file: #include $dir/$pkg skipped; no such package. Leaving what was there alone.\n";
}
else {
push @lines, "#Automatically added by doincludes.pl; do not edit.\n";
push @lines, "# Automatically added by doincludes.pl; do not edit.\n";
# Split deps and remove alternates and versioned
# deps. Include the metapackage on the list.
push @lines, map { s/[|(].*//; " $_\n" }
split(/,\s+/, $depends{$pkg}), $pkg;
$skipping=1;
}
$skipping=1;
}
}
close IN;


+ 15
- 12
tasks/desktop View File

@@ -42,11 +42,19 @@ Packages-list:
prtconf
# Make sure that CDs etc can be ejected. May not be installed by d-i.
eject
# Support for scanners
xsane
# For use by third-party apps.
xdg-utils
# mdns/zeroconf stuff
avahi-daemon
libnss-mdns
# desktop machines might not be up 24/7
anacron
# The following packages are the same as the packages in the print-server
# task and provide printing via CUPS.
cupsys
cupsys-client
cupsys-bsd
#include print-server
# Automatically added by doincludes.pl; do not edit.
foomatic-gui
foomatic-db-engine
foomatic-db-hpijs
@@ -55,12 +63,7 @@ Packages-list:
cupsys-driver-gutenprint
printconf
hpijs
# Support for scanners
xsane
# For use by third-party apps.
xdg-utils
# mdns/zeroconf stuff
avahi-daemon
libnss-mdns
# desktop machines might not be up 24/7
anacron
cupsys
cupsys-client
cupsys-bsd
#endinclude

Loading…
Cancel
Save