Package: lintian Version: 2.5.6 Followup-For: Bug #660845 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
Hello, Please find attached a patch for this bug. My Perl is rusty, double check this patch! - -- System Information: Debian Release: wheezy/sid APT prefers precise-updates APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise'), (100, 'precise-backports') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-24-generic (SMP w/8 CPU cores) Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages lintian depends on: ii binutils 2.22-6ubuntu1 ii bzip2 1.0.6-1 ii diffstat 1.54-1 ii file 5.09-2 ii gettext 0.18.1.1-5ubuntu3 ii intltool-debian 0.35.0+20060710.1 ii libapt-pkg-perl 0.1.25build2 ii libc-bin 2.15-0ubuntu10 ii libclass-accessor-perl 0.34-1 ii libclone-perl 0.31-1build3 ii libdpkg-perl 1.16.1.2ubuntu7 ii libemail-valid-perl 0.185-1 ii libipc-run-perl 0.90-1 ii libparse-debianchangelog-perl 1.2.0-1ubuntu1 ii libtimedate-perl 1.2000-1 ii liburi-perl 1.59-1 ii locales 2.13+git20120306-3 ii man-db 2.6.1-2 ii patchutils 0.3.2-1.1 ii perl [libdigest-sha-perl] 5.14.2-6ubuntu2 ii unzip 6.0-4ubuntu1 lintian recommends no packages. Versions of packages lintian suggests: ii binutils-multiarch <none> ii dpkg-dev 1.16.1.2ubuntu7 ii libhtml-parser-perl 3.69-1build1 ii libtext-template-perl 1.45-2 ii man-db 2.6.1-2 ii xz-utils 5.1.1alpha+20110809-3 - -- no debconf information -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJPowPVAAoJEImmFv6yGz693mUP/1lsQC1rk6SMnl+hb/fp2KkR GFIfjfPgVqadNwbWJoiwUf/lhhGu+YSJ4QLcF7ODed38Gr1GnawHbg9Olh94GOxV 8GJcJdvfYHfcW141GYKdNdDF6HEgcvzt0q7zydk+kyDuTTAZ/n/QGctTzmg0lME7 dqhz5BLf+og4pFTwI5S/j0JcHbPu71okWXvzQDb1S7ckZoqMk43oo0GWuBW+5rkQ FzWdDs/dlYCn83XNupODGJiMazl0HzcCvVJJjnXmE3pUSlqzJBQ5zHnqqmqiuotn J7bFKUE1kuWWL9Dr1GXkk7GiOdCkgjsWF5V0CC5bUUnjW/jnk8Qgja+SF1laMMj9 8USUaT0IH8v6ULfSITXsCtDGBuwrIj3sJN7PE/bUdbn7yJAnMR5U8SKVTLBHX+jp cnJSJwcqYC0VQS40/vINkX5hRBbEf6Gqr+M3y0or3mWNDdp5CQgg4tH9Z/3HfY/C 6/FNMdesNeam2xg+77Q9uA8EXneJiwvys3iJ0U3tfzEyvQISn6zZCvII94gab9HV J3q1KHJMLOhFHEVVpjO0HQJwlWamPAbRRt/hxDCtb3g6v4y9U6iqAdil/7ENEEsK 7GAnyMLM0QAOefdtzad8CbFRA7+s+RDyASNFqSBuDQv4HSCskyfZyvVDiTHmHVEL oPY1f8yqgAfEo328oifI =nwiy -----END PGP SIGNATURE-----
>From 100949797a8a468c6f803db966e60fc5f19702bb Mon Sep 17 00:00:00 2001 From: Ludovic Claude <ludovic.cla...@laposte.net> Date: Thu, 3 May 2012 23:32:04 +0200 Subject: [PATCH] checks/java: + Ignore javadoc jars for the codeless-jar tag. (Closes: #660845) --- checks/java | 4 +++- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/checks/java b/checks/java index 2f8a893..2b7a5b9 100644 --- a/checks/java +++ b/checks/java @@ -97,7 +97,9 @@ for my $jar_file (sort keys %{$java_info}) { # Eclipse / OSGi bundles are sometimes source bundles # these do not ship classes but java files and other sources. - if ($bsname !~ m/\.source$/o || $cp) { + # Javadoc jars deployed in the Maven repository also do not ship + # classes but HTML files, images and CSS files + if (($bsname !~ m/\.source$/o && $jar_file !~ m#^usr/share/maven-repo/.*-javadoc\.jar#) || $cp) { tag 'codeless-jar', $jar_file; } } diff --git a/debian/changelog b/debian/changelog index 01b579c..fbd5137 100644 --- a/debian/changelog +++ b/debian/changelog @@ -101,6 +101,8 @@ lintian (2.5.7) UNRELEASED; urgency=low raster images in "scalable" icon directories. Thanks to Paul Wise for the report and Felix Geyer for the patches. (Closes: #628189) + * checks/java: + + Ignore javadoc jars for the codeless-jar tag. (Closes: #660845) * checks/lintian.desc: + [NT] Updated the description of the override tags. * checks/manpages{,.desc}: -- 1.7.9.5