dh_install: Add test suite covering the last 5 bugs.

[debhelper.git] / dh_installchangelogs

diff --git a/dh_installchangelogs b/dh_installchangelogs
index 7bb235cb8cd896afbecfc3ed05b3eb79700b7b16..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
 
@@ -30,12 +30,16 @@ NEWS.Debian files. If there is a debian/NEWS file, it is installed as
 usr/share/doc/package/NEWS.Debian. debian/package.NEWS files can also be
 used.
 
-If an upstream changelog file is specified as an option, then this upstream
-changelog will be installed as usr/share/doc/package/changelog in the
-package build directory. If the changelog is a html file (determined by
-file extension), it will be installed as
-usr/share/doc/package/changelog.html instead, and will be converted to
-plain text with html2text to generate usr/share/doc/package/changelog.
+An upstream changelog file may be specified as an option. If none is
+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
+usr/share/doc/package/changelog in the package build directory. If the
+changelog is a html file (determined by file extension), it will be
+installed as usr/share/doc/package/changelog.html instead, and will be
+converted to plain text with html2text to generate
+usr/share/doc/package/changelog.
 
 =head1 OPTIONS
 
@@ -49,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.
@@ -60,10 +69,23 @@ Install this file as the upstream changelog.
 init();
 
 my $upstream=shift;
-
 my $changelog_name="changelog.Debian";
-if (isnative($dh{MAINPACKAGE}) && ! defined $upstream) {
-       $changelog_name='changelog';
+if (! defined $upstream) {
+       if (! isnative($dh{MAINPACKAGE}) && !compat(6)) {
+               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;
+                       }
+               }
+       }
+       if (isnative($dh{MAINPACKAGE})) {
+               $changelog_name='changelog';
+       }
 }
 my $news_name="NEWS.Debian";
 
@@ -100,7 +122,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        "$tmp/usr/share/doc/$package/$news_name");
        }
 
-       if ($upstream) {
+       if (defined $upstream) {
                my $link_to;
                if ($upstream=~m/\.html?$/i) {
                        # HTML changelog