[Pkg-libvirt-commits] [libvirt] 02/03: Use libnl1

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to branch bpo/wheezy
in repository libvirt.

commit 31a211322c6d9c775bbf5bec89a216dc2c8ae87d
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Sep 17 18:04:21 2013 +0200

    Use libnl1
    
    since libnetcf1 is linked against libnl1 in Wheezy. Also make sure we
    don't pickup up libnetcf-dev using libnl3.
---
 debian/control |    5 ++---
 debian/rules   |    2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 267023e..5b52689 100644
--- a/debian/control
+++ b/debian/control
@@ -28,13 +28,12 @@ Build-Depends:
  module-init-tools [linux-any],
  policykit-1,
  libcap-ng-dev [linux-any],
- libnl-3-dev [linux-any],
- libnl-route-3-dev [linux-any],
+ libnl-dev [linux-any],
  libyajl-dev,
  libpcap0.8-dev,
  libnuma-dev [amd64 i386 ia64 mips mipsel powerpc],
  radvd [linux-any],
- libnetcf-dev (>= 1:0.2.3-3~) [linux-any],
+ libnetcf-dev (<< 1:0.2.0-5~) [linux-any],
  libsanlock-dev [linux-any],
  libaudit-dev [linux-any],
  systemtap-sdt-dev [amd64 armel armhf i386 ia64 powerpc s390],
diff --git a/debian/rules b/debian/rules
index fb28b4b..8609ee4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,6 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
   WITH_UDEV           = --with-udev --without-hal
   WITH_CAPNG          = --with-capng
   WITH_POLKIT         = --with-polkit
-  WITH_MACVTAP        = --with-macvtap
   WITH_NETWORK        = --with-network
   WITH_QEMU           = --with-qemu
   WITH_OPENVZ         = --with-openvz
@@ -47,7 +46,6 @@ else
   WITH_UDEV           = --without-udev --with-hal
   WITH_CAPNG          = --without-capng
   WITH_POLKIT         = --without-polkit
-  WITH_MACVTAP        = --without-macvtap
   WITH_NETWORK        = --without-network
   WITH_QEMU           = --without-qemu
   WITH_LXC            = --without-lxc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git