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

[SCM] Debian package checker branch, master, updated. 1.24.3-8-g1cf8aaf



The following commit has been merged in the master branch:
commit 1cf8aaf574793c04f87aff54b807f209f3ec0885
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Sun Aug 10 19:40:03 2008 +0100

    Don't warn about embedded Javascript libraries in the packages providing them.

diff --git a/checks/files b/checks/files
index de9c919..560b070 100644
--- a/checks/files
+++ b/checks/files
@@ -609,14 +609,20 @@ foreach my $file (sort keys %{$info->index}) {
 	}
 
 	# ---------------- embedded Javascript libraries
-	if ($file =~ m,/(mochikit|
-			 jquery(\.(min|lite|pack))?|
-			 prototype(-[\d\.]+)?|
-			 scriptaculous|
-			 fckeditor|
-			 cropper(\.uncompressed)?
-			)\.js(\.gz)?$,ix) {
-	    tag "embedded-javascript-library", "$file";
+	# A list of known packaged Javascript libraries
+	# and the packages providing them
+	my @jslibraries = (
+	    [ qr,(?i)mochikit\.js(\.gz)?$, => 'libjs-mochikit' ],
+	    [ qr,(?i)jquery(\.(min|lite|pack))?\.js(\.gz)?$, => 'libjs-jquery' ],
+	    [ qr,(?i)prototype(-[\d\.]+)?\.js(\.gz)?$, => 'libjs-prototype' ],
+	    [ qr,(?i)scriptaculous\.js(\.gz)?$, => 'libjs-scriptaculous' ],
+	    [ qr,(?i)fckeditor\.js(\.gz)?$, => 'fckeditor' ],
+	    [ qr,(?i)cropper(\.uncompressed)?\.js(\.gz)?$, => 'libjs-cropper' ],
+	);
+	foreach my $jslibrary (@jslibraries) {
+	    if ($file =~ m,$jslibrary->[0], and $pkg ne $jslibrary->[1]) {
+		tag "embedded-javascript-library", "$file";
+	    }
 	}
 
 	# ---------------- embedded Feedparser library
diff --git a/debian/changelog b/debian/changelog
index e1953b5..cf26fa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ lintian (1.24.4) UNRELEASED; urgency=low
   * checks/cruft{,.desc}:
     + [FL] Add new check for outdated libtool files.
       (Closes: #293296)
+  * checks/files:
+    + [ADB] Don't warn about embedded Javascript libraries in the package
+      that actually provides the library. Thanks Raphael Geissert for
+      pointing out the problem.
   * checks/scripts:
     + [ADB] Split the "read without variable or with invalid options" bashism
       test in two, thus enabling the checks to be more accurate and avoiding

-- 
Debian package checker


Reply to: