r1767: * Fix typo in dh_install example. Closes: #314964

[debhelper.git] / dh_installchangelogs

diff --git a/dh_installchangelogs b/dh_installchangelogs
index 4c211e55d748d39261571632349a0eae69d012c6..7bb235cb8cd896afbecfc3ed05b3eb79700b7b16 100755 (executable)
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -26,18 +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
-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.
+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.
 
 =head1 OPTIONS
 
@@ -57,29 +55,21 @@ 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})) {
+if (isnative($dh{MAINPACKAGE}) && ! defined $upstream) {
        $changelog_name='changelog';
-       $news_name='NEWS';
 }
+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");