Originally I intended this as just a cleanup, but as a side effect it also
installs some files from the install tree in debian/tmp instead of from
_debian. This should avoid a reported problem in which ovs-bugtool was
being created in the source directory instead of the build directory (I
still don't see why this happened).
Reported-by: Sébastien RICCIO <sr@swisscenter.com>
Tested-by: Sébastien RICCIO <sr@swisscenter.com>
Acked-by: Simon Horman <horms@verge.net.au>
CC: Simon Horman <horms@verge.net.au>
Roger Leigh rleigh@codelibre.net
Sean Brady sbrady@gtfservices.com
Sebastian Andrzej Siewior sebastian@breakpoint.cc
Roger Leigh rleigh@codelibre.net
Sean Brady sbrady@gtfservices.com
Sebastian Andrzej Siewior sebastian@breakpoint.cc
+Sébastien RICCIO sr@swisscenter.com
Srini Seetharaman seethara@stanford.edu
Stephen Hemminger shemminger@vyatta.com
Takayuki HAMA t-hama@cb.jp.nec.com
Srini Seetharaman seethara@stanford.edu
Stephen Hemminger shemminger@vyatta.com
Takayuki HAMA t-hama@cb.jp.nec.com
/openvswitch-switch.copyright
/ovsdbmonitor
/python-openvswitch
/openvswitch-switch.copyright
/ovsdbmonitor
/python-openvswitch
-_debian/ovsdb/ovsdb-client usr/bin
-_debian/ovsdb/ovsdb-tool usr/bin
-_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/openvswitch/etc/openvswitch/bugtool-plugins etc/openvswitch
-debian/openvswitch/usr/share/openvswitch/scripts/ovs-bugtool-tc-class-show usr/share/openvswitch/scripts/ovs-bugtool-tc-class-show
-_debian/utilities/bugtool/ovs-bugtool usr/sbin
-vswitchd/vswitch.ovsschema usr/share/openvswitch
+etc/openvswitch/bugtool-plugins
+usr/bin/ovs-appctl
+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
-_debian/utilities/ovs-controller usr/sbin
-_debian/ovsdb/ovsdb-server usr/bin
-_debian/utilities/ovs-dpctl usr/sbin
-_debian/utilities/ovs-ctl usr/share/openvswitch/scripts
-_debian/utilities/ovs-lib.sh usr/share/openvswitch/scripts
-_debian/utilities/ovs-vsctl usr/sbin
-_debian/utilities/ovs-pcap usr/bin
-_debian/utilities/ovs-tcpundump usr/bin
-_debian/utilities/ovs-vlan-test usr/bin
-_debian/vswitchd/ovs-vswitchd usr/sbin
-utilities/ovs-save usr/share/openvswitch/scripts
+usr/bin/ovs-dpctl
+usr/bin/ovs-pcap
+usr/bin/ovs-tcpundump
+usr/bin/ovs-vlan-test
+usr/bin/ovs-vsctl
+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
install-indep: build-indep
dh_testdir
dh_testroot
install-indep: build-indep
dh_testdir
dh_testroot
dh_installdirs -i
dh_install -i
sed 's/^BUILD_NUMBER = .*/BUILD_NUMBER = $(BUILD_NUMBER)/' \
dh_installdirs -i
dh_install -i
sed 's/^BUILD_NUMBER = .*/BUILD_NUMBER = $(BUILD_NUMBER)/' \
install-arch: build-arch
dh_testdir
dh_testroot
install-arch: build-arch
dh_testdir
dh_testroot
- $(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/openvswitch install
+ $(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/tmp install
cp debian/openvswitch-switch.template debian/openvswitch-switch/usr/share/openvswitch/switch/default.template
dh_install -s
cp debian/openvswitch-switch.template debian/openvswitch-switch/usr/share/openvswitch/switch/default.template
dh_install -s