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 01913d8269354b56a66e6c86db3c7264736b5c61..d3ef636264b6abdd209a29d3123aefb7ba96ca5f 100644 (file)
--- 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 66a02558d87201ab6f252ea5f90ad15bd7e013f2..7de170aae6b615cd9a4693f3ad843cb64f8e14c3 100755 (executable)
--- 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 2e5a6e9cd97d440834ffd32fb6e336f992c12d30..e61b9adf4be6b4c853f2ec8bc05c56b7beb7ecb6 100755 (executable)
--- 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/");