Refactor build directory setting into separate method and solve a few bugs.

[debhelper.git] / dh_installchangelogs

diff --git a/dh_installchangelogs b/dh_installchangelogs
index 76dd1c1930c75bb9f9f894d7c795e11000a31921..3749d523104d59555f4a167558c77ae95e2d293d 100755 (executable)
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -11,7 +11,7 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-  dh_installchangelogs [debhelper options] [-k] [upstream]
+B<dh_installchangelogs> [S<I<debhelper options>>] [B<-k>] [B<-X>I<item>] [I<upstream>]
 
 =head1 DESCRIPTION
 
@@ -25,12 +25,20 @@ into usr/share/doc/package/changelog.Debian in the package build directory. (If
 files named debian/package.changelog exist, they will be used in preference
 to debian/changelog.)
 
-If an upstream changelog file is specified as an option, and the package is
-not a native debian package, then this upstream changelog will be installed
-as usr/share/doc/package/changelog in the package build directory. If the
+Parallelling the debian changelog handling, this program also takes care of
+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.
+
+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 lynx to generate
+converted to plain text with html2text to generate
 usr/share/doc/package/changelog.
 
 =head1 OPTIONS
@@ -45,39 +53,55 @@ 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.
 
 =back
 
-=head1 NOTES
-
-It is an error to specify an upstream changelog file for a debian native
-package.
-
 =cut
 
 init();
 
 my $upstream=shift;
-
-if (isnative($dh{MAINPACKAGE}) && defined $upstream) {
-       error("Cannot specify an upstream changelog for a native debian package.");
-}
-
 my $changelog_name="changelog.Debian";
-if (isnative($dh{MAINPACKAGE})) {
-       $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";
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
+       next if is_udeb($package);
+       
        my $tmp=tmpdir($package);
        my $changelog=pkgfile($package,"changelog");
+       my $news=pkgfile($package,"NEWS");
 
        if (!$changelog) {
                $changelog="debian/changelog";
        }
+       if (!$news) {
+               $news="debian/NEWS";
+       }
 
        if (! -e $changelog) {
                error("could not find changelog $changelog");
@@ -93,14 +117,18 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        }
        doit("install","-o",0,"-g",0,"-p","-m644",$changelog,
                "$tmp/usr/share/doc/$package/$changelog_name");
+       if (-e $news) {
+               doit("install","-o",0,"-g",0,"-p","-m644",$news,
+                       "$tmp/usr/share/doc/$package/$news_name");
+       }
 
-       if ($upstream) {
+       if (defined $upstream) {
                my $link_to;
                if ($upstream=~m/\.html?$/i) {
                        # HTML changelog
                        doit("install","-o",0,"-g",0,"-p","-m644",
                                $upstream,"$tmp/usr/share/doc/$package/changelog.html");
-                       complex_doit("lynx -dump $upstream > $tmp/usr/share/doc/$package/changelog");
+                       doit("html2text","-nobs","-o","$tmp/usr/share/doc/$package/changelog",$upstream);
                        $link_to='changelog.html';
                }
                else {
@@ -118,7 +146,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.