Commit 76e2cb71 authored by Laurent Bigonville's avatar Laurent Bigonville Committed by Guido Günther
Browse files

Don't recomend ebtables 

It's part of the iptables package now.

Closes: #918472
parent a6aad2f1

debian/control

+2 −4
Original line number Diff line number Diff line
@@ -69,8 +69,7 @@ Build-Depends: 
 dnsmasq-base,

 openssh-client,

 netcat-openbsd,

 ebtables [linux-any],

 iptables [linux-any],

 iptables (>= 1.8.1-1) [linux-any],

 qemu-utils,

Build-Conflicts: dpkg-dev (= 1.15.3)

Vcs-Git: https://salsa.debian.org/libvirt-team/libvirt.git
@@ -183,13 +182,12 @@ Depends: 
 lsb-base,

 libvirt-clients (= ${binary:Version}),

 libvirt-daemon (= ${binary:Version}),

 iptables (>= 1.4.10) [linux-any] | firewalld,

 iptables (>= 1.8.1-1) [linux-any] | firewalld,

 logrotate,

 policykit-1,

Recommends:

 dmidecode,

 dnsmasq-base (>= 2.46-1),

 ebtables [linux-any],

 iproute2,

 parted,

Section: admin

debian/rules

+3 −0
Original line number Diff line number Diff line
@@ -152,6 +152,9 @@ EXAMPLES_DIR = $(CURDIR)/debian/libvirt-doc/usr/share/doc/libvirt-doc/examples/ 
	dh $@ --builddirectory=$(DEB_BUILDDIR) --parallel --with autoreconf --with systemd



override_dh_auto_configure:

	IPTABLES_PATH=/usr/sbin/iptables \

	IP6TABLES_PATH=/usr/sbin/ip6tables \

	EBTABLES_PATH=/usr/sbin/ebtables \

	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_ARGS) $(shell dpkg-buildflags --export=configure)

	mkdir -p debian/build/docs/internals