[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.2.9-49-gd848434



The following commit has been merged in the master branch:
commit ef3ab7753ca51541ef9a8e58e63148f00a063d91
Author: Russ Allbery <rra@debian.org>
Date:   Mon Apr 27 14:44:21 2009 -0700

    Revert "Be more robust in collecting strings output"
    
    This reverts commit b82ead848294dc12bd4947c3ce4e2bb486f15fd9.
    Reverting in favor of a better patch by Raphael Geissert.

diff --git a/collection/strings b/collection/strings
index 9fd09be..b649035 100755
--- a/collection/strings
+++ b/collection/strings
@@ -27,7 +27,7 @@
 [ ! -f elf-index ] || rm -f elf-index
 exec >elf-index
 
-for bin in $(grep '^[^:]*:.*ELF' file-info | sed 's/: .*//'); do
+for bin in $(grep ELF file-info | cut -d: -f1); do
     echo "$bin"
     case $bin in
       /usr/lib/debug/*)
diff --git a/debian/changelog b/debian/changelog
index 8791d28..450b95e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,10 +66,6 @@ lintian (2.2.10) UNRELEASED; urgency=low
     + [ADB] Call "file" with "--" to ensure that any filenames in the package
       that start with "-" aren't interpreted as options to "file".  Thanks,
       Trent W. Buck.  (Closes: #523408)
-  * collection/strings:
-    + [RA] Be robust against file names containing "ELF" or a colon by
-      requiring ELF occur after the colon and space and breaking on colon
-      and space instead of a simple colon.
 
   * doc/desc-files:
     + [ADB] Mention the new Standards-Version field available for tests.

-- 
Debian package checker


Reply to: