Bug#745541: wheezy-pu: package virt-manager/0.600.1-3+deb7u2

[Guido Günther <agx@sigxcpu.org>]

Package: release.debian.org
Severity: normal
Tags: wheezy
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,
python-libvirt removed some incorrectly exported methods some time ago.
Unfortunately virtinst was using one of them. Attached patch fixes this
so wheezy users can use virtinst with the python-libvirt version from
backports. The change is identical to upstreams fix.

O.k. to upload to wheezy-pu?
Cheers,
 -- Guido

-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'testing-updates'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.14.0-rc1+ (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff --git a/debian/changelog b/debian/changelog
index 4afcef5..6d7b19a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+virtinst (0.600.1-3+deb7u2) wheezy-proposed-updates; urgency=medium
+
+  * [7bb5cec] Unbreak virtinst with newer python-libvirt.
+    Upstreams libvirt-python commit 9bc81a156d281294b79192d04a5db10997566299
+    removed incorrectly exported methods so use the correct one in virtinst
+    too. This allows us to work with python-libvirt versions from
+    wheezy-backports. (Closes: #745537)
+
+ -- Guido Günther <agx@sigxcpu.org>  Tue, 22 Apr 2014 18:26:20 +0200
+
 virtinst (0.600.1-3+deb7u1) wheezy-proposed-updates; urgency=low
 
   [ Oliver Seufer ]
diff --git a/debian/patches/0007-Unbreak-virt-install-with-newer-python-libvirt.patch b/debian/patches/0007-Unbreak-virt-install-with-newer-python-libvirt.patch
new file mode 100644
index 0000000..5c18199
--- /dev/null
+++ b/debian/patches/0007-Unbreak-virt-install-with-newer-python-libvirt.patch
@@ -0,0 +1,23 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 22 Apr 2014 17:16:44 +0200
+Subject: Unbreak virt-install with newer python-libvirt
+
+Some incorrectly exported methods were removed so use the correct API
+too.
+---
+ virtinst/DistroInstaller.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/virtinst/DistroInstaller.py b/virtinst/DistroInstaller.py
+index 41371c1..27e26ec 100644
+--- a/virtinst/DistroInstaller.py
++++ b/virtinst/DistroInstaller.py
+@@ -119,7 +119,7 @@ def _upload_file(conn, meter, destpool, src):
+         offset = 0
+         length = size
+         flags = 0
+-        stream.upload(vol, offset, length, flags)
++        vol.upload(stream, offset, length, flags)
+ 
+         # Open source file
+         fileobj = file(src, "r")
diff --git a/debian/patches/series b/debian/patches/series
index 93f1a19..f6d938d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-Fix-location-of-Debian-daily-builds.patch
 0005-Don-t-fail-if-we-can-t-set-locale-debian-bug-697864.patch
 0006-virt-clone-Properly-set-image-type.patch
+0007-Unbreak-virt-install-with-newer-python-libvirt.patch