[Pkg-libvirt-commits] [SCM] Libvirt debian packaging branch, master, updated. debian/0.6.1-1

[Guido Günther]

The following commit has been merged in the master branch:
commit 895daee9089c9efea479e504461717fe84155545
Merge: 873761879a54257bfa5693b1beebd4a9728eb330 d6e79a078de7eca3cbdb5f78093943743198a0b0
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Mar 5 11:20:51 2009 +0100

    Merge branch 'experimental'
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

diff --combined debian/changelog
index a301017,6c16ee5..22d087e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,20 +1,41 @@@
+ libvirt (0.6.0-1) experimental; urgency=low
+ 
+   * [30be86d] Imported Upstream version 0.6.0
+   * [179781c] drop patches
+           * fixed upstream:
+                 0006-Fix-missing-read-only-access-checks-CVE-2008-5086.patch
+           * applied upstream:
+                 0004-Open-qemu-monitor-log-O_APPEND-instead-of-O_TRUNC.patch
+                 0005-qemu-fix-parallel-serial-mode-tcp-and-unix.patch
+                 0007-don-t-fail-on-missing-locales.patch
+   * [d80a176] adjust remaining patches to new upstream version
+   * [208c924] add minimal workaround for qemu startup race
+   * [6e8caa0] restart libvirt daemon on upgrades if possible 
+     (Closes: #492694, #499008)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Thu, 05 Feb 2009 18:40:10 +0100
+ 
 +libvirt (0.5.1-7) unstable; urgency=low
 +
 +  * [1238706] Recommend dnsmasq-base instead of dnsmasq this keeps us
 +    out of all the dnsmasq already running troubles. (Closes: #516443) -
 +    thanks to Bin Zhang for the suggestion and the doc update
 +  * [5c9dfd7] don't rotate empty logfiles (Closes: #517040)
 +  * [1c9a023] libvirt_proxy: Fix use of uninitalized memory We currently
 +    don't build this code (CVE-2009-0036).
 +  * [4ea1ea9] fix path to hvmloader (Closes: #517059)
 +  * [879b632] suggest devhelp
 +  * [f22f1ef] add ${misc:Depends}
 +  * [c6f579e] README.Debian: fix typo
 +
 + -- Guido Günther <agx at sigxcpu.org>  Thu, 26 Feb 2009 14:45:32 +0100
 +
 +libvirt (0.5.1-6) unstable; urgency=low
 +
 +  * upload to unstable
 +
 + -- Guido Günther <agx at sigxcpu.org>  Mon, 16 Feb 2009 21:27:21 +0100
 +
  libvirt (0.5.1-5) experimental; urgency=low
  
    * [d4a69d1] don't fail on missing locales (Closes: #512721)
@@@ -79,12 -75,6 +96,12 @@@ libvirt (0.5.0-1) experimental; urgency
  
   -- Guido Günther <agx at sigxcpu.org>  Fri, 28 Nov 2008 16:40:38 +0100
  
 +libvirt (0.4.6-10) unstable; urgency=low
 +
 +  * [5878698] cherry-pick patch for CVE-2008-5086 from experimental
 +
 + -- Guido Günther <agx at sigxcpu.org>  Thu, 18 Dec 2008 16:59:45 +0100
 +
  libvirt (0.4.6-9) unstable; urgency=low
  
    * [d30438c] create libvirt log directory (Closes: #508129)
diff --combined debian/patches/series
index e226952,883f889..ef59db7
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,10 -1,5 +1,7 @@@
  0001-remove-RHism.diff.patch
  0002-qemu-disable-network.diff.patch
  0003-allow-libvirt-group-to-access-the-socket.patch
- 0004-Open-qemu-monitor-log-O_APPEND-instead-of-O_TRUNC.patch
- 0005-qemu-fix-parallel-serial-mode-tcp-and-unix.patch
- 0006-Fix-missing-read-only-access-checks-CVE-2008-5086.patch
- 0007-don-t-fail-on-missing-locales.patch
- 0008-Don-t-hardcode-ssh-port.patch
+ 0004-Don-t-hardcode-ssh-port.patch
+ 0005-minimal-workaround-for-qemu-startup-race.patch
 +0009-libvirt_proxy-Fix-use-of-uninitalized-memory.patch
 +0010-fix-Debian-specific-path-to-hvm-loader.patch

-- 
Libvirt debian packaging