package debhelper
tags 781077 + pending
thanks
* brl...@debian.org <brl...@debian.org> [150405 02:29]:
> This is an automated email from the git hooks/post-receive script.
>
> brlink pushed a commit to branch master
> in repository debhelper.
>
> commit 40656c02c319461e65879c2dba7475b2f288b578
> Author: Bernhard R. Link <brl...@debian.org>
> Date: Sat Apr 4 19:04:41 2015 +0200
>
> dh_installwm: call after dh_link in dh call sequence, error out in compat
> 10 if there is no man page
>
> Move dh_installwm after dh_link, so that a manpage created by dh_link
> can be found.
>
> Also error out in compat 10 if no manpage is found.
> ---
> debhelper.pod | 5 +++++
> debian/changelog | 2 ++
> dh | 2 +-
> dh_installwm | 4 ++++
> 4 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/debhelper.pod b/debhelper.pod
> index 2c33aab..1e28e60 100644
> --- a/debhelper.pod
> +++ b/debhelper.pod
> @@ -565,6 +565,11 @@ B<dh_installdeb> no longer installs a maintainer-provided
> debian/I<package>.shlibs file. This is now done by B<dh_makeshlibs>
> instead.
>
> +=item -
> +
> +B<dh_installwm> refuses to create a broken package if no man page
> +can be found (required to register for the x-window-manager alternative).
> +
> =back
>
> =back
> diff --git a/debian/changelog b/debian/changelog
> index a00b8be..2d24a46 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -92,6 +92,8 @@ debhelper (9.20150101.1) UNRELEASED; urgency=medium
> --disable-silent-rules (otherwise). (Closes: #551463, #680686)
> * dh_compress: exclude .xz .lzma and .lz files from compression
> (Closes: #778927)
> + * dh_installwm: call by dh after dh_link (Closes: #781077),
> + error out in compat 10 if no man page found
>
> [ Jason Pleau ]
> * dh_installchangelogs: Add CHANGES.md to the list of common changelog
> diff --git a/dh b/dh
> index eceb62e..93111da 100755
> --- a/dh
> +++ b/dh
> @@ -381,7 +381,6 @@ my @i = qw{
> dh_installpam
> dh_installppp
> dh_installudev
> - dh_installwm
> dh_installgsettings
> dh_bugfiles
> dh_ucf
> @@ -392,6 +391,7 @@ my @i = qw{
> dh_usrlocal
>
> dh_link
> + dh_installwm
> dh_installxfonts
> dh_compress
> dh_fixperms
> diff --git a/dh_installwm b/dh_installwm
> index b09bc3a..8fa0253 100755
> --- a/dh_installwm
> +++ b/dh_installwm
> @@ -102,6 +102,10 @@ WM: foreach my $wm (@wm) {
> }
> }
> }
> + if (! compat(9)) {
> + error("no manpage found (creating an
> x-window-manager alternative requires a slave symlink for the manpage)");
> + }
> + # Reaching this code means a broken package will be
> produced.
>
> autoscript($package,"postinst","postinst-wm-noman","s:#WM#:$wm:;s/#PRIORITY#/$dh{PRIORITY}/",);
> }
> }
>
> --
> Alioth's /usr/local/bin/git-commit-notice on
> /srv/git.debian.org/git/debhelper/debhelper.git
>
>
> _______________________________________________
> debhelper-devel mailing list
> debhelper-de...@lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debhelper-devel
Bernhard R. Link
--
F8AC 04D5 0B9B 064B 3383 C3DA AFFC 96D1 151D FFDC
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
