[Pkg-libvirt-commits] [SCM] Virtinst Debian packaging branch, master, updated. debian/0.600.1-2-5-gf18fbef
Laurent Léonard
laurent at open-minds.org
Sat Jul 14 16:53:58 UTC 2012
The following commit has been merged in the master branch:
commit 27d03b816fdc6bc9d8c27f1efa923ec37c44e040
Author: Laurent Léonard <laurent at open-minds.org>
Date: Sat Jul 14 18:45:22 2012 +0200
Drop patch
0004-Fix-location-of-Debian-daily-builds.patch - fixed upstream http://git.fedorahosted.org/git/?p=python-virtinst.git;a=commitdiff;h=7d7cce43729b86d34baff55079dfcc02edeb61c2
diff --git a/debian/patches/0001-fix-path-to-hvmloader.patch b/debian/patches/0001-fix-path-to-hvmloader.patch
index b4f92b2..6541690 100644
--- a/debian/patches/0001-fix-path-to-hvmloader.patch
+++ b/debian/patches/0001-fix-path-to-hvmloader.patch
@@ -5,10 +5,10 @@ Subject: fix path to hvmloader
Closes: #487682
---
virtinst/Installer.py | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/virtinst/Installer.py b/virtinst/Installer.py
-index 2d9907e..1159764 100644
+index 0e1a714..2059972 100644
--- a/virtinst/Installer.py
+++ b/virtinst/Installer.py
@@ -325,7 +325,7 @@ class Installer(XMLBuilderDomain.XMLBuilderDomain):
@@ -20,4 +20,3 @@ index 2d9907e..1159764 100644
# Use older libvirt 'linux' value for back compat
if os_type == "xen" and hvxen:
---
diff --git a/debian/patches/0002-Fix-path-to-pygrub.patch b/debian/patches/0002-Fix-path-to-pygrub.patch
index 9d2bfc6..841ebd5 100644
--- a/debian/patches/0002-Fix-path-to-pygrub.patch
+++ b/debian/patches/0002-Fix-path-to-pygrub.patch
@@ -4,13 +4,13 @@ Subject: Fix path to pygrub
---
virtinst/util.py | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/virtinst/util.py b/virtinst/util.py
-index 17c873b..1ffa606 100644
+index 2977e08..fc0fa66 100644
--- a/virtinst/util.py
+++ b/virtinst/util.py
-@@ -389,11 +389,11 @@ def pygrub_path(conn=None):
+@@ -397,11 +397,11 @@ def pygrub_path(conn=None):
if (cap.host.arch == "i86pc"):
return "/usr/lib/xen/bin/pygrub"
else:
@@ -24,4 +24,3 @@ index 17c873b..1ffa606 100644
def uri_split(uri):
"""
---
diff --git a/debian/patches/0003-Fix-path-to-keyboard-configuration.patch b/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
index a09fbc8..3d9665b 100644
--- a/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
+++ b/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
@@ -5,10 +5,10 @@ Subject: Fix path to keyboard configuration.
Since console-setup 1.47 the keyboard configuration is in a new package keyboard-configuration and has its own configuration file.
---
virtinst/util.py | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/virtinst/util.py b/virtinst/util.py
-index 1ffa606..6c10a31 100644
+index fc0fa66..b391de7 100644
--- a/virtinst/util.py
+++ b/virtinst/util.py
@@ -44,7 +44,7 @@ import support
@@ -20,4 +20,3 @@ index 1ffa606..6c10a31 100644
def default_route(nic=None):
if platform.system() == 'SunOS':
---
diff --git a/debian/patches/0004-Fix-location-of-Debian-daily-builds.patch b/debian/patches/0004-Fix-location-of-Debian-daily-builds.patch
deleted file mode 100644
index 2a28c3b..0000000
--- a/debian/patches/0004-Fix-location-of-Debian-daily-builds.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Gaudenz Steinlin <gaudenz at debian.org>
-Date: Mon, 16 Apr 2012 13:54:23 +0200
-Subject: Fix location of Debian daily builds
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When selecting a distribution tree over http as an installation source
-the URL for Debian daily builds is not recognized because the layout
-changed. Daily builds are no longer hosted on joeyhs p.d.o site but on
-d-i.debian.org.
-
-Signed-off-by: Guido Günther <agx at sigxcpu.org>
----
- virtinst/OSDistro.py | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/virtinst/OSDistro.py b/virtinst/OSDistro.py
-index f30e6e4..69be4af 100644
---- a/virtinst/OSDistro.py
-+++ b/virtinst/OSDistro.py
-@@ -889,16 +889,16 @@ class SuseDistro(Distro):
-
- class DebianDistro(Distro):
- # ex. http://ftp.egr.msu.edu/debian/dists/sarge/main/installer-i386/
-- # daily builds: http://people.debian.org/~joeyh/d-i/
-+ # daily builds: http://d-i.debian.org/daily-images/amd64/
-
- name = "Debian"
- os_type = "linux"
-
- def __init__(self, uri, arch, vmtype=None, scratchdir=None):
- Distro.__init__(self, uri, arch, vmtype, scratchdir)
-- if uri.count("installer-i386"):
-+ if uri.count("i386"):
- self._treeArch = "i386"
-- elif uri.count("installer-amd64"):
-+ elif uri.count("amd64"):
- self._treeArch = "amd64"
- else:
- self._treeArch = "i386"
-@@ -925,9 +925,9 @@ class DebianDistro(Distro):
- if fetcher.hasFile("%s/MANIFEST" % self._prefix):
- # For regular trees
- pass
-- elif fetcher.hasFile("images/daily/MANIFEST"):
-+ elif fetcher.hasFile("daily/MANIFEST"):
- # For daily trees
-- self._prefix = "images/daily"
-+ self._prefix = "daily"
- self._set_media_paths()
- else:
- return False
diff --git a/debian/patches/series b/debian/patches/series
index 0054232..3419750 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
0001-fix-path-to-hvmloader.patch
0002-Fix-path-to-pygrub.patch
0003-Fix-path-to-keyboard-configuration.patch
-0004-Fix-location-of-Debian-daily-builds.patch
--
Virtinst Debian packaging
More information about the Pkg-libvirt-commits
mailing list