Pkg xen devel - Aug 2013 - Bug#688308: Bug#688308: installing some additional docs

tags 688308 +patch
thanks

A lot of /docs/ is pretty low-level and not all that interesting to be
installed by the packages. However some of it is, and in particular some
is referenced from the manpages. I've cherry-picked the bits which I
think are most interesting in that context. Patch below.

8<---------------

commit 7f8ac283e684b7c713d52ed845cab0704a97abab
Author: Ian Campbell <ijc at hellion.org.uk>
Date:   Fri Aug 16 14:40:44 2013 +0100

    * debian/rules.real: Install docs in xen-utils-common package.
    * debian/changelog: update

diff --git a/xen/debian/changelog b/xen/debian/changelog
index 6100e75..8c81419 100644
--- a/xen/debian/changelog
+++ b/xen/debian/changelog
@@ -1,5 +1,6 @@
 xen (4.3.0-1) UNRELEASED; urgency=low
 
+  [ Bastian Blank ]
   * New upstream release.
   * Call configure with proper arguments.
   * Remove now empty xen-docs package.
@@ -16,6 +17,9 @@ xen (4.3.0-1) UNRELEASED; urgency=low
     - Fix fallout from harderning flags.
   * Update Standards-Version to 3.9.4. No changes.
 
+  [ Ian Campbell ]
+  * Install some user facing docs in xen-utils-common. (Closes: 688308)
+
  -- Bastian Blank <waldi at debian.org>  Tue, 23 Jul 2013 12:45:27 +0200
 
 xen (4.2.2-1) unstable; urgency=low
diff --git a/xen/debian/rules.real b/xen/debian/rules.real
index 2265551..12fc4ae 100644
--- a/xen/debian/rules.real
+++ b/xen/debian/rules.real
@@ -247,6 +247,10 @@ install-utils-common: $(STAMPS_DIR)/install-utils-common
 	dh_installinit --name xend
 	dh_installinit --name xendomains --no-start -- defaults 21 20
 	dh_installman $(SOURCE_DIR)/docs/man1/* $(SOURCE_DIR)/docs/man5/*
+	dh_installdocs $(SOURCE_DIR)/docs/txt/misc/xl-disk-configuration.txt
+	dh_installdocs $(SOURCE_DIR)/docs/txt/misc/xl-network-configuration.txt
+	dh_installdocs $(SOURCE_DIR)/docs/txt/misc/xl-numa-placement.txt
+	dh_installdocs $(SOURCE_DIR)/docs/txt/misc/xen-command-line.txt
 	dh_link
 	dh_ucf
 	+$(MAKE_SELF) install-base

Processing commands for control at bugs.debian.org:
> tags 688308 +patch
Bug #688308 [xen-utils-4.2] xen-utils-4.2: xl-network-configuration.markdown not
installed
Added tag(s) patch.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
688308: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=688308
Debian Bug Tracking System
Contact owner at bugs.debian.org with problems

tags 407143 +patch
thanks

On Fri, 2013-08-16 at 14:42 +0100, Ian Campbell wrote:
> tags 688308 +patch
> thanks
> 
> A lot of /docs/ is pretty low-level and not all that interesting to be
> installed by the packages. However some of it is, and in particular some
> is referenced from the manpages. I've cherry-picked the bits which I
> think are most interesting in that context. Patch below.
Actually, we may as well close 407143 while we are at it. Updated patch
below:
8<-----------------------

commit ef66a8a74cc59968815b62fde66440c3f23f8a49
Author: Ian Campbell <ijc at hellion.org.uk>
Date:   Fri Aug 16 14:40:44 2013 +0100

    * debian/rules.real: Install docs in xen-utils-common package.
    * debian/changelog: update

diff --git a/xen/debian/changelog b/xen/debian/changelog
index 6100e75..8520329 100644
--- a/xen/debian/changelog
+++ b/xen/debian/changelog
@@ -1,5 +1,6 @@
 xen (4.3.0-1) UNRELEASED; urgency=low
 
+  [ Bastian Blank ]
   * New upstream release.
   * Call configure with proper arguments.
   * Remove now empty xen-docs package.
@@ -16,6 +17,10 @@ xen (4.3.0-1) UNRELEASED; urgency=low
     - Fix fallout from harderning flags.
   * Update Standards-Version to 3.9.4. No changes.
 
+  [ Ian Campbell ]
+  * Install some user facing docs in xen-utils-common.
+    (Closes: #688308, #407143)
+
  -- Bastian Blank <waldi at debian.org>  Tue, 23 Jul 2013 12:45:27 +0200
 
 xen (4.2.2-1) unstable; urgency=low
diff --git a/xen/debian/rules.real b/xen/debian/rules.real
index 2265551..3b610ea 100644
--- a/xen/debian/rules.real
+++ b/xen/debian/rules.real
@@ -247,6 +247,13 @@ install-utils-common: $(STAMPS_DIR)/install-utils-common
 	dh_installinit --name xend
 	dh_installinit --name xendomains --no-start -- defaults 21 20
 	dh_installman $(SOURCE_DIR)/docs/man1/* $(SOURCE_DIR)/docs/man5/*
+	dh_installman $(SOURCE_DIR)/tools/xenstat/xentop/xentop.1
+	dh_installman $(SOURCE_DIR)/tools/xentrace/xentrace.8
+	dh_installman $(SOURCE_DIR)/tools/xentrace/xentrace_format.1
+	dh_installdocs $(SOURCE_DIR)/docs/txt/misc/xl-disk-configuration.txt
+	dh_installdocs $(SOURCE_DIR)/docs/txt/misc/xl-network-configuration.txt
+	dh_installdocs $(SOURCE_DIR)/docs/txt/misc/xl-numa-placement.txt
+	dh_installdocs $(SOURCE_DIR)/docs/txt/misc/xen-command-line.txt
 	dh_link
 	dh_ucf
 	+$(MAKE_SELF) install-base

Processing commands for control at bugs.debian.org:
> tags 407143 +patch
Bug #407143 [xen-utils-common] Missing xentrace man page
Added tag(s) patch.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
407143: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=407143
Debian Bug Tracking System
Contact owner at bugs.debian.org with problems