diff mbox series

[ovs-dev,branch-2.13,3/3] debian: Fix broken build after some man pages became generated from RST

Message ID 20200825155554.1991822-4-aconole@redhat.com
State Accepted
Delegated to: Ilya Maximets
Headers show
Series Backport debian fixes to branch-2.13 | expand

Commit Message

Aaron Conole Aug. 25, 2020, 3:55 p.m. UTC
From: Ansis Atteka <aatteka@ovn.org>

As far as I know, the official way to build debian packages is by invoking
following command:

> fakeroot debian/rules binary

However, that command started to fail with these errors:

dh_installman --language=C
dh_installman: Cannot find (any matches for) "utilities/ovs-appctl.8" (tried in .)
dh_installman: Cannot find (any matches for) "utilities/ovs-l3ping.8" (tried in .)
dh_installman: Cannot find (any matches for) "utilities/ovs-tcpdump.8" (tried in .)

because the generated manpages are not part of the source tree anymore.  This
patch updates debian *.manpages files to point to the generted files.

Fixes: 39b5e46312 ("Documentation: Convert multiple manpages to ReST.")
CC: Ben Pfaff <blp@ovn.org>
Signed-off-by: Ansis Atteka <aatteka@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
---
 debian/openvswitch-common.manpages | 6 +++---
 debian/openvswitch-switch.manpages | 6 +++---
 debian/openvswitch-test.manpages   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/debian/openvswitch-common.manpages b/debian/openvswitch-common.manpages
index 9ac6a1dd6d..95004122cc 100644
--- a/debian/openvswitch-common.manpages
+++ b/debian/openvswitch-common.manpages
@@ -1,7 +1,7 @@ 
 ovsdb/ovsdb-client.1
 ovsdb/ovsdb-tool.1
 utilities/bugtool/ovs-bugtool.8
-utilities/ovs-appctl.8
+debian/tmp/usr/share/man/man8/ovs-appctl.8
 utilities/ovs-ofctl.8
-utilities/ovs-parse-backtrace.8
-utilities/ovs-pki.8
+debian/tmp/usr/share/man/man8/ovs-parse-backtrace.8
+debian/tmp/usr/share/man/man8/ovs-pki.8
diff --git a/debian/openvswitch-switch.manpages b/debian/openvswitch-switch.manpages
index 1161cfda77..7fd7bc55da 100644
--- a/debian/openvswitch-switch.manpages
+++ b/debian/openvswitch-switch.manpages
@@ -1,12 +1,12 @@ 
 ovsdb/ovsdb-server.1
 ovsdb/ovsdb-server.5
-utilities/ovs-ctl.8
+debian/tmp/usr/share/man/man8/ovs-ctl.8
 utilities/ovs-dpctl-top.8
 utilities/ovs-dpctl.8
 utilities/ovs-kmod-ctl.8
 utilities/ovs-pcap.1
-utilities/ovs-tcpdump.8
-utilities/ovs-tcpundump.1
+debian/tmp/usr/share/man/man8/ovs-tcpdump.8
+debian/tmp/usr/share/man/man1/ovs-tcpundump.1
 utilities/ovs-vsctl.8
 vswitchd/ovs-vswitchd.8
 vswitchd/ovs-vswitchd.conf.db.5
diff --git a/debian/openvswitch-test.manpages b/debian/openvswitch-test.manpages
index 3f71858691..eb3a561d01 100644
--- a/debian/openvswitch-test.manpages
+++ b/debian/openvswitch-test.manpages
@@ -1 +1 @@ 
-utilities/ovs-l3ping.8
+debian/tmp/usr/share/man/man8/ovs-l3ping.8