Browse Source

- Look for desc files in /usr/local/share/tasksel too. Closes: #286170

tags/2.25
Joey Hess 16 years ago
parent
commit
81c7ad8791
3 changed files with 5 additions and 2 deletions
  1. +1
    -0
      debian/changelog
  2. +2
    -1
      tasksel.pl
  3. +2
    -1
      tasksel.pod

+ 1
- 0
debian/changelog View File

@@ -17,6 +17,7 @@ tasksel (2.25) UNRELEASED; urgency=low
- Add printconf to print-server for automatic printer setup. Closes: #293108
- Add windbind to file-server since it's commonly used with samba.
Closes: #292936
- Look for desc files in /usr/local/share/tasksel too. Closes: #286170
* Kęstutis Biliūnas
- Added openoffice.org-l10n-lt to lithuanian-desktop task.
- Commented out kde-i18n-lt as the Lithuanian language currently is


+ 2
- 1
tasksel.pl View File

@@ -12,6 +12,7 @@ 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 $statusfile="/var/lib/dpkg/status";

sub warning {
@@ -25,7 +26,7 @@ sub error {

# A list of all available task desc files.
sub list_task_descs {
return glob "$descdir/*.desc";
return glob("$descdir/*.desc"), glob("$localdescdir/*.desc");
}

# Returns a list of hashes; hash values are arrays for multi-line fields.


+ 2
- 1
tasksel.pod View File

@@ -66,7 +66,8 @@ dpkg(8), apt-get(8)

=head1 FILES

F</usr/share/tasksel/debian-tasks.desc>
F</usr/share/tasksel/*.desc> and
F</usr/local/share/tasksel/*.desc> are used to define tasks.

=head1 AUTHOR



Loading…
Cancel
Save