Fix typo in French translation, about debian/package.README.Debian files.

[debhelper.git] / dh_installchangelogs

diff --git a/dh_installchangelogs b/dh_installchangelogs
index 2588d57f476a6a8bde51d3ee5c5d188fa13b740e..7042c5f9b742d270e7b13f67b123aaf84c1e4bb0 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>] [I<upstream>]
 
 =head1 DESCRIPTION
 
@@ -26,14 +26,16 @@ files named debian/package.changelog exist, they will be used in preference
 to debian/changelog.)
 
 Parallelling the debian changelog handling, this program also takes care of
-debian NEWS files. If there is a debian/NEWS file, it is installed as
-usr/share/doc/package/NEWS for native packages, and as
-usr/share/doc/package/NEWS.Debian for non-native packages. debian/package.NEWS
-files can also be used.
-
-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
+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 html2text to generate
@@ -57,29 +59,32 @@ 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";
-my $news_name="NEWS.Debian";
-if (isnative($dh{MAINPACKAGE})) {
-       $changelog_name='changelog';
-       $news_name='NEWS';
+if (! defined $upstream) {
+       if (! isnative($dh{MAINPACKAGE}) && !compat(6)) {
+               my @files=sort glob("*");
+               foreach my $name (qw{changelog changes}) {
+                       my @matches=grep { lc $_ eq $name && -s $_ } @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");
@@ -110,7 +115,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
@@ -134,7 +139,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.