[Pkg-libvirt-maintainers] Bug#644457: Bug#644457: include libvirtd man page

[Guido Günther]

On Wed, Oct 05, 2011 at 10:45:37PM -0500, Serge E. Hallyn wrote:
> Package: libvirt
> Version: 0.9.6-1
> 
> libvirt ships with a libvirtd.8 man page (daemon/libvirtd.8.in), but
> the package is not installing that.  A possible debdiff is below, though
> I assume that, in addition, '@sysconfdir@' and '@localstatedir@' should
> be switched out?

Thanks. I've changed that to include the preprocessed manpage instead.
 -- Guido

> 
> thanks,
> -serge
> 
> diff -Nru libvirt-0.9.6/debian/changelog libvirt-0.9.6/debian/changelog
> --- libvirt-0.9.6/debian/changelog	2011-09-26 16:28:16.000000000 -0500
> +++ libvirt-0.9.6/debian/changelog	2011-10-05 22:38:33.000000000 -0500
> @@ -1,3 +1,9 @@
> +libvirt (0.9.6-2) oneiric; urgency=low
> +
> +  * Ship the libvirtd.8 manpage.
> +
> + -- Serge Hallyn <serge.hallyn at ubuntu.com>  Wed, 05 Oct 2011 22:38:15 -0500
> +
>  libvirt (0.9.6-1) unstable; urgency=low
>  
>    * [828e4e3] New upstream version 0.9.6
> diff -Nru libvirt-0.9.6/debian/libvirt-bin.manpages libvirt-0.9.6/debian/libvirt-bin.manpages
> --- libvirt-0.9.6/debian/libvirt-bin.manpages	2011-07-19 15:15:44.000000000 -0500
> +++ libvirt-0.9.6/debian/libvirt-bin.manpages	2011-10-05 22:35:48.000000000 -0500
> @@ -1 +1,2 @@
>  tools/virsh.1
> +daemon/libvirtd.8
> diff -Nru libvirt-0.9.6/debian/patches/manpage-fix-libvirtd-conf-path.patch libvirt-0.9.6/debian/patches/manpage-fix-libvirtd-conf-path.patch
> --- libvirt-0.9.6/debian/patches/manpage-fix-libvirtd-conf-path.patch	1969-12-31 18:00:00.000000000 -0600
> +++ libvirt-0.9.6/debian/patches/manpage-fix-libvirtd-conf-path.patch	2011-10-05 22:35:19.000000000 -0500
> @@ -0,0 +1,17 @@
> +Index: libvirt-0.9.6/daemon/libvirtd.8.in
> +===================================================================
> +--- libvirt-0.9.6.orig/daemon/libvirtd.8.in	2011-10-05 22:34:39.186274182 -0500
> ++++ libvirt-0.9.6/daemon/libvirtd.8.in	2011-10-05 22:35:17.174273540 -0500
> +@@ -187,9 +187,9 @@
> + On receipt of \fB\s-1SIGHUP\s0\fR libvirtd will reload its configuration.
> + .SH "FILES"
> + .IX Header "FILES"
> +-.ie n .IP "\fI\fI at sysconfdir\fI@/libvirtd.conf\fR" 4
> +-.el .IP "\fI\f(CI at sysconfdir\fI@/libvirtd.conf\fR" 4
> +-.IX Item "@sysconfdir@/libvirtd.conf"
> ++.ie n .IP "\fI\fI at sysconfdir\fI@/libvirt/libvirtd.conf\fR" 4
> ++.el .IP "\fI\f(CI at sysconfdir\fI@/libvirt/libvirtd.conf\fR" 4
> ++.IX Item "@sysconfdir@/libvirt/libvirtd.conf"
> + The default configuration file used by libvirtd, unless overridden on the
> + command line using the \fB\-f\fR|\fB\-\-config\fR option.
> + .ie n .IP "\fI\fI at localstatedir\fI@/run/libvirt/libvirt\-sock\fR" 4
> diff -Nru libvirt-0.9.6/debian/patches/series libvirt-0.9.6/debian/patches/series
> --- libvirt-0.9.6/debian/patches/series	2011-09-26 16:27:17.000000000 -0500
> +++ libvirt-0.9.6/debian/patches/series	2011-10-05 22:34:33.000000000 -0500
> @@ -10,3 +10,4 @@
>  Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
>  Disable-failing-virnetsockettest.patch
>  debian/Don-t-require-gawk-for-a-simple-print-expression.patch
> +manpage-fix-libvirtd-conf-path.patch
> 
> 
> 
> _______________________________________________
> Pkg-libvirt-maintainers mailing list
> Pkg-libvirt-maintainers at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-libvirt-maintainers
>