summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2015-03-01 10:16:33 +0100
committerAxel Beckert <abe@deuxchevaux.org>2015-03-01 10:16:33 +0100
commit29231e618d0437f0e207887308a6512961acfe54 (patch)
tree5afcd2342eec826dfe81b7b354102173c3cb239d
parentb4d401a719de734d564dc579ba66d086d3421497 (diff)
downloaddebhelper-29231e618d0437f0e207887308a6512961acfe54.tar.gz
dh_installchangelogs: Also look for changelogs with .rst suffix
-rw-r--r--debian/changelog1
-rwxr-xr-xdh_installchangelogs2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 7d2f75e6..90233ff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -95,6 +95,7 @@ debhelper (9.20150101.1) UNRELEASED; urgency=medium
"history").
+ Looks for "history.md" now, too.
+ Makes it easier to add base names or suffixes in the future.
+ * dh_installchangelogs: Also look for changelogs with .rst suffix.
-- Niels Thykier <niels@thykier.net> Thu, 01 Jan 2015 17:24:38 +0100
diff --git a/dh_installchangelogs b/dh_installchangelogs
index c32ad93b..c83ac26f 100755
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -142,7 +142,7 @@ if (! defined $upstream) {
if (! isnative($dh{MAINPACKAGE}) && !compat(6)) {
foreach my $dir (qw{. doc docs}) {
my @files=sort glob("$dir/*");
- foreach my $suffix ('', qw(.txt .md)) {
+ foreach my $suffix ('', qw(.txt .md .rst)) {
foreach my $name (qw{changelog changes history}) {
my @matches=grep {
lc basename($_) eq "$name$suffix" && -s $_ && ! excludefile($_)