From: joey <joey>
Date: Tue, 2 Dec 2003 21:19:10 +0000 (+0000)
Subject: r1629:    * Removed the no upstream changelog for debian packages test.
X-Git-Tag: version_4.1.81^0
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e96ca35789dc7749bf5a29f1b7736f9e5877f6a4;p=debhelper.git

r1629:    * Removed the no upstream changelog for debian packages test.
     Even though it has personally saved me many times, debhelper is not
     intended to check packages for mistakes, and apparently it makes sense
     for some "native" packages to have a non-Debian changelog.
     Closes: #216099
   * If a native package has an upstream changelog, call the debian/changelog
     changelog.Debian.
   * postinst-menu-method: always chmod menu-method executable even if
     update-menus is not. Closes: #220576
   * dh_installmenu: do not ship menu-methods executable.
---

diff --git a/autoscripts/postinst-menu-method b/autoscripts/postinst-menu-method
index 01913d8..d3ef636 100644
--- a/autoscripts/postinst-menu-method
+++ b/autoscripts/postinst-menu-method
@@ -1,5 +1,7 @@
 inst=/etc/menu-methods/#PACKAGE#
-if [ -x /usr/bin/update-menus ] && [ -f $inst ] ; then
+if [ -f $inst ]; then
 	chmod a+x $inst
-	update-menus
+	if [ -x /usr/bin/update-menus ]; then
+		update-menus
+	fi
 fi
diff --git a/dh_installchangelogs b/dh_installchangelogs
index 66a0255..7de170a 100755
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -30,13 +30,12 @@ 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
-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.
+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
 
@@ -56,23 +55,14 @@ 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})) {
+if (isnative($dh{MAINPACKAGE}) && ! defined $upstream) {
 	$changelog_name='changelog';
 }
 my $news_name="NEWS.Debian";
diff --git a/dh_installmenu b/dh_installmenu
index 2e5a6e9..e61b9ad 100755
--- a/dh_installmenu
+++ b/dh_installmenu
@@ -67,7 +67,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		if (!-d "$tmp/etc/menu-methods") {
 			doit("install","-d","$tmp/etc/menu-methods");
 		}
-		doit("install","-p",$menu_method,"$tmp/etc/menu-methods/$package");
+		doit("install","-p","-m644",$menu_method,"$tmp/etc/menu-methods/$package");
 
 		if (! $dh{NOSCRIPTS}) {
 			autoscript($package,"postinst","postinst-menu-method","s/#PACKAGE#/$package/");