[lintian] 01/01: Allow, for example, debian/missing-sources/foo.js directories to represent the source for foo.js. This is useful when foo.js is the result of concatenating multiple files. (Closes: #836771)
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit 5f3da5839c6819a491b52bfb6993a3a7db773a12
Author: Chris Lamb <lamby@debian.org>
Date: Fri Jan 26 15:29:14 2018 +1100
Allow, for example, debian/missing-sources/foo.js directories to represent the source for foo.js. This is useful when foo.js is the result of concatenating multiple files. (Closes: #836771)
---
checks/cruft.pm | 4 ++--
debian/changelog | 3 +++
.../debian/debian/missing-sources/subdir.js/source.js | 0
t/tests/cruft-minified-js/pre_build | 1 +
t/tests/cruft-minified-js/tags | 1 +
5 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/checks/cruft.pm b/checks/cruft.pm
index 03d616d..706a31e 100644
--- a/checks/cruft.pm
+++ b/checks/cruft.pm
@@ -879,8 +879,8 @@ sub check_missing_source {
if($newpath eq '') {
next PATH;
}
- # found source return
- if($info->index($newpath)) {
+ # found source file or directory
+ if($info->index_resolved_path($newpath)) {
return;
}
}
diff --git a/debian/changelog b/debian/changelog
index 29672df..d22a98d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ lintian (2.5.72) UNRELEASED; urgency=medium
from pecl.php.net: "The last agreement with FTP Masters was that PHP
license is OK when the sources some from PECL repository."
(Closes: #810780)
+ + [CL] Allow, for example, debian/missing-sources/foo.js directories to
+ represent the source for foo.js. This is useful when foo.js is the
+ result of concatenating multiple files. (Closes: #836771)
* checks/debhelper.{desc,pm}:
+ [CL] Warn about packages that use about dh_systemd_enable or
dh_systemd_start overrides whilst using debhelper compat level 11 as
diff --git a/t/tests/cruft-minified-js/debian/debian/missing-sources/subdir.js/source.js b/t/tests/cruft-minified-js/debian/debian/missing-sources/subdir.js/source.js
new file mode 100644
index 0000000..e69de29
diff --git a/t/tests/cruft-minified-js/pre_build b/t/tests/cruft-minified-js/pre_build
index bfd0878..0af7e22 100755
--- a/t/tests/cruft-minified-js/pre_build
+++ b/t/tests/cruft-minified-js/pre_build
@@ -24,6 +24,7 @@ uglifyjs -o "$uglyjson" "$json"
cp "$uglyjson" "$jsdir/jswithoutminext/json.js"
# fake not sourced
cp "$uglyjson" "$jsdir/minwithoutsource/notsourced.min.js"
+cp "$uglyjson" "$jsdir/minwithoutsource/subdir.min.js"
# fake install but not sourced
cp "$uglyjson" "$jsdir/jswithoutminextwithoutsource/jsonnotsourced.js"
# fake source and min alone
diff --git a/t/tests/cruft-minified-js/tags b/t/tests/cruft-minified-js/tags
index 68f3714..38424ce 100644
--- a/t/tests/cruft-minified-js/tags
+++ b/t/tests/cruft-minified-js/tags
@@ -24,6 +24,7 @@ P: cruft-minified-js source: source-contains-prebuilt-javascript-object usr/shar
P: cruft-minified-js source: source-contains-prebuilt-javascript-object usr/share/javascript/jswithoutminext/json.js line length is NUMBER characters (>CUTOFF)
P: cruft-minified-js source: source-contains-prebuilt-javascript-object usr/share/javascript/jswithoutminextwithoutsource/jsonnotsourced.js line length is NUMBER characters (>CUTOFF)
P: cruft-minified-js source: source-contains-prebuilt-javascript-object usr/share/javascript/minwithoutsource/notsourced.min.js
+P: cruft-minified-js source: source-contains-prebuilt-javascript-object usr/share/javascript/minwithoutsource/subdir.min.js
P: cruft-minified-js source: source-contains-prebuilt-javascript-object usr/share/javascript/sourced/sourced.min.js
P: cruft-minified-js source: source-contains-prebuilt-javascript-object usr/share/javascript/sourced_variant/sourced.min.js
P: cruft-minified-js source: source-contains-prebuilt-pandoc-documentation oldfalsepositives/pandoc/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: