r594: * dh_installchangelogs: Install debian/NEWS as NEWS.Debian, even for native

     packages. This doesn't follow the lead of the changelog for native
     packages for the reasons discussed in bug #192089

diff --git a/debian/changelog b/debian/changelog
index d92f9b79920bb7ec6640e3a3c9c094de1d3fc0c9..d424ff918f82ebeda0f514f13f15856feadf54fb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (4.1.51) unstable; urgency=low
+
+  * dh_installchangelogs: Install debian/NEWS as NEWS.Debian, even for native
+    packages. This doesn't follow the lead of the changelog for native
+    packages for the reasons discussed in bug #192089
+
+ -- Joey Hess <joeyh@debian.org>  Fri,  4 Jul 2003 00:34:24 -0400
+
 debhelper (4.1.50) unstable; urgency=low
 
   * dh_clean: make -X work for debian/substvars file.

diff --git a/dh_installchangelogs b/dh_installchangelogs
index 4c211e55d748d39261571632349a0eae69d012c6..66a02558d87201ab6f252ea5f90ad15bd7e013f2 100755 (executable)
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -26,10 +26,9 @@ 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.
+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, and the package is
 not a native debian package, then this upstream changelog will be installed
@@ -73,11 +72,10 @@ if (isnative($dh{MAINPACKAGE}) && defined $upstream) {
 }
 
 my $changelog_name="changelog.Debian";
-my $news_name="NEWS.Debian";
 if (isnative($dh{MAINPACKAGE})) {
        $changelog_name='changelog';
-       $news_name='NEWS';
 }
+my $news_name="NEWS.Debian";
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
        my $tmp=tmpdir($package);