[Pkg-xen-changes] r355 - in trunk/xen-3.0/debian: . patches

[Bastian Blank]

Author: waldi
Date: Sat Oct 14 12:53:31 2006
New Revision: 355

Modified:
   trunk/xen-3.0/debian/changelog
   trunk/xen-3.0/debian/patches/path-relative.dpatch

Log:
* debian/changelog
  - Set version to 3.0.3~rc4+hg11760-1.
  - Update.
* debian/patches/path-relative.dpatch: Fix.


Modified: trunk/xen-3.0/debian/changelog
==============================================================================
--- trunk/xen-3.0/debian/changelog	(original)
+++ trunk/xen-3.0/debian/changelog	Sat Oct 14 12:53:31 2006
@@ -1,3 +1,9 @@
+xen-3.0 (3.0.3~rc4+hg11760-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot. 
+
+ -- Bastian Blank <waldi at debian.org>  Sat, 14 Oct 2006 12:27:43 +0000
+
 xen-3.0 (3.0.3~rc1+hg11686-1) unstable; urgency=low
 
   * New upstream snapshot.

Modified: trunk/xen-3.0/debian/patches/path-relative.dpatch
==============================================================================
--- trunk/xen-3.0/debian/patches/path-relative.dpatch	(original)
+++ trunk/xen-3.0/debian/patches/path-relative.dpatch	Sat Oct 14 12:53:31 2006
@@ -5,10 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad xen-unstable~/tools/python/xen/xm/create.py xen-unstable/tools/python/xen/xm/create.py
---- xen-unstable~/tools/python/xen/xm/create.py	2006-09-21 21:44:56.000000000 +0200
-+++ xen-unstable/tools/python/xen/xm/create.py	2006-09-21 23:24:49.000000000 +0200
-@@ -462,6 +462,14 @@
+diff -urNad xen-3.0~/tools/python/xen/xm/create.py xen-3.0/tools/python/xen/xm/create.py
+--- xen-3.0~/tools/python/xen/xm/create.py	2006-10-14 10:24:31.000000000 +0000
++++ xen-3.0/tools/python/xen/xm/create.py	2006-10-14 12:30:03.877096876 +0000
+@@ -464,6 +464,14 @@
      else:
          return s
  
@@ -23,7 +23,7 @@
  def configure_image(vals):
      """Create the image config.
      """
-@@ -469,9 +477,9 @@
+@@ -471,9 +479,9 @@
          return None
      config_image = [ vals.builder ]
      if vals.kernel:
@@ -35,15 +35,16 @@
      if vals.cmdline_ip:
          cmdline_ip = strip('ip=', vals.cmdline_ip)
          config_image.append(['ip', cmdline_ip])
-@@ -634,13 +642,15 @@
+@@ -635,7 +643,7 @@
  def configure_hvm(config_image, vals):
      """Create the config for HVM devices.
      """
 -    args = [ 'device_model', 'pae', 'vcpus', 'boot', 'fda', 'fdb',
 +    args = [ 'pae', 'vcpus', 'boot', 'fda', 'fdb',
               'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw',
-              'vnc', 'vncdisplay', 'vncunused', 'vncconsole', 'sdl', 'display',
-              'acpi', 'apic', 'xauthority', 'usb', 'usbdevice' ]
+              'vnc', 'vncdisplay', 'vncunused', 'vncconsole', 'vnclisten',
+              'sdl', 'display', 'xauthority',
+@@ -643,6 +651,8 @@
      for a in args:
          if (vals.__dict__[a]):
              config_image.append([a, vals.__dict__[a]])