[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, bpo-squeeze, updated. debian/0.9.11-2-17-g8a2008d

Guido Günther agx at sigxcpu.org
Tue Apr 17 19:17:03 UTC 2012


The following commit has been merged in the bpo-squeeze branch:
commit f5ba10d528942f1e1ad0cc5da4fca49bb1fe863d
Merge: 5540245aee9acb04bc079cf2b3ae41c9cb8f6b81 8c60cd9b5c6b35c726b44ac5056c36488c0dab1c
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Apr 17 14:23:02 2012 +0200

    Merge tag 'debian/0.9.11-2' into bpo-squeeze
    
    Debian release 0.9.11-2
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

diff --combined debian/changelog
index 8442113,c12ebbd..852ae18
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,83 +1,100 @@@
+ libvirt (0.9.11-2) unstable; urgency=low
+ 
+   * [70dcb2e] Make module-init-tools a linux-any dependency
+     (Closes: #667477)
+   * [ea112f4] Depend on dwarves for checks requiring pdwtags
+   * [5152b85] virURIParse: don't forget to copy the user part
+     (Closes: #667636)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Mon, 09 Apr 2012 17:29:46 +0200
+ 
+ libvirt (0.9.11-1) unstable; urgency=low
+ 
+   * Upload to unstable
+   * [34aa61b] New upstream version 0.9.11
+   * [649c570] Build-dependency on virtualbox-ose no longer needed.
+     Thanks to Jean-Baptiste Rouault (Closes: #663589)
+   * [8323080] We need gcrypt so build-depend on it although it's already being
+     pulled in by gnutls. Thanks to Serge Hallyn (Closes: #660018)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Tue, 03 Apr 2012 20:18:08 +0200
+ 
+ libvirt (0.9.11~rc1-1) experimental; urgency=low
+ 
+   * [b8ad28b] Build-dependency on virtualbox-ose no longer needed.
+     Thanks to Jean-Baptiste Rouault (Closes: #663589)
+   * [049b63b] New upstream version 0.9.11~rc1
+   * [deacbc5] Update symbols file
+   * [697838f] Update Debianize-libvirt-guests.patch
+     with new config option PARALLEL_SHUTDOWN
+   * [ba62183] Bump standards version (no changes)
+   * [bece9d3] Install missing manpages
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Mon, 26 Mar 2012 21:35:21 +0200
+ 
+ libvirt (0.9.10-2) unstable; urgency=low
+ 
+   * Upload to unstable
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Wed, 22 Feb 2012 13:42:23 +0100
+ 
+ libvirt (0.9.10-1) experimental; urgency=low
+ 
+   * [63a7e8c] New upstream version 0.9.10
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Wed, 15 Feb 2012 09:05:27 +0100
+ 
+ libvirt (0.9.10~rc1-1) experimental; urgency=low
+ 
+   * Upload to experimental
+   * [8f97b0f] New upstream version 0.9.10~rc1
+   * [7636706] Update symbols
+   * [8d776a5] Drop xen-Don-t-crash-when-we-fail-to-init-caps.patch applied
+     upstream.
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Tue, 07 Feb 2012 19:47:45 +0100
+ 
+ libvirt (0.9.9-3) unstable; urgency=low
+ 
+   * Upload to unstable
+   * [367b47b] Enable netcf support (Closes: #567606)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Sun, 05 Feb 2012 14:10:07 +0100
+ 
+ libvirt (0.9.9-2) experimental; urgency=low
+ 
+   * [97182f9] Don't fail if we can't setup avahi. We'd need to make this a
+     hard dependency otherwise.
+   * [bf94bbd] xen: Don't crash when we fail to init caps (Closes: #656075)
+   * [56f2dbc] Cleanup /var/log/libvirt on purge (Closes: #656460)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Fri, 03 Feb 2012 17:45:12 +0100
+ 
+ libvirt (0.9.9-1) experimental; urgency=low
+ 
+   * [dd5f96f] New upstream version 0.9.9
+   * [623022f] Rebase patches
+   * [77eb5a4] Update symbols file
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Tue, 10 Jan 2012 13:40:41 +0100
+ 
 +libvirt (0.9.8-2~bpo60+2) squeeze-backports; urgency=low
 +
 +  * [69fd64c] Don't fail if we can't setup avahi otherwise we'd
 +    have to make avahi a hard dependency.
 +
 + -- Guido Günther <agx at sigxcpu.org>  Sat, 14 Jan 2012 21:02:16 +0100
 +
 +libvirt (0.9.8-2~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * [82758c4] Use dh_pycentral on Squeez
 +  * [e9ebaaf] Use XS-Python-Version instead of X-Python-Version
 +    since we still use dh_pycentral
 +  * [c754689] Disable the testsuite for backport builds
 +
 + -- Guido Günther <agx at sigxcpu.org>  Tue, 10 Jan 2012 20:16:01 +0100
 +
  libvirt (0.9.8-2) unstable; urgency=low
  
    * Upload to unstable. Works with qemu-kvm and qemu 1.0.
@@@ -117,13 -180,6 +197,13 @@@ libvirt (0.9.6-2) unstable; urgency=lo
  
   -- Guido Günther <agx at sigxcpu.org>  Sun, 30 Oct 2011 17:14:21 +0100
  
 +libvirt (0.9.6-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * [82758c4] Use dh_pycentral on Squeeze since there's no dh_python2 yet.
 +
 + -- Guido Günther <agx at sigxcpu.org>  Tue, 04 Oct 2011 14:57:07 +0200
 +
  libvirt (0.9.6-1) unstable; urgency=low
  
    * [828e4e3] New upstream version 0.9.6
@@@ -226,21 -282,6 +306,21 @@@ libvirt (0.9.3-1) experimental; urgency
  
   -- Guido Günther <agx at sigxcpu.org>  Sun, 10 Jul 2011 19:43:05 +0200
  
 +libvirt (0.9.2-7~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * Remaining changes
 +      * use python-central on squeeze
 +
 + -- Guido Günther <agx at sigxcpu.org>  Thu, 14 Jul 2011 18:43:41 +0200
 +
 +libvirt (0.9.2-7) unstable; urgency=low
 +
 +  * [9c99f46] CVE-2011-2511: Fix integer overflow in VirDomainGetVcpus. Patch
 +    taken verbatim from upstream's git. (Closes: #633630)
 +
 + -- Guido Günther <agx at sigxcpu.org>  Tue, 12 Jul 2011 15:07:39 +0200
 +
  libvirt (0.9.2-6) unstable; urgency=low
  
    * [b385504] Disable the testsuite on all architectures except i386 and amd64
@@@ -320,14 -361,6 +400,14 @@@ libvirt (0.9.0-2) unstable; urgency=lo
  
   -- Guido Günther <agx at sigxcpu.org>  Mon, 09 May 2011 17:14:02 +0200
  
 +libvirt (0.9.0-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * [82758c4] Use dh_pycentral on Squeeze
 +    since there's no dh_python2 yet.
 +
 + -- Guido Günther <agx at sigxcpu.org>  Mon, 09 May 2011 18:41:55 +0200
 +
  libvirt (0.9.0-1) unstable; urgency=low
  
    * [a91c8f6] New upstream version 0.9.0
diff --combined debian/control
index 35ef059,6092f86..de7af8a
--- a/debian/control
+++ b/debian/control
@@@ -3,13 -3,13 +3,14 @@@ Section: lib
  Priority: optional
  Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.debian.org>
  Uploaders: Guido Günther <agx at sigxcpu.org>, Laurent Léonard <laurent at open-minds.org>
 -Build-Depends: cdbs (>= 0.4.90~),
 +Build-Depends: cdbs (>= 0.4.89~),
 + python-central,
   debhelper (>= 7),
   libxml2-dev,
   libncurses5-dev,
   libreadline-dev,
   zlib1g-dev,
+  libgcrypt11-dev,
   libgnutls-dev,
   python-all-dev (>= 2.6.6-3~),
   libavahi-client-dev,
@@@ -24,16 -24,17 +25,17 @@@
   libudev-dev [linux-any],
   libhal-dev [!linux-any],
   libpciaccess-dev,
-  module-init-tools,
+  module-init-tools [linux-any],
   policykit-1,
   libcap-ng-dev [linux-any],
-  virtualbox-ose [amd64 i386],
   libnl-dev [linux-any],
   libyajl-dev,
   libpcap0.8-dev,
   libnuma-dev [amd64 i386 ia64 mips mipsel powerpc],
   radvd [linux-any],
+  libnetcf-dev [linux-any],
  # For "make check"
+  dwarves,
   libxml2-utils,
   dnsmasq-base,
   openssh-client,
@@@ -42,9 -43,9 +44,9 @@@ Build-Conflicts: dpkg-dev (= 1.15.3
  Vcs-Git: git://git.debian.org/git/pkg-libvirt/libvirt.git
  Vcs-Browser: http://git.debian.org/?p=pkg-libvirt/libvirt.git
  Homepage: http://libvirt.org
- Standards-Version: 3.9.2
+ Standards-Version: 3.9.3
  DM-Upload-Allowed: yes
 -X-Python-Version: >= 2.6
 +XS-Python-Version: >= 2.6
  
  Package: libvirt-bin
  Architecture: any
@@@ -127,7 -128,6 +129,7 @@@ Depends: ${shlibs:Depends}, ${misc:Depe
  Provides: ${python:Provides}
  Recommends: libvirt-bin
  Section: python
 +XB-Python-Version: ${python:Versions}
  Description: libvirt Python bindings
   Libvirt is a C toolkit to interact with the virtualization capabilities
   of recent versions of Linux (and other OSes). The library aims at providing
diff --combined debian/rules
index 38bd71d,8127900..521701d
--- a/debian/rules
+++ b/debian/rules
@@@ -1,6 -1,5 +1,6 @@@
  #!/usr/bin/make -f
  
 +DEB_PYTHON_SYSTEM = pycentral
  DEB_BUILD_PARALLEL = yes
  export VIR_TEST_DEBUG=1
  
@@@ -9,6 -8,7 +9,6 @@@ include /usr/share/cdbs/1/class/autotoo
  include /usr/share/cdbs/1/class/python-distutils.mk
  
  ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))
 -  DEB_MAKE_CHECK_TARGET = check
    WITH_XEN = --with-xen
    WITH_VBOX = --with-vbox
  else
@@@ -27,6 -27,7 +27,7 @@@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS
    WITH_NETWORK        = --with-network
    WITH_QEMU           = --with-qemu
    WITH_OPENVZ         = --with-openvz
+   WITH_NETCF          = --with-netcf
    ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 i386 ia64 mips mipsel powerpc))
        WITH_NUMA       = --with-numactl
    else
@@@ -49,6 -50,7 +50,7 @@@ els
    WITH_QEMU           = --without-qemu
    WITH_LXC            = --without-lxc
    WITH_NUMA           = --without-numactl
+   WITH_NETCF          = --without-netcf
  endif
  
  DEB_BUILDDIR := $(CURDIR)/debian/build
@@@ -76,7 -78,7 +78,7 @@@ DEB_CONFIGURE_EXTRA_FLAGS :=     
  	--enable-debug		 \
  	$(WITH_MACVTAP)		 \
  	$(WITH_NETWORK)		 \
- 	--without-netcf		 \
+ 	$(WITH_NETCF)		 \
  	$(WITH_XEN)		 \
  	$(WITH_VBOX)		 \
  	$(WITH_LXC)

-- 
Libvirt Debian packaging



More information about the Pkg-libvirt-commits mailing list