[lintian] 01/01: dplint: Fix build-time substituation
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit beea4f3a67d5cbe9650f9129fb27c307389ce24a
Author: Niels Thykier <niels@thykier.net>
Date: Sat Mar 12 13:11:12 2016 +0000
dplint: Fix build-time substituation
Signed-off-by: Niels Thykier <niels@thykier.net>
---
debian/changelog | 5 +++++
debian/rules | 1 +
frontend/dplint | 3 ++-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 6c072f0..9851114 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ lintian (2.5.43) UNRELEASED; urgency=medium
XXX: generate tag summary with private/generate-tag-summary
+ * frontend/dplint:
+ + [NT] Put $LINTIAN_VERSION on its own line so the build
+ time substitution works again. Thanks to Stuart
+ Prescott for reporting the issue.
+
-- Niels Thykier <niels@thykier.net> Fri, 11 Mar 2016 18:35:45 +0000
lintian (2.5.42.1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index f4cf2e3..d144807 100755
--- a/debian/rules
+++ b/debian/rules
@@ -113,6 +113,7 @@ override_dh_install:
-e 's@my \$$INIT_ROOT(\s*=.*)?;@my \$$INIT_ROOT = q{/usr/share/lintian};@;' \
$(tmp)/usr/share/lintian/commands/lintian \
$(tmp)/usr/share/lintian/frontend/dplint
+ $(tmp)/usr/share/lintian/frontend/dplint --print-version
install -m 644 doc/lintianrc.example $(tmp)/etc/lintianrc
# Remove the l10n dir, if empty - happens if there are no translations
rmdir --ignore-fail-on-non-empty $(tmp)/usr/share/lintian/l10n
diff --git a/frontend/dplint b/frontend/dplint
index db6d193..d7c09c3 100755
--- a/frontend/dplint
+++ b/frontend/dplint
@@ -64,7 +64,8 @@ use Getopt::Long();
# is simply a placeholder to make the command work out of the box in
# the source tree.
my $INIT_ROOT = find_source_root();
-my ($LINTIAN_VERSION, @INCLUDE_DIRS, @RESTRICTED_INCLUDE_DIRS);
+my (@INCLUDE_DIRS, @RESTRICTED_INCLUDE_DIRS);
+my $LINTIAN_VERSION; # Substituted during build/install
my %BUILTINS = (
'help' => \&builtin_help,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: