← 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): Jean-Louis Dupond
  • Date: 2010-05-05 03:32:42 UTC
  • mfrom: (1.3.13 sid)
  • Revision ID: james.westby@ubuntu.com-20100505033242-um6f6pjcc89i07m0
Tags: 0.500.3-1ubuntu1
https://launchpad.net/bugs/590068
https://launchpad.net/bugs/524318
https://launchpad.net/bugs/533048
https://launchpad.net/bugs/215084
* Merge from debian unstable. (LP: #590068)  Remaining changes:
  - debian/patches/9001_Ubuntu.patch:
     + Added lucid and maverick to OS list and enable virtio for it.
  - debian/patches/0003-Fix-patch-to-keyboard-configuration.patch: disable
    as the keyboard config in Ubuntu is still in /etc/default/console-setup
    and this was causing virt-manager to always default to a en-us
    keyboard. (LP: #524318)
  - debian/control: added acl package to depends. (LP: #533048)
  - Demote virt-viewer to Suggests, as it's in universe.
  - Recommends libvirt-bin (LP: #215084)
* debian/patches/9002-add-ca-keymap.patch: dropped, its now in upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/9001_Ubuntu.patch
1
 
diff -Nur virtinst-0.500.1/virtinst/osdict.py virtinst-0.500.1.new/virtinst/osdict.py
2
 
--- virtinst-0.500.1/virtinst/osdict.py 2009-12-03 16:18:33.000000000 -0500
3
 
+++ virtinst-0.500.1.new/virtinst/osdict.py     2010-03-05 12:48:00.000000000 -0500
4
 
@@ -280,6 +280,12 @@
5
 
                             "disk" : VIRTIO_DISK,
6
 
                             "net"  : VIRTIO_NET,
 
1
Index: virtinst-0.500.3/virtinst/osdict.py
 
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,
7
8
                         }},
8
 
+        "ubuntulucid": { "label": "Ubuntu 10.04 (Lucid Lynx)",
 
9
+        "ubuntulucid": {  "label": "Ubuntu 10.04 (Lucid Lynx)",
9
10
+                          "distro": "ubuntu",
10
11
+                          "devices" : {
11
 
+                            "disk" : VIRTIO_DISK,
12
 
+                            "net"  : VIRTIO_NET,
13
 
+                        }},
 
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
+                          }},
14
21
         "generic24": { "label": "Generic 2.4.x kernel" },
15
22
         "generic26": { "label": "Generic 2.6.x kernel" },
16
23
         "virtio26": { "sortby": "genericvirtio26",