← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtinst/quantal-proposed

« back to all changes in this revision

Viewing changes to debian/patches/9001_Ubuntu.patch

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-02-01 15:40:11 UTC
  • mfrom: (1.3.16 experimental)
  • Revision ID: james.westby@ubuntu.com-20110201154011-op0nusgc240xajvb
Tags: 0.500.5-1ubuntu1
* Merge from debian experimental. Remaining changes:
  - debian/patches/9001_Ubuntu.patch:
     + Updated to add maverick and natty to OS list and enable virtio
       for them.
  - debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch: adjust
    testsuite for 0001-fix-path-to-hvmloader.patch and
    0002-Fix-path-to-pygrub.patch. (refreshed)
  - debian/control: added acl package to depends.
  - Demote virt-viewer to Suggests, as it's in universe.
  - Recommends libvirt-bin
* Removed patches:
  - debian/patches/9002-libvirt_disk_format.patch: Upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/9001_Ubuntu.patch
1
 
Index: virtinst-0.500.3/virtinst/osdict.py
 
1
Index: virtinst-0.500.5/virtinst/osdict.py
2
2
===================================================================
3
 
--- virtinst-0.500.3.orig/virtinst/osdict.py    2010-06-05 15:09:28.814981525 +0200
4
 
+++ virtinst-0.500.3/virtinst/osdict.py 2010-06-05 15:11:55.442504317 +0200
5
 
@@ -324,6 +324,18 @@
6
 
                             DISK : VIRTIO_DISK,
7
 
                             NET  : VIRTIO_NET,
8
 
                         }},
9
 
+        "ubuntulucid": {  "label": "Ubuntu 10.04 (Lucid Lynx)",
10
 
+                          "distro": "ubuntu",
11
 
+                          "devices" : {
12
 
+                            DISK : VIRTIO_DISK,
13
 
+                            NET  : VIRTIO_NET,
14
 
+                       }},
15
 
+        "ubuntumaverick": { "label": "Ubuntu 10.10 (Maverick Meerkat)",
16
 
+                            "distro": "ubuntu",
17
 
+                            "devices" : {
18
 
+                             DISK : VIRTIO_DISK,
19
 
+                             NET  : VIRTIO_NET,
20
 
+                          }},
 
3
--- virtinst-0.500.5.orig/virtinst/osdict.py    2011-01-14 15:55:59.000000000 -0500
 
4
+++ virtinst-0.500.5/virtinst/osdict.py 2011-02-01 15:49:19.000000000 -0500
 
5
@@ -373,7 +373,13 @@
 
6
             "devices" : {
 
7
                 DISK : VIRTIO_DISK,
 
8
                 NET  : VIRTIO_NET,
 
9
-                INPUT: USB_TABLET,
 
10
+            }},
 
11
+        "ubuntunatty": {
 
12
+            "label": "Ubuntu 11.04 (Natty Narwhal)",
 
13
+            "distro": "ubuntu",
 
14
+            "devices" : {
 
15
+                DISK : VIRTIO_DISK,
 
16
+                NET  : VIRTIO_NET,
 
17
             }},
21
18
         "generic24": { "label": "Generic 2.4.x kernel" },
22
19
         "generic26": { "label": "Generic 2.6.x kernel" },
23
 
         "virtio26": { "sortby": "genericvirtio26",