debian: Move OVSDB schema and ovsdb-tool to openvswitch-switch.

ovs-vswitchd in the openvswitch-switch package is tightly coupled to its
database schema.  During development, it's possible to change the schema
without changing the Open vSwitch version number, which makes it possible
for the openvswitch-switch and openvswitch-common packages to get out of
sync: openvswitch-switch requires the same version of openvswitch-common,
but if the version number doesn't get updated that has no effect.

Actually putting the schema and ovs-vswitchd (its primary user) in the
same package prevents them from getting out-of-sync.  This commit also
moves ovsdb-tool because that program often works directly with OVSDB
schemas and so there's not much point having it around without a schema to
work with.

diff --git a/debian/openvswitch-common.install b/debian/openvswitch-common.install
index 74487470459c3d3a7d56e230c559da0371f4efba..758c59c2c4744506c9d98341e97dbf2e51d23a08 100644 (file)
--- a/debian/openvswitch-common.install
+++ b/debian/openvswitch-common.install
@@ -4,7 +4,5 @@ usr/bin/ovs-ofctl
 usr/bin/ovs-parse-leaks
 usr/bin/ovs-pki
 usr/bin/ovsdb-client
-usr/bin/ovsdb-tool
 usr/sbin/ovs-bugtool
 usr/share/openvswitch/scripts/ovs-bugtool-tc-class-show
-usr/share/openvswitch/vswitch.ovsschema

diff --git a/debian/openvswitch-switch.install b/debian/openvswitch-switch.install
index 4fa87bdd5ab78f76a3b924c77feecce96db39d42..308c382ade69bb6c270a575a4358ea169694d2ea 100644 (file)
--- a/debian/openvswitch-switch.install
+++ b/debian/openvswitch-switch.install
@@ -3,8 +3,10 @@ usr/bin/ovs-pcap
 usr/bin/ovs-tcpundump
 usr/bin/ovs-vlan-test
 usr/bin/ovs-vsctl
+usr/bin/ovsdb-tool
 usr/sbin/ovs-vswitchd
 usr/sbin/ovsdb-server
 usr/share/openvswitch/scripts/ovs-ctl
 usr/share/openvswitch/scripts/ovs-lib.sh
 usr/share/openvswitch/scripts/ovs-save
+usr/share/openvswitch/vswitch.ovsschema