[SCM] Debian package checker branch, master, updated. 2.5.4-122-ga475ec5

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit a475ec5d6f9b7319cfc3c4159fffef7fee43498c
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Jan 28 18:47:46 2012 +0100

    Added "tls" to hwcap-dirs via "Keep:"
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/data/shared-libs/hwcap-dirs b/data/shared-libs/hwcap-dirs
index a9e45b7..1887649 100644
--- a/data/shared-libs/hwcap-dirs
+++ b/data/shared-libs/hwcap-dirs
@@ -2,6 +2,9 @@
 #
 # Last updated: 2012-01-28
 # Generated by private/refresh-hwcap
+#
+# Lines to always be included:
+#    Keep: tls
 
 4xxmac
 acpi
@@ -72,6 +75,7 @@ sse2
 stbar
 stfle
 swap
+tls
 tm
 ucache
 ultra3
diff --git a/private/refresh-hwcap b/private/refresh-hwcap
index 8efafda..042efa8 100755
--- a/private/refresh-hwcap
+++ b/private/refresh-hwcap
@@ -8,6 +8,7 @@ use POSIX qw(strftime);
 my $datadir = shift;
 my $man = shift // '/usr/share/man/man8/ld.so.8.gz';
 my %caps;
+my @keeps = ();
 
 die "Usage: $0 path/to/lintian/data.\n" unless $datadir;
 
@@ -30,14 +31,33 @@ close $manpage or die "zcat: $!";
 
 my $path = "$datadir/shared-libs/hwcap-dirs";
 my $date = strftime '%Y-%m-%d', gmtime;
+open my $orig, '<', $path or die "Opening $path: $!";
+while ( my $line = <$orig> ) {
+    chomp $line;
+    next unless $line =~ m/^#\s*Keep:\s*(.*\S)\s*$/o;
+    my $keep = $1;
+    push @keeps, $keep;
+    foreach my $val (split /\s*,\s*/o, $keep) {
+        $caps{$val} = 1;
+    }
+}
+close $orig;
+
 open my $fp, '>', $path or die "Opening $path: $!";
 print $fp <<EOF ;
 # List of all known hwcap.
 #
 # Last updated: $date
 # Generated by $0
-
+#
+# Lines to always be included:
 EOF
+foreach my $keep (@keeps) {
+    print $fp "#    Keep: $keep\n";
+}
+
+print $fp "\n";
+
 foreach (sort keys %caps) {
     print $fp "$_\n";
 }

-- 
Debian package checker