ovs-bugtool: Make available outside of Debian packages.

ovs-bugtool is no longer Debian-specific, so install it everywhere.  (On
XenServer, specifically, we do not install it, because there xen-bugtool
already exists.)

9 files changed, 11 insertions, 6 deletions

diff --git a/debian/automake.mk b/debian/automake.mk
index 74ff5fc2..26db1cb5 100644
--- a/debian/automake.mk
+++ b/debian/automake.mk
@@ -36,8 +36,6 @@ EXTRA_DIST += \
 	debian/openvswitch-switch.template \
 	debian/ovsdbmonitor.install \
 	debian/ovsdbmonitor.manpages \
-	debian/ovs-bugtool \
-	debian/ovs-bugtool.8 \
 	debian/ovs-monitor-ipsec \
 	debian/python-openvswitch.dirs \
 	debian/python-openvswitch.install \
diff --git a/debian/copyright.in b/debian/copyright.in
index 354ab804..2f2cc48b 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -8,7 +8,7 @@ Upstream Authors (from AUTHORS):
 
 Upstream Copyright Holders:
 
-	Copyright (c) 2007, 2008, 2009, 2010 Nicira Networks.
+	Copyright (c) 2007, 2008, 2009, 2010, 2011 Nicira Networks.
 	Copyright (c) 2010 Jean Tourrilhes - HP-Labs.
 	Copyright (c) 2008,2009,2010 Citrix Systems, Inc.
 	and authors listed above.
@@ -52,7 +52,7 @@ License:
 * The following components are licensed under the
   GNU Lesser General Public Licence version 2.1.
 
-	debian/ovs-bugtool
+	utilities/ovs-bugtool
 	xenserver/etc_xensource_bugtool_kernel-info_openvswitch.xml [*]
 	xenserver/etc_xensource_bugtool_network-status_openvswitch.xml [*]
 	xenserver/etc_xensource_bugtool_system-configuration.xml [*]
diff --git a/debian/openvswitch-common.install b/debian/openvswitch-common.install
index 1733612a..43434eeb 100644
--- a/debian/openvswitch-common.install
+++ b/debian/openvswitch-common.install
@@ -4,6 +4,5 @@ _debian/utilities/ovs-appctl usr/sbin
 _debian/utilities/ovs-ofctl usr/sbin
 _debian/utilities/ovs-parse-leaks usr/bin
 _debian/utilities/ovs-pki usr/sbin
-debian/ovs-bugtool usr/sbin
-debian/ovs-bugtool.8 usr/share/man/man8
+utilities/ovs-bugtool usr/sbin
 vswitchd/vswitch.ovsschema usr/share/openvswitch
diff --git a/debian/openvswitch-common.manpages b/debian/openvswitch-common.manpages
index 8f7e64df..a5d5b253 100644
--- a/debian/openvswitch-common.manpages
+++ b/debian/openvswitch-common.manpages
@@ -3,4 +3,5 @@ _debian/ovsdb/ovsdb-tool.1
 _debian/utilities/ovs-appctl.8
 _debian/utilities/ovs-ofctl.8
 _debian/utilities/ovs-pki.8
+utilities/ovs-bugtool.8
 utilities/ovs-parse-leaks.8
diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in
index d6437454..bdedb9cd 100644
--- a/rhel/openvswitch.spec.in
+++ b/rhel/openvswitch.spec.in
@@ -111,6 +111,7 @@ exit 0
 /usr/bin/ovsdb-client
 /usr/bin/ovsdb-tool
 /usr/sbin/ovs-brcompatd
+/usr/sbin/ovs-bugtool
 /usr/sbin/ovs-vswitchd
 /usr/sbin/ovsdb-server
 /usr/share/man/man1/ovs-pcap.1.gz
diff --git a/utilities/automake.mk b/utilities/automake.mk
index 69cc5d24..8bea123e 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -7,15 +7,19 @@ bin_PROGRAMS += \
 bin_SCRIPTS += utilities/ovs-pki utilities/ovs-vsctl
 if HAVE_PYTHON
 bin_SCRIPTS += \
+	utilities/ovs-bugtool \
 	utilities/ovs-pcap \
 	utilities/ovs-tcpundump \
 	utilities/ovs-vlan-test
+man_MANS += utilities/ovs-bugtool.8
 endif
 noinst_SCRIPTS += utilities/ovs-pki-cgi utilities/ovs-parse-leaks
 scripts_SCRIPTS += utilities/ovs-ctl utilities/ovs-lib.sh utilities/ovs-save
 
 EXTRA_DIST += \
 	utilities/ovs-appctl.8.in \
+	utilities/ovs-bugtool \
+	utilities/ovs-bugtool.8 \
 	utilities/ovs-controller.8.in \
 	utilities/ovs-ctl.in \
 	utilities/ovs-dpctl.8.in \
diff --git a/debian/ovs-bugtool b/utilities/ovs-bugtool
index 4f0038e4..4f0038e4 100755
--- a/debian/ovs-bugtool
+++ b/utilities/ovs-bugtool
diff --git a/debian/ovs-bugtool.8 b/utilities/ovs-bugtool.8
index 6755d6ad..6755d6ad 100644
--- a/debian/ovs-bugtool.8
+++ b/utilities/ovs-bugtool.8
diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec
index f9d7464b..77afeb2d 100644
--- a/xenserver/openvswitch-xen.spec
+++ b/xenserver/openvswitch-xen.spec
@@ -121,8 +121,10 @@ install xenserver/uuid.py $RPM_BUILD_ROOT/usr/share/openvswitch/python
 
 # Get rid of stuff we don't want to make RPM happy.
 rm \
+    $RPM_BUILD_ROOT/usr/bin/ovs-bugtool \
     $RPM_BUILD_ROOT/usr/bin/ovs-controller \
     $RPM_BUILD_ROOT/usr/bin/ovs-pki \
+    $RPM_BUILD_ROOT/usr/share/man/man8/ovs-bugtool.8 \
     $RPM_BUILD_ROOT/usr/share/man/man8/ovs-controller.8 \
     $RPM_BUILD_ROOT/usr/share/man/man8/ovs-pki.8