Fix moving ovs-vswitchd (Closes: #943990).

diff --git a/debian/changelog b/debian/changelog
index d2b6d3870b645b0adf31ad68648fa156fc5e7608..5607a3f2734520e23bb59ac03656ca68646689a8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openvswitch (2.11.0+2019.06.25+git.9ebe795035+ds1-7) unstable; urgency=medium
+
+  * Fix moving ovs-vswitchd (Closes: #943990).
+
+ -- Thomas Goirand <zigo@debian.org>  Sat, 02 Nov 2019 20:01:23 +0100
+
 openvswitch (2.11.0+2019.06.25+git.9ebe795035+ds1-6) unstable; urgency=medium
 
   * Fix again moving /usr/sbin/ovs-vswitchd away.

diff --git a/debian/rules b/debian/rules
index 4aa141b9884fa1f396009600fc76716a7b9e3df6..c3acd28d40ecf43639d44a1a283fa84ff9be11f0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -66,30 +66,30 @@ override_dh_auto_clean:
        set -e ; make python/ovs/version.py && cd python && python3 setup.py clean ; rm -f ovs/version.py ; cd ..
        rm -rf _debian _dpdk
 
-override_dh_auto_install:
+override_dh_auto_install-arch:
        $(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/tmp install
 
-override_dh_install:
-       install -D -m 0644 utilities/ovs-vsctl-bashcomp.bash $(CURDIR)/debian/openvswitch-switch/usr/share/bash-completion/completions/ovs-vsctl
-       dh_install
+       # Move ovs-vswitchd away, so we can use update-alternatives
+       mkdir -p $(CURDIR)/debian/openvswitch-common/usr/lib/openvswitch-common
+       mv $(CURDIR)/debian/tmp/usr/sbin/ovs-vswitchd \
+               $(CURDIR)/debian/openvswitch-common/usr/lib/openvswitch-common/ovs-vswitchd
 
+override_dh_auto_install-indep:
+       $(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/tmp install
        set -e && for pyvers in $(PYTHON3S); do \
                cd python && python$$pyvers setup.py install --install-layout=deb \
                        --root $(CURDIR)/debian/python3-openvswitch; cd ..; \
        done
        rm -rf $(pwd)/debian/python*/usr/lib/python*/dist-packages/*.pth
 
+override_dh_install:
+       install -D -m 0644 utilities/ovs-vsctl-bashcomp.bash $(CURDIR)/debian/openvswitch-switch/usr/share/bash-completion/completions/ovs-vsctl
+       dh_install
+
        rm -f $(CURDIR)/debian/tmp/usr/lib/*/*.la
        dh_installman --language=C
        rm -rf $(CURDIR)/debian/tmp/usr/share/man
 
-       # Move ovs-vswitchd away, so we can use update-alternatives
-       mkdir -p $(CURDIR)/debian/openvswitch-common/usr/lib/openvswitch-common
-ifeq (,$(filter i386 amd64 ppc64el arm64, $(DEB_HOST_ARCH)))
-       mv $(CURDIR)/debian/openvswitch-common/usr/sbin/ovs-vswitchd \
-               $(CURDIR)/debian/openvswitch-common/usr/lib/openvswitch-common/ovs-vswitchd
-endif
-
        dh_missing --fail-missing
        # openvswitch-switch
        mkdir -p debian/openvswitch-switch/usr/share/openvswitch/switch