Browse Source

Remove the now empty task overrides file.

tags/3.06
Joey Hess 10 years ago
parent
commit
c1763476ef
4 changed files with 7 additions and 63 deletions
  1. +1
    -7
      Makefile
  2. +6
    -0
      debian/changelog
  3. +0
    -9
      debian/rules
  4. +0
    -47
      makeoverride.pl

+ 1
- 7
Makefile View File

@@ -8,7 +8,7 @@ LANGS=ar bg bn bs ca cs cy da de dz el eo es et eu fa fi fr gl gu he hi hr hu hy
LANGS_DESC=ar bg bn bs ca cs cy da de dz el eo es et et eu fi fr gl gu he hi hr hu id it ja km ko lt lv mg mk nb ne nl nn pa pl pt_BR pt ro ru sk sl sq sv te th tl tr uk vi wo zh_CN zh_TW
LOCALEDIR=$(DESTDIR)/usr/share/locale

all: $(TASKDESC) $(DESCPO)/build_stamp po/build_stamp override
all: $(TASKDESC) $(DESCPO)/build_stamp po/build_stamp

$(TASKDESC): makedesc.pl $(DESCDIR)/[a-z]??*
./doincludes.pl $(DESCDIR)
@@ -67,11 +67,5 @@ install-data:

clean:
rm -f $(TASKDESC) *~
rm -rf debian/external-overrides
$(MAKE) -C po clean
$(MAKE) -C $(DESCPO) clean

# This taget is run to generate the overrides files.
override:
@mkdir -p debian/external-overrides
@./makeoverride.pl $(DESCDIR) > debian/external-overrides/task

+ 6
- 0
debian/changelog View File

@@ -1,3 +1,9 @@
tasksel (3.06) UNRELEASED; urgency=low

* Remove the now empty task overrides file.

-- Joey Hess <joeyh@debian.org> Fri, 05 Aug 2011 10:47:14 -0400

tasksel (3.05) unstable; urgency=low

* Fix logic error.


+ 0
- 9
debian/rules View File

@@ -2,18 +2,9 @@
%:
dh $@

VERSION=$(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
TARNAME=task-overrides_$(VERSION)_all.tar.gz

override_dh_auto_install:
$(MAKE) install DESTDIR=`pwd`/debian/tasksel
$(MAKE) install-data DESTDIR=`pwd`/debian/tasksel-data

override_dh_installdocs:
dh_installdocs --link-doc=tasksel

override_dh_builddeb:
dh_builddeb
# Add tarball with overrides file for byhand processing
cd debian/external-overrides && tar czvf ../../../$(TARNAME) .
dpkg-distaddfile $(TARNAME) byhand -

+ 0
- 47
makeoverride.pl View File

@@ -1,47 +0,0 @@
#!/usr/bin/perl
#
# makeoverride directory
#
# This program spits out an override file for the tasks.

my $dir=shift or die "no directory specified\n";

my %p;
use File::Find;
find(\&processfile, $dir);

print "$_\tTask\t", (join ", ", sort keys %{$p{$_}}), "\n"
for sort keys %p;

sub processfile {
my $file=$_; # File::Find craziness.
$file eq 'po' && -d $file && ($File::Find::prune = 1);
return if $File::Find::dir=~/\.(svn|git)/;
return unless $file =~ /^[-+_.a-z0-9]+$/ and -f $file;
open (IN, $file) or die "$file: $!";
my %fields;
my $field="";
while (<IN>) {
chomp;
next if /^\s*#/;
s/#.*//;

if (/^\s/) {
$fields{$field}.="\n$_";
}
else {
($field, my $value)=split(/:\s*/, $_, 2);
$field=lc($field);
$fields{$field}=$value;
}
}
close IN;
if (exists $fields{"packages-list"}) {
foreach my $field (qw(key packages-list)) {
foreach my $package(split(' ', $fields{$field})) {
$p{$package}->{$fields{task}} = 1;
}
}
}
}

Loading…
Cancel
Save