diff -Nru libvirt-0.9.7/debian/changelog libvirt-0.9.7/debian/changelog --- libvirt-0.9.7/debian/changelog 2011-12-07 17:30:23.000000000 +0100 +++ libvirt-0.9.7/debian/changelog 2011-12-25 21:50:20.000000000 +0100 @@ -1,3 +1,10 @@ +libvirt (0.9.7-2ubuntu8) precise; urgency=low + + * Build-Depend on libnl-3-dev. (LP: #908581) + * Update libnl3 patch to also pass NL_LIBS and CFLAGS in the LXC target. + + -- Andreas Moog Sun, 25 Dec 2011 21:31:33 +0100 + libvirt (0.9.7-2ubuntu7) precise; urgency=low * Fix default network autostart symlink disappearing on upgrade (LP: #901298) diff -Nru libvirt-0.9.7/debian/control libvirt-0.9.7/debian/control --- libvirt-0.9.7/debian/control 2011-12-02 19:38:56.000000000 +0100 +++ libvirt-0.9.7/debian/control 2011-12-25 21:32:01.000000000 +0100 @@ -27,7 +27,7 @@ module-init-tools, policykit-1, libcap-ng-dev [linux-any], - libnl3-dev, + libnl-3-dev, libyajl-dev, libpcap0.8-dev, radvd, diff -Nru libvirt-0.9.7/debian/patches/ubuntu/libnl3.patch libvirt-0.9.7/debian/patches/ubuntu/libnl3.patch --- libvirt-0.9.7/debian/patches/ubuntu/libnl3.patch 2011-11-16 14:38:50.000000000 +0100 +++ libvirt-0.9.7/debian/patches/ubuntu/libnl3.patch 2011-12-25 21:30:50.000000000 +0100 @@ -1,7 +1,7 @@ Index: libvirt-0.9.7/configure =================================================================== ---- libvirt-0.9.7.orig/configure 2011-11-08 00:53:45.000000000 -0600 -+++ libvirt-0.9.7/configure 2011-11-16 07:38:46.364557529 -0600 +--- libvirt-0.9.7.orig/configure 2011-11-08 07:53:45.000000000 +0100 ++++ libvirt-0.9.7/configure 2011-12-25 12:56:40.397491622 +0100 @@ -59198,12 +59198,12 @@ pkg_cv_LIBNL_CFLAGS="$LIBNL_CFLAGS" elif test -n "$PKG_CONFIG"; then @@ -48,8 +48,8 @@ echo "$LIBNL_PKG_ERRORS" >&5 Index: libvirt-0.9.7/configure.ac =================================================================== ---- libvirt-0.9.7.orig/configure.ac 2011-11-08 00:30:57.000000000 -0600 -+++ libvirt-0.9.7/configure.ac 2011-11-16 07:38:46.376557527 -0600 +--- libvirt-0.9.7.orig/configure.ac 2011-11-08 07:30:57.000000000 +0100 ++++ libvirt-0.9.7/configure.ac 2011-12-25 12:56:40.389491622 +0100 @@ -2432,7 +2432,7 @@ have_libnl=no @@ -61,8 +61,8 @@ ], [ Index: libvirt-0.9.7/src/util/netlink.c =================================================================== ---- libvirt-0.9.7.orig/src/util/netlink.c 2011-06-24 02:21:07.000000000 -0500 -+++ libvirt-0.9.7/src/util/netlink.c 2011-11-16 07:38:46.392557528 -0600 +--- libvirt-0.9.7.orig/src/util/netlink.c 2011-06-24 09:21:07.000000000 +0200 ++++ libvirt-0.9.7/src/util/netlink.c 2011-12-25 12:46:04.000000000 +0100 @@ -74,15 +74,15 @@ int fd; int n; @@ -119,3 +119,40 @@ return rc; } +Index: libvirt-0.9.7/src/Makefile.am +=================================================================== +--- libvirt-0.9.7.orig/src/Makefile.am 2011-12-25 12:46:04.000000000 +0100 ++++ libvirt-0.9.7/src/Makefile.am 2011-12-25 12:57:24.753491586 +0100 +@@ -1481,8 +1481,8 @@ + $(SECRET_CONF_SOURCES) \ + $(CPU_CONF_SOURCES) \ + $(NWFILTER_PARAM_CONF_SOURCES) +-libvirt_lxc_LDFLAGS = $(WARN_CFLAGS) $(AM_LDFLAGS) +-libvirt_lxc_LDADD = $(CAPNG_LIBS) $(YAJL_LIBS) \ ++libvirt_lxc_LDFLAGS = $(WARN_CFLAGS) $(AM_LDFLAGS) $(LIBNL_CFLAGS) ++libvirt_lxc_LDADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBVIRT_LIBS) \ + $(LIBXML_LIBS) $(NUMACTL_LIBS) $(THREAD_LIBS) \ + $(LIBNL_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ + ../gnulib/lib/libgnu.la +Index: libvirt-0.9.7/src/Makefile.in +=================================================================== +--- libvirt-0.9.7.orig/src/Makefile.in 2011-12-25 12:46:04.000000000 +0100 ++++ libvirt-0.9.7/src/Makefile.in 2011-12-25 12:57:03.017491606 +0100 +@@ -3419,7 +3419,7 @@ + @WITH_LIBVIRTD_TRUE@@WITH_LXC_TRUE@libvirt_lxc_LDADD = $(CAPNG_LIBS) \ + @WITH_LIBVIRTD_TRUE@@WITH_LXC_TRUE@ $(YAJL_LIBS) $(LIBXML_LIBS) \ + @WITH_LIBVIRTD_TRUE@@WITH_LXC_TRUE@ $(NUMACTL_LIBS) \ +-@WITH_LIBVIRTD_TRUE@@WITH_LXC_TRUE@ $(THREAD_LIBS) \ ++@WITH_LIBVIRTD_TRUE@@WITH_LXC_TRUE@ $(THREAD_LIBS) $(LIBNL_LIBS) \ + @WITH_LIBVIRTD_TRUE@@WITH_LXC_TRUE@ $(LIBNL_LIBS) $(AUDIT_LIBS) \ + @WITH_LIBVIRTD_TRUE@@WITH_LXC_TRUE@ $(DEVMAPPER_LIBS) \ + @WITH_LIBVIRTD_TRUE@@WITH_LXC_TRUE@ ../gnulib/lib/libgnu.la \ +@@ -3429,7 +3429,7 @@ + @WITH_LIBVIRTD_TRUE@@WITH_LXC_TRUE@ $(LIBPARTED_CFLAGS) \ + @WITH_LIBVIRTD_TRUE@@WITH_LXC_TRUE@ $(NUMACTL_CFLAGS) \ + @WITH_LIBVIRTD_TRUE@@WITH_LXC_TRUE@ $(CAPNG_CFLAGS) \ +-@WITH_LIBVIRTD_TRUE@@WITH_LXC_TRUE@ $(YAJL_CFLAGS) \ ++@WITH_LIBVIRTD_TRUE@@WITH_LXC_TRUE@ $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ + @WITH_LIBVIRTD_TRUE@@WITH_LXC_TRUE@ $(AUDIT_CFLAGS) \ + @WITH_LIBVIRTD_TRUE@@WITH_LXC_TRUE@ -I@top_srcdir@/src/conf \ + @WITH_LIBVIRTD_TRUE@@WITH_LXC_TRUE@ $(AM_CFLAGS) \