releasing version 7.3.10

[debhelper.git] / dh_installchangelogs

diff --git a/dh_installchangelogs b/dh_installchangelogs
index 339313a25a92bf36a41007c1adad1d0f46e73b0d..3749d523104d59555f4a167558c77ae95e2d293d 100755 (executable)
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -11,7 +11,7 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-B<dh_installchangelogs> [S<I<debhelper options>>] [B<-k>] [I<upstream>]
+B<dh_installchangelogs> [S<I<debhelper options>>] [B<-k>] [B<-X>I<item>] [I<upstream>]
 
 =head1 DESCRIPTION
 
@@ -31,7 +31,7 @@ usr/share/doc/package/NEWS.Debian. debian/package.NEWS files can also be
 used.
 
 An upstream changelog file may be specified as an option. If none is
-specified, a few common filenames are tried. (In compatability level 7 and
+specified, a few common filenames are tried. (In compatibility level 7 and
 above.)
 
 If there is an upstream changelog file, it will be be installed as
@@ -53,6 +53,11 @@ that to the original name of the changelog file. This can be useful if the
 upstream changelog has an unusual name, or if other documentation in the
 package refers to the changelog file.
 
+=item B<-Xitem>, B<--exclude=item>
+
+Exclude upstream changelog files that contain "item" anywhere in their
+filename from being installed.
+
 =item I<upstream>
 
 Install this file as the upstream changelog.
@@ -67,9 +72,13 @@ my $upstream=shift;
 my $changelog_name="changelog.Debian";
 if (! defined $upstream) {
        if (! isnative($dh{MAINPACKAGE}) && !compat(6)) {
-               foreach my $name (qw{ChangeLog Changelog Changes CHANGES changelog}) {
-                       if (-e $name) {
-                               $upstream=$name;
+               my @files=sort glob("*");
+               foreach my $name (qw{changelog changes changelog.txt changes.txt}) {
+                       my @matches=grep {
+                               lc $_ eq $name && -s $_ && ! excludefile($_)
+                       } @files;
+                       if (@matches) {
+                               $upstream=shift @matches;
                                last;
                        }
                }