[Pkg-libvirt-commits] [SCM] Libvirt debian packaging branch, experimental, updated. debian/0.5.1-1-18-gddb6d13

[Guido Guenther]

The following commit has been merged in the experimental branch:
commit fe96870a63f6ed244f4192a07f042b491b07194f
Merge: 4cd547b4fc9e613ada43f61b508fd875afab0dae dbc4da6ad51d987d98af2c4552bcd45a82a2873d
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Dec 6 10:30:33 2008 +0100

    Merge branch 'master' into merge
    
    Conflicts:
    	debian/changelog
    	debian/patches/series
    	debian/rules

diff --combined debian/changelog
index 81b2574,a6f9098..0e1478c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,28 +1,53 @@@
 +libvirt (0.5.1-1) experimental; urgency=low
 +
 +  * [d76b3a1] Imported Upstream version 0.5.1 (Closes: #507677, #507547)
 +  * [2e550ae] enable hal for device enumeration
 +  * [0d9116a] rotate qemu monitor logs (Closes: #507553) - thanks to
 +    Harald Staub
 +  * [5f85e66] depend on logrotate
 +  * [6e955a3] open qemu monitor O_APPEND instead of O_TRUNC for logrotate
 +  * [7dbea84] drop 0004-xen-prefer-xenstoraged-driver-for-
 +    listDomains.patch - applied upstream
 +
 + -- Guido Günther <agx at sigxcpu.org>  Fri, 05 Dec 2008 09:36:54 +0100
 +
 +libvirt (0.5.0-1) experimental; urgency=low
 +
 +  * [717ef21] Imported Upstream version 0.5.0
 +  * [b7a1fbd] enable OpenVZ support (Closes: #504597) - thanks to Pierre
 +    Chifflier for the patch
 +  * [ee3590a] drop patches, fixed upstream:
 +        * 0004-support-virtio-and-scsi-disks-in-qemudDomainBlockSta.patch
 +        * 0005-fix-define-vs.-defined-typos.patch
 +  * [f4f601f] bump shlibs to 0.5.0
 +
 + -- Guido Günther <agx at sigxcpu.org>  Fri, 28 Nov 2008 16:40:38 +0100
 +
+ libvirt (0.4.6-8) unstable; urgency=low
+ 
+   * [e771da9] drop superflous 0011-Fix-segfault-on-missing-volume-
+     format.patch - not needed.
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Fri, 05 Dec 2008 10:17:01 +0100
+ 
+ libvirt (0.4.6-7) unstable; urgency=low
+ 
+   * [ea12bd9] create /var/run/libvirt fixes /var/run on tmpfs
+     (Closes: #507578)
+   * [97e5706] also look for /usr/bin/kvm (Closes: #507547) 
+   * [311b4c1] increase initial qemu monitor read timeout 
+     (Closes: #499720)
+   * [fbe4e00] open qemu monitor log O_APPEND instead of O_TRUNC
+   * [f8ce017] raise error on invalid volume format
+   * [40edcf8] rotate qemu monitor logs (Closes: #507553) - thanks to
+     Harald Staub
+   * [46ea43a] fix segfault on missing volume format (Closes: #507677) -
+     thanks to Daniel Veillard
+   * [ee377f3] bump shlibs version to 0.4.6
+   * [504d55d] depend on logrotate
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Thu, 04 Dec 2008 17:50:45 +0100
+ 
  libvirt (0.4.6-6) unstable; urgency=low
  
    * [ff8e9ae] README.Debian: clarify xen configuration
diff --combined debian/rules
index 06b47c9,5c6752c..48a062d
--- a/debian/rules
+++ b/debian/rules
@@@ -17,12 -17,11 +17,12 @@@ include /usr/share/cdbs/1/rules/patchsy
  DEB_CONFIGURE_EXTRA_FLAGS :=     \
  	--disable-rpath          \
  	--with-qemu              \
 -	--without-openvz         \
 +	--with-openvz            \
  	--without-lxc            \
  	--with-avahi             \
  	--with-sasl              \
  	--with-polkit		 \
 +        --with-hal		 \
          --with-storage-fs        \
          --with-storage-lvm       \
          --with-storage-iscsi     \
@@@ -35,7 -34,7 +35,7 @@@
  DEB_DBG_PACKAGES = libvirt0-dbg
  DEB_DBG_PACKAGE_libvirt0 = libvirt0-dbg
  DEB_PYTHON_SETUP_CMD := /dev/null
 -DEB_DH_MAKESHLIBS_ARGS_libvirt0 += -V 'libvirt0 (>= 0.4.6)'
 +DEB_DH_MAKESHLIBS_ARGS_libvirt0 += -V 'libvirt0 (>= 0.5.0)'
  DEB_DH_INSTALLINIT_ARGS := --no-restart-on-upgrade
  DEB_DH_INSTALLLOGROTATE_ARGS := --name=libvirtd
  
@@@ -43,4 -42,3 +43,3 @@@ EXAMPLES=debian/libvirt-doc/usr/share/d
  
  binary-install/libvirt-doc::
  	cd $(EXAMPLES) && rm -rf .libs *.o info1 suspend ../html/CVS
- 

-- 
Libvirt debian packaging