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

lintian: r81 - in trunk: checks debian testset testset/binary/debian



Author: jeroen
Date: 2004-02-27 17:15:22 +0100 (Fri, 27 Feb 2004)
New Revision: 81

Modified:
   trunk/checks/binaries
   trunk/checks/binaries.desc
   trunk/debian/changelog
   trunk/testset/binary/debian/rules
   trunk/testset/info_tags.binary
   trunk/testset/tags.binary
Log:
checks/binaries:
+ Exclude binaries and packages named *-static from the binary-is-static
  test. Exception for sash removed (override case) (Closes: #215235)


Modified: trunk/checks/binaries
===================================================================
--- trunk/checks/binaries	2004-02-27 14:26:39 UTC (rev 80)
+++ trunk/checks/binaries	2004-02-27 16:15:22 UTC (rev 81)
@@ -29,9 +29,6 @@
 my $dynsyms = 0;
 my $needs_depends_line = 0;
 
-# the paths need a leading '.' because lintian sees the files that way
-my @static_file_paths = ('./boot');
-
 my %COMMENT;
 my %NOTE;
 my %RPATH;
@@ -164,12 +161,13 @@
 	if ($info =~ m/shared object/o) {
 	    print "W: $pkg $type: shared-lib-without-dependency-information $file\n";
 	} else {
+	    # Some exceptions: files in /boot, named *-static or *.static, or
+	    # *-static as package-name.
 	    use File::Basename;
-	    my $dirname = dirname($file);
-	    next if(grep($_ eq $dirname, @static_file_paths));
-	    # they named it "foo.static" for a reason
-	    next if ($file =~ /\.static$/);
-	    next if ($file =~ m,^\./bin/sash$,); # exception for sash
+	    next if (dirname($file) eq './boot');
+	    next if ($file =~ /(\.|-)static$/);
+	    next if ($pkg =~ /-static$/);
+
 	    print "E: $pkg $type: statically-linked-binary $file\n";
 	}
     } else {

Modified: trunk/checks/binaries.desc
===================================================================
--- trunk/checks/binaries.desc	2004-02-27 14:26:39 UTC (rev 80)
+++ trunk/checks/binaries.desc	2004-02-27 16:15:22 UTC (rev 81)
@@ -34,7 +34,9 @@
  .
  Usually this is a bug. Otherwise, please contact &maint;
  about this so that this exception would be recognized in future versions of
- Lintian.
+ Lintian, or install an override if your package is an exception. Note that
+ binaries named *-static and *.static are already excluded, just as any
+ binaries in packages named *-static.
 
 Tag: library-not-linked-against-libc
 Type: warning

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-02-27 14:26:39 UTC (rev 80)
+++ trunk/debian/changelog	2004-02-27 16:15:22 UTC (rev 81)
@@ -62,6 +62,9 @@
     + Check for a big /usr/share (currently 250kB) in arch-dependent
       packages (Closes: #232849)
       Thanks Steve McIntyre for the idea
+  * checks/binaries:
+    + Exclude binaries and packages named *-static from the binary-is-static
+      test. Exception for sash removed (override case) (Closes: #215235)
 
  -- Frank Lichtenheld <djpig@debian.org>  Thu, 26 Feb 2004 21:52:14 +0100
 

Modified: trunk/testset/binary/debian/rules
===================================================================
--- trunk/testset/binary/debian/rules	2004-02-27 14:26:39 UTC (rev 80)
+++ trunk/testset/binary/debian/rules	2004-02-27 16:15:22 UTC (rev 81)
@@ -13,6 +13,8 @@
 	install -d $(tmp)/usr/bin
 	install -m 755 hello $(tmp)/usr/bin
 	install -s -m 755 hello-static $(tmp)/usr/bin
+	install -s -m 755 hello-static $(tmp)/usr/bin/hello.static
+	install -s -m 755 hello-static $(tmp)/usr/bin/static-hello
 	install -d $(tmp)/usr/share/doc/binary
 	install -m 644 INSTALL $(tmp)/usr/share/doc/binary
 	install -d $(tmp)/usr/lib/menu

Modified: trunk/testset/info_tags.binary
===================================================================
--- trunk/testset/info_tags.binary	2004-02-27 14:26:39 UTC (rev 80)
+++ trunk/testset/info_tags.binary	2004-02-27 16:15:22 UTC (rev 81)
@@ -23,7 +23,9 @@
 N:   Refer to Policy Manual, section 12.1 for details.
 N:
 E: binary: binary-without-manpage hello-static
-W: binary: arch-dep-package-has-big-usr-share 292kB 39%
+E: binary: binary-without-manpage hello.static
+E: binary: binary-without-manpage static-hello
+W: binary: arch-dep-package-has-big-usr-share 292kB 18%
 N:
 N:   The package has a significant amount of architecture-independent data
 N:   in /usr/share, while it is an architecture-dependent package. This is
@@ -136,7 +138,7 @@
 N:   lintian-maint@debian.org about this so that this exception would be
 N:   recognized in future versions of Lintian.
 N:
-E: binary: statically-linked-binary ./usr/bin/hello-static
+E: binary: statically-linked-binary ./usr/bin/static-hello
 N:
 N:   The package installs a statically linked binary or object file.
 N:   

Modified: trunk/testset/tags.binary
===================================================================
--- trunk/testset/tags.binary	2004-02-27 14:26:39 UTC (rev 80)
+++ trunk/testset/tags.binary	2004-02-27 16:15:22 UTC (rev 81)
@@ -1,7 +1,9 @@
 W: binary source: ancient-standards-version 3.2.1
 E: binary: binary-without-manpage hello
 E: binary: binary-without-manpage hello-static
-W: binary: arch-dep-package-has-big-usr-share 292kB 39%
+E: binary: binary-without-manpage hello.static
+E: binary: binary-without-manpage static-hello
+W: binary: arch-dep-package-has-big-usr-share 292kB 18%
 W: binary: package-contains-upstream-install-documentation usr/share/doc/binary/INSTALL
 E: binary: postinst-does-not-call-updatemenus usr/lib/menu/binary
 E: binary: postrm-does-not-call-updatemenus usr/lib/menu/binary
@@ -16,5 +18,5 @@
 E: binary: su-to-root-with-usr-bin /usr/lib/menu/binary:5
 W: binary: menu-item-needs-tag-has-unknown-value wm /usr/lib/menu/binary:5
 E: binary: unstripped-binary-or-object ./usr/bin/hello
-E: binary: statically-linked-binary ./usr/bin/hello-static
+E: binary: statically-linked-binary ./usr/bin/static-hello
 E: binary: changelog-file-not-compressed changelog



Reply to: