summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-10-20 19:19:18 -0400
committerJoey Hess <joey@kitenet.net>2013-10-20 19:19:18 -0400
commitf1f2efc66605805d31e05e3769264c1914dc825b (patch)
tree6592ebc389d51712c393f374824693d0d936354d
parent38105bfab897424d227f9209f9e173abdc79dfed (diff)
dh_installchangelogs: Avoid installing binNMU changelog file in --no-act mode. Closes: #726930
-rw-r--r--debian/changelog7
-rwxr-xr-xdh_installchangelogs8
2 files changed, 12 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 948e2f5..0fa1b22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (9.20130922) UNRELEASED; urgency=low
+
+ * dh_installchangelogs: Avoid installing binNMU changelog file
+ in --no-act mode. Closes: #726930
+
+ -- Joey Hess <joeyh@debian.org> Sun, 20 Oct 2013 19:18:44 -0400
+
debhelper (9.20130921) unstable; urgency=low
* dh: Call dh_installxfonts after dh_link, so that it will
diff --git a/dh_installchangelogs b/dh_installchangelogs
index 2f65f8a..edd7f9f 100755
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -200,9 +200,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
doit("install","-d","$tmp/usr/share/doc/$package");
}
- if (! install_binNMU_changelog($package, $changelog, $changelog_name)) {
- doit("install","-o",0,"-g",0,"-p","-m644",$changelog,
- "$tmp/usr/share/doc/$package/$changelog_name");
+ if (! $dh{NO_ACT}) {
+ if (! install_binNMU_changelog($package, $changelog, $changelog_name)) {
+ doit("install","-o",0,"-g",0,"-p","-m644",$changelog,
+ "$tmp/usr/share/doc/$package/$changelog_name");
+ }
}
if (-e $news) {