[Pkg-libvirt-commits] [libvirt] 01/04: Merge tag 'debian/1.2.9-6' into bpo/wheezy

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1.2.9-7_bpo70+1
in repository libvirt.

commit 9bf2004721cf8fbd501368b5a7ce3b531b3c3b6c
Merge: 1df8a8e 5c6cf50
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Nov 30 18:55:14 2014 +0100

    Merge tag 'debian/1.2.9-6' into bpo/wheezy
    
    libvirt Debian release 1.2.9-6
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog                                   | 35 ++++++++++++
 debian/control                                     |  7 +++
 debian/libvirt-daemon-system.postrm                | 17 +++---
 ...llow-libxl-to-find-default-path-to-pygrub.patch | 24 ++++++++
 ...23-dumpxml-security-hole-with-migratable-.patch | 64 ++++++++++++++++++++++
 debian/patches/series                              |  3 +
 ...-Prepare-URI-formatting-for-libxml2-2.9.2.patch | 44 +++++++++++++++
 7 files changed, 186 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index f1c4f49,b4f25d7..28182f6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,38 +1,55 @@@
+ libvirt (1.2.9-6) unstable; urgency=medium
+ 
+   * [9779548] Add a python build-dependency for the docs build
+     (Closes: #770775)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Sun, 23 Nov 2014 18:47:42 +0100
+ 
+ libvirt (1.2.9-5) unstable; urgency=medium
+ 
+   [ Guido Günther ]
+   * [5c47e64] Pre-Depend on init-system-helpers.
+     Thanks to intrigeri and Bastien ROUCARIES (Closes: #769551, #766362)
+   * [9aa75f7] util: Prepare URI formatting for libxml2 >= 2.9.2
+     (Closes: #769653)
+ 
+   [ Ian Campbell ]
+   * [bfe835f] Specify "pygrub" by default for libxl backend guests.
+     Using an absolute path prevents libxl from providing the correct
+     default. (Closes: #770485)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Sun, 23 Nov 2014 14:57:13 +0100
+ 
+ libvirt (1.2.9-4) unstable; urgency=medium
+ 
+   * [4cdad47] Allow backported versions of dh-systemd
+   * [fb4bf47] Add suggests to libvirt-daemon-system to libvirt-daemon
+     (Closes: #767343)
+   * [e4f03ca] Check if the directories exist before removing them
+     rmdir returns nonzero otherwise and this is more strict than just using
+     || true. (Closes: #767672)
+   * [030fd97] CVE-2014-7823: dumpxml: security hole with migratable flag
+     (Closes: #769149)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Wed, 12 Nov 2014 08:11:17 +0100
+ 
 +libvirt (1.2.9-3~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Rebuild for wheezy-backports.
 +  * [773a305] Allow backported versions of dh-systemd
 +  * [314c4aa] Use libgcrpt/gnutls versions from wheezy
 +  * Remaining changes:
 +    * [b46b754] Drop sheepdog support not available in Wheezy
 +    * [31a2113] Use libnl1 since libnetcf1 is linked against libnl1 in Wheezy.
 +      Also make sure we don't pickup up libnetcf-dev using libnl3.
 +    * [c5a59dd] Drop version in polkit-1 dependency. This reintroduces
 +      CVE-2013-4311 since we don't have a recent enough polkit-1 in wheezy.
 +    * [4db6aaa] Disable xenlight support not available in wheezy
 +    * Revert switch from avahi to avahi-daemon in init script; fixes
 +      co-installability with avahi in wheezy.
 +
 + -- Guido Günther <agx at sigxcpu.org>  Tue, 28 Oct 2014 08:10:57 +0100
 +
  libvirt (1.2.9-3) unstable; urgency=medium
  
    * [28dd361] Remove obsolete conffiles in libvirt-bin too. Depending on the
diff --cc debian/control
index 5feec2b,8b9cd9b..bf5486e
--- a/debian/control
+++ b/debian/control
@@@ -38,6 -39,12 +38,7 @@@ Build-Depends
   libapparmor-dev [linux-any],
   libsystemd-daemon-dev [linux-any],
   systemtap-sdt-dev [amd64 armel armhf i386 ia64 powerpc s390],
+  python,
 -# for --with-storage-sheepdog
 - sheepdog [linux-any],
 -# for --with-storage-rados
 - librbd-dev [linux-any],
 - librados-dev [linux-any],
  # for lxc fuse support
   libfuse-dev [linux-any],
  # for libssh2 connection URIs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git