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

[lintian] 01/01: Ignore embedded jQuery libraries for Doxygen. (Closes: #736360)



This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository lintian.

commit 3d58ecb4d542530c8ba2a2a6d6ccb4f5246ede0b
Author: Chris Lamb <lamby@debian.org>
Date:   Sat Oct 28 18:54:15 2017 +0100

    Ignore embedded jQuery libraries for Doxygen. (Closes: #736360)
---
 checks/files.pm                              | 6 +++++-
 debian/changelog                             | 2 ++
 t/tests/files-embedded/debian/debian/install | 2 ++
 t/tests/files-embedded/debian/doxygen.css    | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/checks/files.pm b/checks/files.pm
index 13d461d..a2aa947 100644
--- a/checks/files.pm
+++ b/checks/files.pm
@@ -1475,7 +1475,11 @@ sub run {
             }
 
             # ---------------- embedded libraries
-            _detect_embedded_libraries($fname, $file, $pkg);
+            _detect_embedded_libraries($fname, $file, $pkg)
+              # Ignore embedded jQuery libraries for Doxygen (#736360)
+              unless $file->basename eq 'jquery.js'
+              and defined(
+                $info->index_resolved_path($file->dirname . 'doxygen.css'));
 
             # ---------------- embedded Feedparser library
             if (    $fname =~ m,/feedparser\.py$,
diff --git a/debian/changelog b/debian/changelog
index ab677a4..d234f91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ lintian (2.5.57) UNRELEASED; urgency=medium
       from upstream that would be ideally left intact.
   * checks/debhelper.pm:
     + [NT] Remove code handling named compat levels.
+  * checks/files.desc:
+    + [CL] Ignore embedded jQuery libraries for Doxygen.  (Closes: #736360)
 
   * commands/lintian.pm:
     + [NT] Have lintian resignal between various stages of the
diff --git a/t/tests/files-embedded/debian/debian/install b/t/tests/files-embedded/debian/debian/install
index 23d9ad9..77601ab 100644
--- a/t/tests/files-embedded/debian/debian/install
+++ b/t/tests/files-embedded/debian/debian/install
@@ -3,3 +3,5 @@ jquery*  usr/share/php
 feedparser.py usr/share/php
 rss_parse.php usr/share/php
 tiny_mce_popup.js usr/share/php
+jquery.js usr/share/doxygen-test/
+doxygen.css usr/share/doxygen-test
diff --git a/t/tests/files-embedded/debian/doxygen.css b/t/tests/files-embedded/debian/doxygen.css
new file mode 100644
index 0000000..43dd760
--- /dev/null
+++ b/t/tests/files-embedded/debian/doxygen.css
@@ -0,0 +1 @@
+Dummy CSS file so that we do not emit embedded-javascript-library in jQuery docs.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: