remove wireshark support - #880428

2 files changed, 1 insertions, 18 deletions

diff --git a/debian/control b/debian/control
index e51a48813..5f75e9360 100644
--- a/debian/control
+++ b/debian/control
@@ -55,8 +55,6 @@ Build-Depends:
  librados-dev [linux-any],
 # for --with-storage-gluster
  glusterfs-common (>= 3.4.0),
-# for --with-wireshark-dissector
- libwireshark-dev (>= 1.11.3),
 # for lxc fuse support
  libfuse-dev [linux-any],
 # for libssh2 connection URIs
@@ -295,17 +293,3 @@ Description: nss plugin providing IP add ress resolution for virtual machines
  This package contains the nss plugin for IP address resolution of libvirt
  managed virtual machines.
 
-Package: libvirt-wireshark
-Architecture: any
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
-Priority: optional
-Description: Wireshark dissector for the libvirt protocol
- Libvirt is a C toolkit to interact with the virtualization capabilities
- of recent versions of Linux (and other OSes). The library aims at providing
- a long term stable C API for different virtualization mechanisms. It currently
- supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox.
- .
- This package contains the wireshark dissector.
-
diff --git a/debian/rules b/debian/rules
index a2f277a36..59efba609 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,7 +132,7 @@ DEB_CONFIGURE_EXTRA_ARGS :=      \
 	$(WITH_FIREWALLD)        \
 	--without-attr           \
 	$(WITH_NSS_PLUGIN)       \
-        --with-wireshark-dissector \
+        --without-wireshark-dissector \
         $(NULL)
 
 LIBVIRT_SYSTEM_SERVICES = \
@@ -212,7 +212,6 @@ endif
 
 	# Don't ship any la files
 	rm debian/libvirt-daemon/usr/lib/libvirt/connection-driver/*.la
-	rm debian/libvirt-wireshark/usr/lib/*/wireshark/plugins/*/*.la
 	# Don't ship any files that are managed by the user only
 	rm debian/libvirt-daemon-system/etc/apparmor.d/local/*
 	# Don't ship api files in the daemon package