Some updates for the new manpage build system from upstream.

Rewritten-From: 65f293c84159e92f5c9ec09558434b4691ff3a30

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 6e01a83fc172998d1486f3741662d8a39381d43f..f49ebbb99668db5770040a40956778b143385d0d 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,6 +1,7 @@
 heat (2013.1~g2-1) experimental; urgency=low
 
   * New upstream release.
+  * Some updates for the new manpage build system from upstream.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 04 Feb 2013 21:56:59 +0800
 

diff --git a/xenial/debian/heat-api-cfn.manpages b/xenial/debian/heat-api-cfn.manpages
index b1704809cf94ce1248c1fc6ec2c7baf31e549d56..2e0b356ef90261db573b6122410e23847ea645a3 100644 (file)
--- a/xenial/debian/heat-api-cfn.manpages
+++ b/xenial/debian/heat-api-cfn.manpages
@@ -1 +1 @@
-docs/man/man1/heat-api-cfn.1
+doc/build/man/heat-api-cfn.1

diff --git a/xenial/debian/heat-api-cloudwatch.manpages b/xenial/debian/heat-api-cloudwatch.manpages
new file mode 100644 (file)
index 0000000..6817f5f
--- /dev/null
+++ b/xenial/debian/heat-api-cloudwatch.manpages
@@ -0,0 +1 @@
+doc/build/man/heat-api-cloudwatch.1

diff --git a/xenial/debian/heat-api.manpages b/xenial/debian/heat-api.manpages
new file mode 100644 (file)
index 0000000..fff3bf3
--- /dev/null
+++ b/xenial/debian/heat-api.manpages
@@ -0,0 +1 @@
+doc/build/man/heat-api.1

diff --git a/xenial/debian/heat-common.manpages b/xenial/debian/heat-common.manpages
index f1a7695969f91b416d9a26ae7fc3f22a66d705bf..60711af96b52167dc575c79f35a1fc45e0131511 100644 (file)
--- a/xenial/debian/heat-common.manpages
+++ b/xenial/debian/heat-common.manpages
@@ -1,2 +1 @@
-docs/man/man1/heat-boto.1
-docs/man/man1/heat-db-setup.1
+doc/build/man/heat-cfn.1

diff --git a/xenial/debian/heat-engine.manpages b/xenial/debian/heat-engine.manpages
index 9daa198679550dcbfbd28ca695492322186dfd5b..80485a1fbd25ab6797f1a2c1171e6d4e624d6b9c 100644 (file)
--- a/xenial/debian/heat-engine.manpages
+++ b/xenial/debian/heat-engine.manpages
@@ -1 +1 @@
-docs/man/man1/heat-engine.1
+doc/build/man/heat-engine.1

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 85f04ba34a8083606a066350712fa394400afc46..9354e0889ef96ee55ee2e537b4ad7f5c92ae70bb 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -46,3 +46,7 @@ override_dh_auto_build:
        /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-common.postinst
        /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-engine.config
        /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-engine.postinst
+
+override_dh_installman:
+       make -C doc man
+       dh_installman