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

[lintian] 01/01: Avoid a embedded-php-library false positive for streams.php. (Closes: #637473)



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

lamby pushed a commit to branch master
in repository lintian.

commit 3c5ee5b2b146c6ff39deac5129e032eed15c0534
Author: Chris Lamb <lamby@debian.org>
Date:   Tue Dec 26 10:46:58 2017 +0000

    Avoid a embedded-php-library false positive for streams.php. (Closes: #637473)
---
 data/files/php-libraries                     | 2 +-
 debian/changelog                             | 3 +++
 t/tests/files-embedded/debian/debian/install | 2 ++
 t/tests/files-embedded/tags                  | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/data/files/php-libraries b/data/files/php-libraries
index 085d6c4..b4ad3e7 100644
--- a/data/files/php-libraries
+++ b/data/files/php-libraries
@@ -26,7 +26,7 @@ libphp-simplepie     ~~ (?i)/(?:class[\.-])?simplepie(?:\.(?:php|inc))+$
 libphp-jpgraph       ~~ (?i)/jpgraph\.php$
 php-fpdf             ~~ (?i)/fpdf\.php$
 php-getid3           ~~ (?i)/getid3\.(?:lib\.)?(?:\.(?:php|inc))+$
-php-php-gettext      ~~ (?i)/streams\.php$
+php-php-gettext      ~~ (?i)/(?<!pomo/)streams\.php$
 libphp-magpierss     ~~ (?i)/rss_parse\.(?:php|inc)$
 php-simpletest       ~~ (?i)/unit_tester\.php$
 libsparkline-php     ~~ (?i)/Sparkline\.php$
diff --git a/debian/changelog b/debian/changelog
index 29ed896..399ac0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -72,6 +72,9 @@ lintian (2.5.66) UNRELEASED; urgency=medium
       filenames (eg. jquery-1.10.2.min.js).  (Closes: #833613)
     + [CL] Also emit embedded-javascript-library for Twitter Bootstrap and
       "mustache".
+  * data/files/php-libraries:
+    + [CL] Avoid a embedded-php-library false positive for streams.php.
+      (Closes: #637473)
 
   * debian/compat:
     + [NT] Bump debhelper compat level to 11.
diff --git a/t/tests/files-embedded/debian/debian/install b/t/tests/files-embedded/debian/debian/install
index 3bbe941..3756496 100644
--- a/t/tests/files-embedded/debian/debian/install
+++ b/t/tests/files-embedded/debian/debian/install
@@ -2,6 +2,8 @@ IPv4.php usr/share/php
 jquery*  usr/share/php
 bootstrap*  usr/share/php
 feedparser.py usr/share/php
+streams.php usr/share/php
+streams.php usr/share/php/pomo
 rss_parse.php usr/share/php
 tiny_mce_popup.js usr/share/php
 jquery.js usr/share/doxygen-test/
diff --git a/t/tests/files-embedded/tags b/t/tests/files-embedded/tags
index 86764f5..e43c23d 100644
--- a/t/tests/files-embedded/tags
+++ b/t/tests/files-embedded/tags
@@ -4,4 +4,5 @@ W: files-embedded: embedded-javascript-library usr/share/php/jquery.js please us
 W: files-embedded: embedded-javascript-library usr/share/php/jquery.min.js please use libjs-jquery
 W: files-embedded: embedded-javascript-library usr/share/php/tiny_mce_popup.js please use tinymce
 W: files-embedded: embedded-php-library usr/share/php/rss_parse.php please use libphp-magpierss
+W: files-embedded: embedded-php-library usr/share/php/streams.php please use php-php-gettext
 X: files-embedded: embedded-pear-module usr/share/php/IPv4.php please use php-net-ipv4

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


Reply to: