[Pkg-libvirt-commits] [SCM] VirtManager Debian packaging branch, master, updated. debian/0.7.0-4-6-g0bc096b
Guido Günther
agx at sigxcpu.org
Wed Jul 29 18:49:36 UTC 2009
The following commit has been merged in the master branch:
commit e8a42e687c40f92c997759b7d572da15fd2991b6
Author: Guido Günther <agx at sigxcpu.org>
Date: Wed Jul 29 17:47:11 2009 +0200
drop patches applied upstream
0003-don-t-crop-vnc-display.patch
0004-make-check-match-return-value-of-self.get_config_key.patch
0005-Enable-Xen-HVM-virtual-machines-creation.patch
diff --git a/debian/patches/0001-use-usr-share-gconf-for-schema-data.patch b/debian/patches/0001-use-usr-share-gconf-for-schema-data.patch
index 369cac5..5432452 100644
--- a/debian/patches/0001-use-usr-share-gconf-for-schema-data.patch
+++ b/debian/patches/0001-use-usr-share-gconf-for-schema-data.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] use /usr/share/gconf for schema data
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index 250e10d..e424887 100644
+index 07cb97c..bed8487 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,7 @@ dbusdir = $(datadir)/dbus-1/services
diff --git a/debian/patches/0002-close-nc-connection-on-EOF.patch b/debian/patches/0002-close-nc-connection-on-EOF.patch
index 89b9afd..1f597b7 100644
--- a/debian/patches/0002-close-nc-connection-on-EOF.patch
+++ b/debian/patches/0002-close-nc-connection-on-EOF.patch
@@ -8,10 +8,10 @@ Closes: #519979, #521137
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/virtManager/details.py b/src/virtManager/details.py
-index 6d43e7a..e838552 100644
+index 5326cb9..18cca4f 100644
--- a/src/virtManager/details.py
+++ b/src/virtManager/details.py
-@@ -1233,7 +1233,7 @@ class vmmDetails(gobject.GObject):
+@@ -1308,7 +1308,7 @@ class vmmDetails(gobject.GObject):
argv = ["ssh", "ssh", "-p", sshport]
if username:
argv += ['-l', username]
diff --git a/debian/patches/0003-don-t-crop-vnc-display.patch b/debian/patches/0003-don-t-crop-vnc-display.patch
deleted file mode 100644
index dca8db6..0000000
--- a/debian/patches/0003-don-t-crop-vnc-display.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sat, 9 May 2009 12:58:19 +0200
-Subject: [PATCH] don't crop vnc display
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Closes: #525764
-Thanks: Laurent Léonard for testing
----
- src/vmm-details.glade | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/src/vmm-details.glade b/src/vmm-details.glade
-index 60ef5c8..be2b2da 100644
---- a/src/vmm-details.glade
-+++ b/src/vmm-details.glade
-@@ -3,8 +3,6 @@
- <!--*- mode: xml -*-->
- <glade-interface>
- <widget class="GtkWindow" id="vmm-details">
-- <property name="width_request">800</property>
-- <property name="height_request">600</property>
- <property name="title" translatable="yes">Virtual Machine</property>
- <property name="default_width">800</property>
- <property name="default_height">600</property>
---
diff --git a/debian/patches/0004-make-check-match-return-value-of-self.get_config_key.patch b/debian/patches/0004-make-check-match-return-value-of-self.get_config_key.patch
deleted file mode 100644
index 7ac097e..0000000
--- a/debian/patches/0004-make-check-match-return-value-of-self.get_config_key.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Wed, 20 May 2009 19:02:30 +0200
-Subject: [PATCH] make check match return value of self.get_config_keymap()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-In the "Add hardware" wizard summary, the keymap field is set to "None"
-instead of "Same as host" when "Same as host" option is used.
-
-Closes: #528447
-Thanks: Laurent Léonard
----
- src/virtManager/addhardware.py | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py
-index 4648c88..de289d4 100644
---- a/src/virtManager/addhardware.py
-+++ b/src/virtManager/addhardware.py
-@@ -522,7 +522,7 @@ class vmmAddHardware(gobject.GObject):
- self.window.get_widget("summary-graphics-password").set_text(_("Yes"))
- else:
- self.window.get_widget("summary-graphics-password").set_text(_("No"))
-- if self.get_config_keymap() != "":
-+ if self.get_config_keymap() is not None:
- self.window.get_widget("summary-graphics-keymap").set_text(str(self.get_config_keymap()))
- else:
- self.window.get_widget("summary-graphics-keymap").set_text(_("Same as host"))
---
diff --git a/debian/patches/0005-Enable-Xen-HVM-virtual-machines-creation.patch b/debian/patches/0005-Enable-Xen-HVM-virtual-machines-creation.patch
deleted file mode 100644
index e91a8f3..0000000
--- a/debian/patches/0005-Enable-Xen-HVM-virtual-machines-creation.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: =?utf-8?q?Laurent=20L=C3=A9onard?= <laurent at open-minds.org>
-Date: Wed, 15 Jul 2009 23:52:50 +0200
-Subject: [PATCH] Enable Xen HVM virtual machines creation.
-
-Closes: #536301
----
- src/virtManager/create.py | 10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/src/virtManager/create.py b/src/virtManager/create.py
-index 3682c41..9734267 100644
---- a/src/virtManager/create.py
-+++ b/src/virtManager/create.py
-@@ -690,6 +690,16 @@ class vmmCreate(gobject.GObject):
- net_list.set_active(default)
-
- def change_caps(self, gtype=None, dtype=None):
-+
-+ if gtype == None:
-+ # If none specified, prefer HVM. This way, the default install
-+ # options won't be limited because we default to PV. If hvm not
-+ # supported, differ to guest_lookup
-+ for g in self.caps.guests:
-+ if g.os_type == "hvm":
-+ gtype = "hvm"
-+ break
-+
- (newg,
- newdom) = virtinst.CapabilitiesParser.guest_lookup(conn=self.conn.vmm,
- caps=self.caps,
---
diff --git a/debian/patches/series b/debian/patches/series
index eb939ac..c8ec73f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
0001-use-usr-share-gconf-for-schema-data.patch
0002-close-nc-connection-on-EOF.patch
-0003-don-t-crop-vnc-display.patch
-0004-make-check-match-return-value-of-self.get_config_key.patch
-0005-Enable-Xen-HVM-virtual-machines-creation.patch
--
VirtManager Debian packaging
More information about the Pkg-libvirt-commits
mailing list