[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, bpo-lenny, updated. debian/0.8.1-2.bpo50+1

Guido Günther agx at sigxcpu.org
Sat Jun 19 13:31:39 UTC 2010


The following commit has been merged in the bpo-lenny branch:
commit c59547c693ffbffe68960d79b9570cd64aa83538
Merge: 4624567aadd9e81955347dc32932aa16c45a2276 791be4ca5ecc9771fe2877ac9c7ef5edb96f581b
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Jun 16 13:44:16 2010 +0200

    Merge commit 'debian/0.8.1-2' into bpo-lenny
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/rules

diff --combined debian/changelog
index cd512ae,344a874..938742d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,110 +1,116 @@@
+ libvirt (0.8.1-2) unstable; urgency=low
+ 
+   * [41aea79] Drop patchsys-quilt since this package is 3.0 (quilt) now.
+     (Closes: #577919)
+   * [978e3c9] libvirt-bin.init: export PATH. (Closes: #584333)
+   * [e4f0869] virt-xml-validate needs xmllint from libxml2-utils.
+     (Closes: #584869)
+   * [bba6d72] New patch 0008-Fix-leaks-in-udev-device-add-remove.patch:
+     Fix leaks in udev device add/remove. (Closes: #582965) - thanks to
+     Nigel Jones for forwarding this
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Mon, 07 Jun 2010 18:23:47 +0200
+ 
+ libvirt (0.8.1-1) unstable; urgency=low
+ 
+   * [647cbd6] Imported Upstream version 0.8.1
+         * fixes spurious syslog messages (Closes: #565275)
+         * sysfs USB class parsing (Closes: #579208)
+         * virsh honors $VISUAL (Closes: #574415)
+   * [fecd1b9] Update libvirt symbols to 0.8.1
+   * [3e58e0b] Drop patches merged upstream:
+         * 0007-nwfilter-Don-t-crash-if-driverState-NULL.patch
+         * 0008-Ignore-empty-type-statement-in-disk-element.patch
+   * [561ab2e] New patch:
+         * 0007-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch:
+           make qemuMonitorTextGetMigrationStatus to intercept unknown
+           command 'info migrate' (Closes: #574272) - thanks to Andreas Bießmann
+   * [aeda8ea] Enanble macvtap support
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Sun, 09 May 2010 14:25:00 +0200
+ 
+ libvirt (0.8.0-2) unstable; urgency=low
+ 
+   * [70fbcb6] New patch 0007-nwfilter-Don-t-crash-if-driverState- NULL.patch
+     nwfilter: Don't crash if driverState == NULL (Closes: #577728)
+   * [d7d1abd] New patch 0008-Ignore-empty-type-statement-in-disk-
+     element.patch Ignore empty type statement in disk element
+     (Closes: #578347)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Mon, 19 Apr 2010 18:11:57 +0200
+ 
+ libvirt (0.8.0-1) unstable; urgency=low
+ 
+   * Imported Upstream version 0.8.0
+   * Drop patches.
+   * Update libvirt0 symbols.
+   * Switch to new source format 3.0 (quilt).
+ 
+  -- Laurent Léonard <laurent at open-minds.org>  Tue, 13 Apr 2010 20:50:29 +0200
+ 
+ libvirt (0.7.7-4) unstable; urgency=low
+ 
+   [ Guido Günther ]
+   * [cf4919c] Recommend either qemu-kvm or qemu
+ 
+   [ Laurent Léonard ]
+   * [1b12f02] Change libparted1.8-dev build dependency to libparted0- dev.
+     (Closes: #574906)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Mon, 22 Mar 2010 20:50:30 +0100
+ 
+ libvirt (0.7.7-3) unstable; urgency=low
+ 
+   * The "fix all those crashes" release
+   * [f74e13a] Explicitly disable hal (Closes: #574177)
+   * [21ef92b] New patch 0009-security-Set-permissions-for-kernel- initrd.patch
+     security: Set permissions for kernel/initrd (Closes: #574241) - thanks to
+     Cole Robinson
+   * [b69d3cc] Revert "Enable NUMA support" since it breaks the python
+     bindings.
+   * [5f2ca4a] New patch 0010-Don-t-crash-without-a-security-driver.patch Don't
+     crash without a security driver (Closes: #574359)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Wed, 17 Mar 2010 21:05:35 +0100
+ 
+ libvirt (0.7.7-2) unstable; urgency=low
+ 
+   [ Guido Günther ]
+   * [b350683] Enable parallel build
+   * [b2a6aab] Enable NUMA support
+   * [13274cf] New patch 0007-Work-around-broken-linux-socket.h.patch
+     Work around broken linux/socket.h
+ 
+   [ Laurent Léonard ]
+   * [3c12caf] qemu: Fix USB by product with security enabled.
+ 
+  -- Laurent Léonard <laurent at open-minds.org>  Tue, 16 Mar 2010 00:47:34 +0100
+ 
+ libvirt (0.7.7-1) unstable; urgency=low
+ 
+   * [f944460] Imported Upstream version 0.7.7
+   * [bd457cc] Redo patches.
+   * [098d1d3] Update libvirt0 symbols.
+ 
+  -- Laurent Léonard <laurent at open-minds.org>  Fri, 05 Mar 2010 17:49:17 +0100
+ 
+ libvirt (0.7.6-2) unstable; urgency=low
+ 
+   * [72790fc] Drop hal dependency We're using udev for device enumeration.
+   * [ce225c4][11cc6e9] New patch
+     0006-Don-t-drop-caps-when-exec-ing-qemu.patch: Don't drop caps when
+     exec'ing qemu. Instead of disabling libcap-ng better exclude this one exec
+     so we get the additional security for the rest of the calls. Makes
+     interface type="network" work again. (Closes: #565767)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Sun, 14 Feb 2010 18:22:30 +0100
+ 
 +libvirt (0.7.6-1~bpo50+1) lenny-backports; urgency=low
 +
 +  * Rebuild for lenny-backports.
 +
 + -- Guido Günther <agx at sigxcpu.org>  Fri, 12 Feb 2010 09:19:47 +0100
 +
  libvirt (0.7.6-1) unstable; urgency=low
  
    * [0229557] Imported Upstream version 0.7.6
@@@ -201,14 -302,6 +308,14 @@@ libvirt (0.7.0-1) experimental; urgency
  
   -- Guido Günther <agx at sigxcpu.org>  Sun, 09 Aug 2009 13:35:42 +0200
  
 +libvirt (0.6.5-3~bpo50+1) lenny-backports; urgency=low
 +
 +  * Rebuild for lenny-backports.
 +  * [8ec86d5] remove versioned dependency on dpkg-dev - Lenny isn't
 +    affected by this problem.
 +
 + -- Guido Günther <agx at sigxcpu.org>  Wed, 30 Sep 2009 18:22:14 +0200
 +
  libvirt (0.6.5-3) unstable; urgency=low
  
    * [72a8eb6] Add a versioned dependency on dpkg-dev (Closes: #537316)
@@@ -256,12 -349,6 +363,12 @@@ libvirt (0.6.4-1) unstable; urgency=lo
  
   -- Guido Günther <agx at sigxcpu.org>  Thu, 04 Jun 2009 12:50:01 +0200
  
 +libvirt (0.6.3-4~bpo50+1) lenny-backports; urgency=low
 +
 +  * Rebuild for lenny-backports.
 +
 + -- Guido Günther <agx at sigxcpu.org>  Sun, 31 May 2009 21:21:17 +0200
 +
  libvirt (0.6.3-4) unstable; urgency=low
  
    * [3607f2f] Install libvirt_lxc that got list somewhere between our
@@@ -280,12 -367,6 +387,12 @@@ libvirt (0.6.3-3) unstable; urgency=lo
  
   -- Guido Günther <agx at sigxcpu.org>  Tue, 19 May 2009 19:14:57 +0200
  
 +libvirt (0.6.3-2~bpo50+1) lenny-backports; urgency=low
 +
 +  * Rebuild for lenny-backports.
 +
 + -- Guido Günther <agx at sigxcpu.org>  Mon, 11 May 2009 19:51:36 +0200
 +
  libvirt (0.6.3-2) unstable; urgency=low
  
    * [35898d3] fix crash when libvirt_lxc is called without arguments
@@@ -332,12 -413,6 +439,12 @@@ libvirt (0.6.2-1) unstable; urgency=lo
  
   -- Guido Günther <agx at sigxcpu.org>  Thu, 09 Apr 2009 22:48:57 +0200
  
 +libvirt (0.6.1-1~bpo50+1) lenny-backports; urgency=low
 +
 +  * Rebuild for lenny-backports.
 +
 + -- Guido Günther <agx at sigxcpu.org>  Sun, 22 Mar 2009 20:08:55 +0100
 +
  libvirt (0.6.1-1) unstable; urgency=low
  
    * [3be7341] Imported Upstream version 0.6.1
diff --combined debian/control
index 1ca38fc,cafb946..626e721
--- a/debian/control
+++ b/debian/control
@@@ -3,13 -3,16 +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.43), debhelper (>= 5.0.38), libxml2-dev, libncurses5-dev, libreadline5-dev, zlib1g-dev, libgnutls-dev, python-dev (>= 2.3.5-11), python-central (>= 0.5.6), quilt, libavahi-client-dev, libsasl2-dev, libxen-dev [i386 amd64], lvm2, qemu [amd64 i386 powerpc sparc], open-iscsi, libparted1.8-dev, libdevmapper-dev, uuid-dev,
 -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7), libxml2-dev, libncurses5-dev, libreadline-dev, zlib1g-dev, libgnutls-dev, python-dev (>= 2.3.5-11), python-central (>= 0.5.6),
 - libavahi-client-dev, libsasl2-dev, libxen-dev [i386 amd64], lvm2, qemu [amd64 i386 powerpc sparc], open-iscsi, libparted0-dev (>= 2.2), libdevmapper-dev, uuid-dev,
 - libudev-dev,
++Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.38), libxml2-dev, libncurses5-dev, libreadline5-dev, zlib1g-dev, libgnutls-dev, python-dev (>= 2.3.5-11), python-central (>= 0.5.6),
++ libavahi-client-dev, libsasl2-dev, libxen-dev [i386 amd64], lvm2, qemu [amd64 i386 powerpc sparc], open-iscsi, libparted1.8-dev, libdevmapper-dev, uuid-dev,
 + libhal-dev, 
   libpciaccess-dev,
   module-init-tools,
 - policykit-1,
 - dpkg-dev (<< 1.15.3) | dpkg-dev (>> 1.15.3),
 - libcap-ng-dev
 + libpolkit-dbus-dev,
 + libselinux1-dev
  XS-Python-Version: current
 -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
@@@ -18,11 -21,11 +19,11 @@@ DM-Upload-Allowed: ye
  
  Package: libvirt-bin
  Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libvirt0 (= ${binary:Version}), logrotate,
-  hal
- Enhances: qemu, kvm, xen
+ Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libvirt0 (= ${binary:Version}), logrotate
+ Enhances: qemu, qemu-kvm, xen
  Section: admin
- Recommends: netcat-openbsd, bridge-utils, dnsmasq-base (>= 2.46-1), iptables, qemu (>= 0.9.1)
+ Recommends: netcat-openbsd, bridge-utils, dnsmasq-base (>= 2.46-1), iptables, qemu-kvm | qemu (>= 0.9.1),
+  libxml2-utils
  Suggests: policykit-1
  Description: the programs for the libvirt library
   Libvirt is a C toolkit to interact with the virtualization capabilities
diff --combined debian/rules
index b2ac180,159797d..e181cd0
--- a/debian/rules
+++ b/debian/rules
@@@ -1,6 -1,7 +1,7 @@@
  #!/usr/bin/make -f
  
  DEB_PYTHON_SYSTEM = pycentral
+ DEB_BUILD_PARALLEL = yes
  
  ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))
    BUILD_XEN = --with-xen
@@@ -19,7 -20,6 +20,6 @@@ endi
  include /usr/share/cdbs/1/rules/debhelper.mk
  include /usr/share/cdbs/1/class/autotools.mk
  include /usr/share/cdbs/1/class/python-distutils.mk
- include /usr/share/cdbs/1/rules/patchsys-quilt.mk
  
  DEB_CONFIGURE_EXTRA_FLAGS :=     \
  	--disable-rpath          \
@@@ -30,16 -30,19 +30,18 @@@
  	--with-avahi             \
  	--with-sasl              \
  	--with-polkit		 \
 -	--with-udev		 \
 -	--without-hal		 \
 -	--with-storage-fs        \
 -	--with-storage-lvm       \
 -	--with-storage-iscsi     \
 -	--with-storage-disk      \
 +        --with-hal		 \
 +        --with-storage-fs        \
 +        --with-storage-lvm       \
 +        --with-storage-iscsi     \
 +        --with-storage-disk      \
  	--with-init-scripts=none \
  	--without-numactl	 \
  	--without-selinux        \
  	--without-esx		 \
  	--without-libssh2	 \
+ 	--with-capng		 \
+ 	--with-macvtap		 \
  	--enable-debug		 \
  	$(BUILD_XEN)		 \
  	$(BUILD_VBOX)		 \

-- 
Libvirt Debian packaging



More information about the Pkg-libvirt-commits mailing list