Control: tags -1 patch
Control: severity -1 serious
On Mon, 21 May 2018 17:05:54 +0200 Sven Joachim <svenj...@gmx.de> wrote:
> Package: debhelper
> Version: 11.3
>
> Upon rebuilding (binary-arch only) ncurses with debhelper 11.3, I found
> that lintian would notice missing upstream changelogs:
>
> ,----
> | P: libtinfo6: no-upstream-changelog
> | P: libtinfo5: no-upstream-changelog
> | P: lib64tinfo6: no-upstream-changelog
> | P: ncurses-bin: no-upstream-changelog
> | P: ncurses-examples: no-upstream-changelog
> `----
>
> In debian/rules I have "dh_installchangelogs -a NEWS", nothing fancy.
> And dh_installchangelogs silently skipped this file.
>
>
> [...]
Hi Sven,
Thanks for reporting this bug.
Could you please try the attached patch and see/confirm it fixes the
issue for you?
Thanks,
~Niels
diff --git a/dh_installchangelogs b/dh_installchangelogs
index 6f4c7e9c..b1594411 100755
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -152,6 +152,7 @@ init();
my $news_name="NEWS.Debian";
my $changelog_name="changelog.Debian";
+my $explicit_changelog = @ARGV ? 1 : 0;
my $default_upstream = $ARGV[0];
my $default_upstream_text=$default_upstream;
my $default_upstream_html;
@@ -198,11 +199,15 @@ on_pkgs_in_parallel {
my $tmp=tmpdir($package);
my $changelog=pkgfile($package,"changelog");
my $news=pkgfile($package,"NEWS");
- my $upstream_changelog = $ARGV[0];
+ my $upstream_changelog;
my ($upstream_changelog_text, $upstream_changelog_html);
my $changelog_from_tmp_dir = 0;
- if (! defined($upstream_changelog)) {
+ if ($explicit_changelog) {
+ $upstream_changelog = $default_upstream;
+ $upstream_changelog_text = $default_upstream_text;
+ $upstream_changelog_html = $default_upstream_html;
+ } else {
# Check if the upstream build system provided a
# changelog
$upstream_changelog = find_changelog("${tmp}/usr/share/doc/${package}");
@@ -211,11 +216,6 @@ on_pkgs_in_parallel {
$changelog_from_tmp_dir = 1;
}
}
- if (not $upstream_changelog || defined($ARGV[0])) {
- $upstream_changelog = $default_upstream;
- $upstream_changelog_text = $default_upstream_text;
- $upstream_changelog_html = $default_upstream_html;
- }
if (!$changelog) {
$changelog="debian/changelog";
