[Pkg-libvirt-commits] [SCM] Virtinst Debian packaging branch, master, updated. debian/0.600.0-2-4-gf1619e1

[Laurent Léonard]

The following commit has been merged in the master branch:
commit 5c8f622b683d310bb935ac0748e627c1ac5ed677
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Thu Feb 2 12:17:07 2012 +0100

    Drop patches
    
    0004-VirtualDeviceAddress-Only-clear-XML-if-not-building-.patch - fixed upstream http://git.fedorahosted.org/git/?p=python-virtinst.git;a=commitdiff;h=061668208fa6cd8f45cf66dd921a56386de3f3b5
    0005-Add-Debian-Wheezy-to-the-OS_TYPES.patch - fixed upstream http://git.fedorahosted.org/git/?p=python-virtinst.git;a=commitdiff;h=a43a7837e8acbc88078c6a63889011c80333ee1b

diff --git a/debian/patches/0001-fix-path-to-hvmloader.patch b/debian/patches/0001-fix-path-to-hvmloader.patch
index b20a1d4..b4f92b2 100644
--- a/debian/patches/0001-fix-path-to-hvmloader.patch
+++ b/debian/patches/0001-fix-path-to-hvmloader.patch
@@ -8,7 +8,7 @@ Closes: #487682
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/virtinst/Installer.py b/virtinst/Installer.py
-index a0316d2..795db43 100644
+index 2d9907e..1159764 100644
 --- a/virtinst/Installer.py
 +++ b/virtinst/Installer.py
 @@ -325,7 +325,7 @@ class Installer(XMLBuilderDomain.XMLBuilderDomain):
diff --git a/debian/patches/0002-Fix-path-to-pygrub.patch b/debian/patches/0002-Fix-path-to-pygrub.patch
index 1a7a0c8..9d2bfc6 100644
--- a/debian/patches/0002-Fix-path-to-pygrub.patch
+++ b/debian/patches/0002-Fix-path-to-pygrub.patch
@@ -7,10 +7,10 @@ Subject: Fix path to pygrub
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/virtinst/util.py b/virtinst/util.py
-index e120d8e..b59c585 100644
+index 17c873b..1ffa606 100644
 --- a/virtinst/util.py
 +++ b/virtinst/util.py
-@@ -386,11 +386,11 @@ def pygrub_path(conn=None):
+@@ -389,11 +389,11 @@ def pygrub_path(conn=None):
          if (cap.host.arch == "i86pc"):
              return "/usr/lib/xen/bin/pygrub"
          else:
diff --git a/debian/patches/0003-Fix-path-to-keyboard-configuration.patch b/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
index d8369dc..a09fbc8 100644
--- a/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
+++ b/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
@@ -8,7 +8,7 @@ Since console-setup 1.47 the keyboard configuration is in a new package keyboard
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/virtinst/util.py b/virtinst/util.py
-index b59c585..a4af1b8 100644
+index 1ffa606..6c10a31 100644
 --- a/virtinst/util.py
 +++ b/virtinst/util.py
 @@ -44,7 +44,7 @@ import support
diff --git a/debian/patches/0004-VirtualDeviceAddress-Only-clear-XML-if-not-building-.patch b/debian/patches/0004-VirtualDeviceAddress-Only-clear-XML-if-not-building-.patch
deleted file mode 100644
index afa4603..0000000
--- a/debian/patches/0004-VirtualDeviceAddress-Only-clear-XML-if-not-building-.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Cole Robinson <crobinso at redhat.com>
-Date: Mon, 29 Aug 2011 13:12:32 -0400
-Subject: VirtualDeviceAddress: Only clear XML if not building from scratch
-
----
- virtinst/VirtualDevice.py |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/virtinst/VirtualDevice.py b/virtinst/VirtualDevice.py
-index 386eb00..869d50e 100644
---- a/virtinst/VirtualDevice.py
-+++ b/virtinst/VirtualDevice.py
-@@ -170,7 +170,8 @@ class VirtualDeviceAddress(XMLBuilderDomain):
-         self._unit = None
-         self._port = None
- 
--        self._remove_child_xpath("./address")
-+        if self._is_parse():
-+            self._remove_child_xpath("./address")
- 
-     def _get_type(self):
-         return self._type
diff --git a/debian/patches/0005-Add-Debian-Wheezy-to-the-OS_TYPES.patch b/debian/patches/0005-Add-Debian-Wheezy-to-the-OS_TYPES.patch
deleted file mode 100644
index 7aa033f..0000000
--- a/debian/patches/0005-Add-Debian-Wheezy-to-the-OS_TYPES.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 11 Aug 2011 20:56:07 +0200
-Subject: Add Debian Wheezy to the OS_TYPES
-
----
- virtinst/osdict.py |   12 +++++++++++-
- 1 files changed, 11 insertions(+), 1 deletions(-)
-
-diff --git a/virtinst/osdict.py b/virtinst/osdict.py
-index e59f7a4..7fe1082 100644
---- a/virtinst/osdict.py
-+++ b/virtinst/osdict.py
-@@ -433,7 +433,17 @@ OS_TYPES = {
-             INPUT: USB_TABLET,
-         }
-     },
--
-+    "debianwheezy": {
-+        "label": "Debian Wheezy",
-+        "distro": "debian",
-+        "sortby": "debian7",
-+        "supported": True,
-+        "devices" : {
-+                   DISK : VIRTIO_DISK,
-+                   NET  : VIRTIO_NET,
-+                   INPUT: USB_TABLET,
-+        }
-+    },
-     "ubuntuhardy": {
-         "label": "Ubuntu 8.04 LTS (Hardy Heron)",
-         "distro": "ubuntu",
diff --git a/debian/patches/series b/debian/patches/series
index 438cf8b..3419750 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 0001-fix-path-to-hvmloader.patch
 0002-Fix-path-to-pygrub.patch
 0003-Fix-path-to-keyboard-configuration.patch
-0004-VirtualDeviceAddress-Only-clear-XML-if-not-building-.patch
-0005-Add-Debian-Wheezy-to-the-OS_TYPES.patch

-- 
Virtinst Debian packaging