Merge ~paelzer/ubuntu/+source/virt-manager:merge-disco-2.0.0-3 into ubuntu/+source/virt-manager:debian/sid
- Git
- lp:~paelzer/ubuntu/+source/virt-manager
- merge-disco-2.0.0-3
- Merge into debian/sid
Proposed by
Christian Ehrhardt
Status: | Merged |
---|---|
Approved by: | Christian Ehrhardt |
Approved revision: | a2de4af8a434e5affc62ed757ba96f42131bab27 |
Merge reported by: | Christian Ehrhardt |
Merged at revision: | a2de4af8a434e5affc62ed757ba96f42131bab27 |
Proposed branch: | ~paelzer/ubuntu/+source/virt-manager:merge-disco-2.0.0-3 |
Merge into: | ubuntu/+source/virt-manager:debian/sid |
Diff against target: |
501 lines (+402/-1) 7 files modified
debian/changelog (+310/-0) debian/control (+4/-1) debian/patches/add_qemu_binaries.patch (+18/-0) debian/patches/mark-libvirt-lxc.patch (+27/-0) debian/patches/prefer-qemu.patch (+34/-0) debian/patches/series (+3/-0) debian/rules (+6/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marc Deslauriers (community) | Approve | ||
Canonical Server packageset reviewers | Pending | ||
Canonical Server | Pending | ||
git-ubuntu developers | Pending | ||
Review via email: mp+362118@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt (paelzer) wrote : | # |
Revision history for this message
Christian Ehrhardt (paelzer) wrote : | # |
Ticket: https:/
PPA: https:/
Tests just scratch the surface, but ok at https:/
I manually tested against the upcoming libvirt 5.0 and qemu 3.1 and it worked fine for me.
Revision history for this message
Christian Ehrhardt (paelzer) wrote : | # |
Thanks Mark!
Revision history for this message
Christian Ehrhardt (paelzer) wrote : | # |
released in disco -> merged
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/debian/changelog b/debian/changelog |
2 | index 6ae0db7..d21d326 100644 |
3 | --- a/debian/changelog |
4 | +++ b/debian/changelog |
5 | @@ -1,3 +1,40 @@ |
6 | +virt-manager (1:2.0.0-3ubuntu1) disco; urgency=medium |
7 | + |
8 | + * Merge with Debian unstable (LP: #1784424). Remaining changes: |
9 | + - Depend on gir1.2-appindicator3-0.1 for appindicator support. |
10 | + - Add lsb-release to Build-Depends so we can detect whether we're running |
11 | + on Ubuntu or Debian. |
12 | + - d/rules: Set the preferred distro so we appear first in the list. |
13 | + - d/rules: Set qemu user to libvirt-qemu so appropriate permissions get set. |
14 | + - d/p/mark-libvirt-lxc: Clearly mark the LXC connections as being |
15 | + libvirt-lxc, to avoid confusion due to differing features and |
16 | + configurations. |
17 | + - d/p/add_qemu_binaries.patch: add the actual binary name from the qemu |
18 | + packages so default hypervisor detection works properly on first run. |
19 | + - d/p/prefer-qemu.patch: Prefer QEMU as the default URI, even if it's |
20 | + not installed. |
21 | + * Dropped changes: |
22 | + - d/control: virtinst needs isoinfo to introspect images. To fix that |
23 | + add a dependency to genisoimage to virtinst (LP: 1763609) |
24 | + [accepted in Debian] |
25 | + - Merge with latest upstream stable release (LP: 1763618): |
26 | + - Fixes potential crash with libxml2 error callbacks |
27 | + - Fixes disk/net/mem VM graphs |
28 | + [part of upstream 2.0.0 release] |
29 | + - d/p/lp-1794315-connection-avoid-failing-on-NoneType.patch: fix a race |
30 | + (worse on slow remote connections) that would break connecting to a |
31 | + remote (LP: 1794315) |
32 | + [accepted upstream] |
33 | + - d/p/lp-1796932-tests-osdict-fix-ordering-issue-with-new-osinfo.patch: |
34 | + fix FTBFS due to self-tests failing with new osinfo (LP: 1796932) |
35 | + [accepted upstream] |
36 | + - d/p/virtinst/9006_fix_path_to_qemu-dm.patch: drop the full path from |
37 | + qemu-dm as already done for hvmloader and pygrub. The Xen tools will |
38 | + handle this and add the missing path. |
39 | + [no more needed as pygrub and hvmloader aren't hardcoded anymore] |
40 | + |
41 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 23 Jan 2019 11:47:54 +0100 |
42 | + |
43 | virt-manager (1:2.0.0-3) unstable; urgency=medium |
44 | |
45 | * Mark autopkgtest scripts executable |
46 | @@ -40,6 +77,62 @@ virt-manager (1:1.5.1-1) unstable; urgency=medium |
47 | |
48 | -- Guido Günther <agx@sigxcpu.org> Wed, 27 Jun 2018 11:38:12 +0200 |
49 | |
50 | +virt-manager (1:1.5.1-0ubuntu2) cosmic; urgency=medium |
51 | + |
52 | + * d/p/lp-1794315-connection-avoid-failing-on-NoneType.patch: fix a race |
53 | + (worse on slow remote connections) that would break connecting to a |
54 | + remote (LP: #1794315) |
55 | + * d/p/lp-1796932-tests-osdict-fix-ordering-issue-with-new-osinfo.patch: |
56 | + fix FTBFS due to self-tests failing with new osinfo (LP: #1796932) |
57 | + |
58 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 09 Oct 2018 16:57:42 +0200 |
59 | + |
60 | +virt-manager (1:1.5.1-0ubuntu1) bionic; urgency=medium |
61 | + |
62 | + * d/control: virtinst needs isoinfo to introspect images. To fix that |
63 | + add a dependency to genisoimage to virtinst (LP: #1763609) |
64 | + * Merge with latest upstream stable release (LP: #1763618): |
65 | + - Fixes potential crash with libxml2 error callbacks |
66 | + - Fixes disk/net/mem VM graphs |
67 | + |
68 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Fri, 13 Apr 2018 09:36:46 +0200 |
69 | + |
70 | +virt-manager (1:1.5.0-0ubuntu1) bionic; urgency=medium |
71 | + |
72 | + * Merge with Debian unstable 1:1.4.3-1 (LP: #1747907 LP: #1741861) |
73 | + and latest upstream 1.5.0 (Closes: #888133); Remaining changes: |
74 | + - Depend on gir1.2-appindicator3-0.1 for appindicator support. |
75 | + - Add lsb-release to Build-Depends so we can detect whether we're running |
76 | + on Ubuntu or Debian. |
77 | + - d/rules: Set the preferred distro so we appear first in the list. |
78 | + - d/rules: Set qemu user to libvirt-qemu so appropriate permissions get set. |
79 | + - d/p/virtinst/9006_fix_path_to_qemu-dm.patch: drop the full path from |
80 | + qemu-dm as already done for hvmloader and pygrub. The Xen tools will |
81 | + handle this and add the missing path. |
82 | + - d/p/mark-libvirt-lxc: Clearly mark the LXC connections as being |
83 | + libvirt-lxc, to avoid confusion due to differing features and |
84 | + configurations. |
85 | + - d/p/add_qemu_binaries.patch: add the actual binary name from the qemu |
86 | + packages so default hypervisor detection works properly on first run. |
87 | + - d/p/prefer-qemu.patch: Prefer QEMU as the default URI, even if it's |
88 | + not installed. |
89 | + * Dropped changes (upstream) |
90 | + - d/p/use_qxl_for_ubuntu.patch: use qxl by default for Ubuntu VMs, it |
91 | + seems to work better than vmvga now. |
92 | + - Fix virt-install so that it can install 16.04 and newer images. |
93 | + Error message is 'Couldn't find hvm kernel for Ubuntu tree |
94 | + Closes (LP 1634304) |
95 | + - d/p/virt-manager-generates-invalid-guest-XML.patch: fix generation of |
96 | + invalid xml when a spapr-vio SCSI model controller is changed to a |
97 | + virtio-scsi model controller (LP 1649520). |
98 | + - Fix window size issues under Wayland |
99 | + - d/p/virtinst-adjust-media-paths-for-s390x.patch: fix virtinst on |
100 | + s390x (LP 1713990) |
101 | + * Added Changes: |
102 | + - refresh d/p/mark-libvirt-lxc.patch to match 1.4.3 |
103 | + |
104 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 07 Feb 2018 16:13:38 +0100 |
105 | + |
106 | virt-manager (1:1.4.3-1) unstable; urgency=medium |
107 | |
108 | * Depend on gir1.2-spiceclientglib-2.0 (Closes: #873597) |
109 | @@ -93,6 +186,78 @@ virt-manager (1:1.4.0-6) unstable; urgency=medium |
110 | |
111 | -- Guido Günther <agx@sigxcpu.org> Wed, 19 Jul 2017 19:19:10 +0200 |
112 | |
113 | +virt-manager (1:1.4.0-5ubuntu3) bionic; urgency=medium |
114 | + |
115 | + * Fix window size issues under Wayland |
116 | + - d/p/wayland-window-size-1.patch: fix window size tracking in |
117 | + virtManager/details.py, virtManager/manager.py. |
118 | + - d/p/wayland-window-size-2.patch: fix resize to VM in |
119 | + virtManager/console.py. |
120 | + |
121 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Wed, 13 Dec 2017 11:30:27 -0500 |
122 | + |
123 | +virt-manager (1:1.4.0-5ubuntu2) artful; urgency=medium |
124 | + |
125 | + * - d/p/virtinst-adjust-media-paths-for-s390x.patch: fix virtinst on |
126 | + s390x (LP: #1713990) |
127 | + |
128 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 30 Aug 2017 14:48:17 +0200 |
129 | + |
130 | +virt-manager (1:1.4.0-5ubuntu1) artful; urgency=medium |
131 | + |
132 | + * Merge with Debian unstable (LP: #1667114 LP: #1683747). Remaining changes: |
133 | + - Depend on gir1.2-appindicator3-0.1 for appindicator support. |
134 | + - Add lsb-release to Build-Depends so we can detect whether we're running |
135 | + on Ubuntu or Debian. |
136 | + - d/rules: Set the preferred distro so we appear first in the list. |
137 | + - d/rules: Set qemu user to libvirt-qemu so appropriate permissions get set. |
138 | + - d/p/virtinst/9006_fix_path_to_qemu-dm.patch: drop the full path from |
139 | + qemu-dm as already done for hvmloader and pygrub. The Xen tools will |
140 | + handle this and add the missing path. |
141 | + - d/p/mark-libvirt-lxc: Clearly mark the LXC connections as being |
142 | + libvirt-lxc, to avoid confusion due to differing features and |
143 | + configurations. |
144 | + - d/p/add_qemu_binaries.patch: add the actual binary name from the qemu |
145 | + packages so default hypervisor detection works properly on first run. |
146 | + - d/p/use_qxl_for_ubuntu.patch: use qxl by default for Ubuntu VMs, it |
147 | + seems to work better than vmvga now. |
148 | + - d/p/prefer-qemu.patch: Prefer QEMU as the default URI, even if it's |
149 | + not installed. |
150 | + - Fix virt-install so that it can install 16.04 and newer images. |
151 | + Error message is 'Couldn't find hvm kernel for Ubuntu tree |
152 | + Closes (LP 1634304) |
153 | + * Dropped changes: |
154 | + - d/rules: Remove data/gschemas.compiled generated by clean (in Debian). |
155 | + - d/p/0001-details-Fix-screenshot-on-F24-rawhide-bz-1297988.patch: |
156 | + Cherry-pick from upstream. Fix screenshot capture with newer |
157 | + gdk-pixbuf/pygobject. (LP 1571702) (now Upstream) |
158 | + - d/p/use_virtio_for_pseries_disks.patch: virtinst: Use virtio bus type for |
159 | + disks on pSeries machines. Closes LP 1597610. (now Upstream) |
160 | + - Change Recommends to libvirt-bin instead of libvirt-daemon-system |
161 | + which isn't available in Ubuntu (Debian and Ubuntu share names again). |
162 | + - With package names now matching delta would be wrong, calling kvm |
163 | + leads to the right suggestive apt install message. Remaining messages |
164 | + are considered good enough (or should be fixed upstream) |
165 | + - d/p/more_helpful_error_message.patch: explain to the user why |
166 | + connecting to qemu:///system failed and how to fix it. |
167 | + - d/p/use_ubuntu_package_names.patch: Suggest installing the packages |
168 | + that are actually available in Ubuntu. |
169 | + - d/p/virtinst/dont_disable_vmport.patch: Don't disable vmport even if |
170 | + we're using spice, as this prevents having a seamless mouse when |
171 | + using Ubuntu as a guest (Seamless mouse was reported ok without). |
172 | + - d/p/leave-mnemonics-alone-on-focus-change.patch: Leave |
173 | + gtk-enable-mnemonics setting alone under Unity when windows change |
174 | + focus (No Unity supporte anymore). |
175 | + * Added changes: |
176 | + - Refreshed patches to match new version: |
177 | + - d/p/mark-libvirt-lxc.patch |
178 | + - d/p/virtinst/use_qxl_for_ubuntu.patch |
179 | + - d/p/virt-manager-generates-invalid-guest-XML.patch: fix generation of |
180 | + invalid xml when a spapr-vio SCSI model controller is changed to a |
181 | + virtio-scsi model controller (LP: #1649520). |
182 | + |
183 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 09 Aug 2017 17:07:59 +0200 |
184 | + |
185 | virt-manager (1:1.4.0-5) unstable; urgency=medium |
186 | |
187 | * Reupload with virtinst (Closes: #849293) |
188 | @@ -147,6 +312,67 @@ virt-manager (1:1.3.2-4) unstable; urgency=medium |
189 | |
190 | -- Guido Günther <agx@sigxcpu.org> Sat, 16 Apr 2016 10:54:46 +0200 |
191 | |
192 | +virt-manager (1:1.3.2-3ubuntu4) zesty; urgency=medium |
193 | + |
194 | + * Fix virt-install so that it can install 16.04 and newer images. |
195 | + Error message is 'Couldn't find hvm kernel for Ubuntu tree |
196 | + Closes (LP: #1634304) |
197 | + |
198 | + -- Dave Chiluk <chiluk@ubuntu.com> Tue, 29 Nov 2016 12:52:23 -0600 |
199 | + |
200 | +virt-manager (1:1.3.2-3ubuntu3) yakkety; urgency=medium |
201 | + |
202 | + * debian/patches/use_virtio_for_pseries_disks.patch: virtinst: Use |
203 | + virtio bus type for disks on pSeries machines. Closes LP: #1597610. |
204 | + |
205 | + -- Nishanth Aravamudan <nish.aravamudan@canonical.com> Wed, 20 Jul 2016 16:36:12 -0700 |
206 | + |
207 | +virt-manager (1:1.3.2-3ubuntu2) yakkety; urgency=medium |
208 | + |
209 | + * debian/patches/0001-details-Fix-screenshot-on-F24-rawhide-bz-1297988.patch: |
210 | + Cherry-pick from upstream. Fix screenshot capture with newer |
211 | + gdk-pixbuf/pygobject. (LP: #1571702) |
212 | + |
213 | + -- Iain Lane <iain@orangesquash.org.uk> Wed, 18 May 2016 11:08:46 +0100 |
214 | + |
215 | +virt-manager (1:1.3.2-3ubuntu1) xenial; urgency=medium |
216 | + |
217 | + * Merge from Debian. Remaining changes: (LP: #1556671) |
218 | + - debian/control: |
219 | + + Depend on gir1.2-appindicator3-0.1 for appindicator support. |
220 | + + Add lsb-release to Build-Depends so we can detect whether we're |
221 | + running on Ubuntu or Debian. |
222 | + + Change Recommends to libvirt-bin instead of libvirt-daemon-system |
223 | + which isn't available in Ubuntu |
224 | + - debian/rules: |
225 | + + Set qemu user to libvirt-qemu so appropriate permissions get set. |
226 | + + Set the preferred distro so we appear first in the list. |
227 | + + Remove data/gschemas.compiled generated by clean. |
228 | + - d/p/virtinst/9006_fix_path_to_qemu-dm.patch: drop the full path from |
229 | + qemu-dm as already done for hvmloader and pygrub. The Xen tools will |
230 | + handle this and add the missing path. |
231 | + - d/p/more_helpful_error_message.patch: explain to the user why |
232 | + connecting to qemu:///system failed and how to fix it. |
233 | + - d/p/use_ubuntu_package_names.patch: Suggest installing the packages |
234 | + that are actually available in Ubuntu. |
235 | + - d/p/leave-mnemonics-alone-on-focus-change.patch: Leave |
236 | + gtk-enable-mnemonics setting alone under Unity when windows change |
237 | + focus. |
238 | + - d/p/mark-libvirt-lxc: Clearly mark the LXC connections as being |
239 | + libvirt-lxc, to avoid confusion due to differing features and |
240 | + configurations. |
241 | + - d/p/add_qemu_binaries.patch: add the actual binary name from the qemu |
242 | + packages so default hypervisor detection works properly on first run. |
243 | + - d/p/use_qxl_for_ubuntu.patch: use qxl by default for Ubuntu VMs, it |
244 | + seems to work better than vmvga now. |
245 | + - d/p/prefer-qemu.patch: Prefer QEMU as the default URI, even if it's |
246 | + not installed. |
247 | + - d/p/virtinst/dont_disable_vmport.patch: Don't disable vmport even if |
248 | + we're using spice, as this prevents having a seamless mouse when |
249 | + using Ubuntu as a guest. |
250 | + |
251 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 31 Mar 2016 17:32:42 -0400 |
252 | + |
253 | virt-manager (1:1.3.2-3) unstable; urgency=medium |
254 | |
255 | * [2ebfe49] Switch from urlgrabber to requests. |
256 | @@ -184,6 +410,90 @@ virt-manager (1:1.3.2-1) experimental; urgency=medium |
257 | |
258 | -- Guido Günther <agx@sigxcpu.org> Thu, 04 Feb 2016 12:11:04 +0100 |
259 | |
260 | +virt-manager (1:1.3.2-0ubuntu2) xenial; urgency=medium |
261 | + |
262 | + * debian/patches/virtinst/dont_disable_vmport.patch: Don't disable |
263 | + vmport even if we're using spice, as this prevents having a seamless |
264 | + mouse when using Ubuntu as a guest. |
265 | + |
266 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Fri, 25 Mar 2016 14:35:57 -0400 |
267 | + |
268 | +virt-manager (1:1.3.2-0ubuntu1) xenial; urgency=medium |
269 | + |
270 | + * Updated to upstream 1.3.2 release. (LP: #1533004) |
271 | + - d/p/Make-sure-we-use-a-binary-compatible-version-of-vte.patch: |
272 | + removed, no longer required. |
273 | + - d/p/leave-mnemonics-alone-on-focus-change.patch: updated to fix bug. |
274 | + - d/p/virtinst/use_qxl_for_ubuntu.patch: updated for new version. |
275 | + - debian/rules: remove data/gschemas.compiled generated by clean, |
276 | + pass --no-update-icon-cache --no-compile-schemas to install. |
277 | + - debian/control: added python-requests to Depends. |
278 | + |
279 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 28 Jan 2016 13:11:39 -0500 |
280 | + |
281 | +virt-manager (1:1.2.1-4ubuntu1) xenial; urgency=medium |
282 | + |
283 | + * Merge from Debian. Remaining changes: (LP: #1409309) |
284 | + - debian/control: |
285 | + + Depend on gir1.2-appindicator3-0.1 for appindicator support. |
286 | + + Add lsb-release to Build-Depends so we can detect whether we're |
287 | + running on Ubuntu or Debian. |
288 | + + Change Recommends to libvirt-bin instead of libvirt-daemon-system |
289 | + which isn't available in Ubuntu |
290 | + + Bump standards version to 3.9.6. |
291 | + - debian/rules: |
292 | + + Set qemu user to libvirt-qemu so appropriate permissions get set. |
293 | + + Set the preferred distro so we appear first in the list. |
294 | + - d/p/virtinst/9006_fix_path_to_qemu-dm.patch: drop the full path from |
295 | + qemu-dm as already done for hvmloader and pygrub. The Xen tools will |
296 | + handle this and add the missing path. |
297 | + - d/p/more_helpful_error_message.patch: explain to the user why |
298 | + connecting to qemu:///system failed and how to fix it. |
299 | + - d/p/use_ubuntu_package_names.patch: Suggest installing the packages |
300 | + that are actually available in Ubuntu. |
301 | + - d/p/leave-mnemonics-alone-on-focus-change.patch: Leave |
302 | + gtk-enable-mnemonics setting alone under Unity when windows change |
303 | + focus. |
304 | + - d/p/mark-libvirt-lxc: Clearly mark the LXC connections as being |
305 | + libvirt-lxc, to avoid confusion due to differing features and |
306 | + configurations. |
307 | + - d/p/add_qemu_binaries.patch: add the actual binary name from the qemu |
308 | + packages so default hypervisor detection works properly on first run. |
309 | + - d/p/Make-sure-we-use-a-binary-compatible-version-of-vte.patch: Use |
310 | + vte 2.91. |
311 | + * Dropped patches included upstream: |
312 | + - d/p/0001-serialcon-Drop-use-of-yet-more-removed-API.patch, |
313 | + - d/p/0001-serialcon-Remove-some-redundant-VTE-API-calls.patch: Cherry- |
314 | + pick two patches from upstream to stop using API removed in VTE 2.91. |
315 | + - d/p/dont-force-keyboard-grabs.patch: don't force keyboarb grab before |
316 | + widget is realized |
317 | + - d/p/prevent-access-to-deleted-objects.patch: prevent access to |
318 | + deleted objects |
319 | + - d/p/fix_changing_graphics_type.patch: fix changing the graphics type |
320 | + in the details dialog. |
321 | + - d/p/hook_into_domain_balloon_event.patch: properly hook into hotplug |
322 | + events so memory size gets updated. |
323 | + - d/p/fix_showing_vcpus.patch: display the right number of vcpus in the |
324 | + customize dialog. |
325 | + - d/p/fix_whitespace_in_storage_name.patch: Fix using storage when the |
326 | + directory name contains whitespace |
327 | + - d/p/add-support-for-ppc64le: cherrypick two patches to fix |
328 | + virt-install for ppc64le |
329 | + - d/p/fix-page-visibilities.patch: fix a page visibility issue |
330 | + resulting in stuck grabs. |
331 | + * Other dropped patches: |
332 | + - d/p/uefi_support.patch: upstream now has built in support. |
333 | + - d/p/virtinst/9004_ubuntu_fix_tree_support.patch: this patch is |
334 | + broken, needs fixing. |
335 | + - d/p/virtinst/9005_ubuntu_releases.patch: virt-manager no longer |
336 | + handles release information directly. |
337 | + * debian/patches/use_qxl_for_ubuntu.patch: use qxl by default for Ubuntu |
338 | + VMs, it seems to work better than vmvga now. |
339 | + * debian/patches/prefer-qemu.patch: Prefer QEMU as the default URI, even |
340 | + if it's not installed. |
341 | + |
342 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Tue, 08 Dec 2015 13:14:50 -0500 |
343 | + |
344 | virt-manager (1:1.2.1-4) unstable; urgency=medium |
345 | |
346 | [ Andreas Henriksson ] |
347 | diff --git a/debian/control b/debian/control |
348 | index 1cadec8..fb3ec72 100644 |
349 | --- a/debian/control |
350 | +++ b/debian/control |
351 | @@ -1,7 +1,8 @@ |
352 | Source: virt-manager |
353 | Section: admin |
354 | Priority: optional |
355 | -Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers@lists.alioth.debian.org> |
356 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
357 | +XSBC-Original-Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers@lists.alioth.debian.org> |
358 | Uploaders: Guido Günther <agx@sigxcpu.org>, Laurent Léonard <laurent@open-minds.org> |
359 | Standards-Version: 4.1.1 |
360 | Vcs-Git: https://salsa.debian.org/libvirt-team/virt-manager.git |
361 | @@ -18,6 +19,7 @@ Build-Depends: |
362 | gir1.2-libosinfo-1.0, |
363 | gir1.2-libvirt-glib-1.0, |
364 | libvirt-daemon, |
365 | + lsb-release, |
366 | python3-gi, |
367 | python3-libvirt, |
368 | python3-libxml2, |
369 | @@ -33,6 +35,7 @@ Depends: ${misc:Depends}, ${python3:Depends}, |
370 | python-requests, |
371 | librsvg2-common, |
372 | python3-libvirt (>= 0.7.1), |
373 | + gir1.2-appindicator3-0.1, |
374 | gir1.2-libvirt-glib-1.0, |
375 | gir1.2-gtk-vnc-2.0, |
376 | gir1.2-gtk-3.0 (>= 3.10), |
377 | diff --git a/debian/patches/add_qemu_binaries.patch b/debian/patches/add_qemu_binaries.patch |
378 | new file mode 100644 |
379 | index 0000000..b5b8afe |
380 | --- /dev/null |
381 | +++ b/debian/patches/add_qemu_binaries.patch |
382 | @@ -0,0 +1,18 @@ |
383 | +Description: add the actual binary names from the qemu packages so default |
384 | + hypervisor detection works properly on first run. |
385 | +Author: Marc Deslauriers <marc.deslauriers@canonical.com> |
386 | +Updated: 2015-08-22 |
387 | + |
388 | +Index: virt-manager-1.2.1/virtManager/connect.py |
389 | +=================================================================== |
390 | +--- virt-manager-1.2.1.orig/virtManager/connect.py 2015-08-22 09:26:25.800728242 -0400 |
391 | ++++ virt-manager-1.2.1/virtManager/connect.py 2015-08-22 09:27:04.789080689 -0400 |
392 | +@@ -115,6 +115,8 @@ |
393 | + if (os.path.exists("/usr/bin/qemu") or |
394 | + os.path.exists("/usr/bin/qemu-kvm") or |
395 | + os.path.exists("/usr/bin/kvm") or |
396 | ++ os.path.exists("/usr/bin/qemu-system-x86_64") or |
397 | ++ os.path.exists("/usr/bin/qemu-system-i386") or |
398 | + os.path.exists("/usr/libexec/qemu-kvm") or |
399 | + glob.glob("/usr/bin/qemu-system-*")): |
400 | + return "qemu:///system" |
401 | diff --git a/debian/patches/mark-libvirt-lxc.patch b/debian/patches/mark-libvirt-lxc.patch |
402 | new file mode 100644 |
403 | index 0000000..6cccc3c |
404 | --- /dev/null |
405 | +++ b/debian/patches/mark-libvirt-lxc.patch |
406 | @@ -0,0 +1,27 @@ |
407 | +Description: Clearly mark the LXC connections as being libvirt-lxc, to |
408 | + avoid confusion due to differing features and configurations. |
409 | +Author: Serge Hallyn <serge.hallyn@ubuntu.com> |
410 | +Updated: 2015-08-22 |
411 | + |
412 | +--- a/virtManager/connect.py |
413 | ++++ b/virtManager/connect.py |
414 | +@@ -171,7 +171,7 @@ class vmmConnect(vmmGObjectUI): |
415 | + _add_hv_row(HV_QEMU, "qemu", "QEMU/KVM") |
416 | + _add_hv_row(HV_QEMU_SESSION, "qemu", "QEMU/KVM " + _("user session")) |
417 | + _add_hv_row(HV_XEN, "xen", "Xen") |
418 | +- _add_hv_row(HV_LXC, "lxc", "LXC (" + _("Linux Containers") + ")") |
419 | ++ _add_hv_row(HV_LXC, "lxc", "Libvirt-LXC (Linux Containers)") |
420 | + _add_hv_row(HV_BHYVE, "bhyve", "Bhyve") |
421 | + _add_hv_row(HV_VZ, "vz", "Virtuozzo") |
422 | + _add_hv_row(-1, None, "") |
423 | +--- a/virtManager/connection.py |
424 | ++++ b/virtManager/connection.py |
425 | +@@ -433,7 +433,7 @@ class vmmConnection(vmmGObject): |
426 | + "esx": "ESX", |
427 | + "gsx": "GSX", |
428 | + "libxl": "libxl", |
429 | +- "lxc": "LXC", |
430 | ++ "lxc": "Libvirt-LXC", |
431 | + "openvz": "OpenVZ", |
432 | + "phyp": "phyp", |
433 | + "qemu": "QEMU/KVM", |
434 | diff --git a/debian/patches/prefer-qemu.patch b/debian/patches/prefer-qemu.patch |
435 | new file mode 100644 |
436 | index 0000000..e4eec5e |
437 | --- /dev/null |
438 | +++ b/debian/patches/prefer-qemu.patch |
439 | @@ -0,0 +1,34 @@ |
440 | +Description: Prefer QEMU as the default URI, even if it's not installed. |
441 | +Author: Marc Deslauriers <marc.deslauriers@canonical.com> |
442 | +Forwarded: no, Ubuntu-specific preference |
443 | + |
444 | +Index: virt-manager-1.2.1/virtManager/connect.py |
445 | +=================================================================== |
446 | +--- virt-manager-1.2.1.orig/virtManager/connect.py 2015-12-08 13:25:00.910228019 -0500 |
447 | ++++ virt-manager-1.2.1/virtManager/connect.py 2015-12-08 13:47:40.967838385 -0500 |
448 | +@@ -107,11 +107,6 @@ |
449 | + |
450 | + @staticmethod |
451 | + def default_uri(): |
452 | +- if os.path.exists('/var/lib/xen'): |
453 | +- if (os.path.exists('/dev/xen/evtchn') or |
454 | +- os.path.exists("/proc/xen")): |
455 | +- return 'xen:///' |
456 | +- |
457 | + if (os.path.exists("/usr/bin/qemu") or |
458 | + os.path.exists("/usr/bin/qemu-kvm") or |
459 | + os.path.exists("/usr/bin/kvm") or |
460 | +@@ -121,9 +116,10 @@ |
461 | + glob.glob("/usr/bin/qemu-system-*")): |
462 | + return "qemu:///system" |
463 | + |
464 | +- if (os.path.exists("/usr/lib/libvirt/libvirt_lxc") or |
465 | +- os.path.exists("/usr/lib64/libvirt/libvirt_lxc")): |
466 | +- return "lxc:///" |
467 | ++ if os.path.exists('/var/lib/xen'): |
468 | ++ if (os.path.exists('/dev/xen/evtchn') or |
469 | ++ os.path.exists("/proc/xen")): |
470 | ++ return 'xen:///' |
471 | + return None |
472 | + |
473 | + def cancel(self, ignore1=None, ignore2=None): |
474 | diff --git a/debian/patches/series b/debian/patches/series |
475 | index 07c986c..1eff7d9 100644 |
476 | --- a/debian/patches/series |
477 | +++ b/debian/patches/series |
478 | @@ -1 +1,4 @@ |
479 | Use-usr-bin-python.patch |
480 | +mark-libvirt-lxc.patch |
481 | +add_qemu_binaries.patch |
482 | +prefer-qemu.patch |
483 | diff --git a/debian/rules b/debian/rules |
484 | index 3012126..e25fac0 100755 |
485 | --- a/debian/rules |
486 | +++ b/debian/rules |
487 | @@ -1,8 +1,14 @@ |
488 | #!/usr/bin/make -f |
489 | |
490 | +DISTRO := $(shell lsb_release -si | tr '[:upper:]' '[:lower:]') |
491 | + |
492 | %: |
493 | dh $@ --with python3 --buildsystem=pybuild |
494 | |
495 | +override_dh_auto_configure: |
496 | + ./setup.py configure --qemu-user=libvirt-qemu \ |
497 | + --preferred-distros=$(DISTRO) |
498 | + |
499 | override_dh_python2: |
500 | dh_python3 -O--buildsystem=python_distutils |
501 | dh_python3 -p virtinst usr/share/virt-manager |
Rather straight forward now that Debian has catched up.
Dropping changes that were accepted in either upstream or Debian, no new changes needed.
Merge review helper Tags: old/ubuntu for version 1:1.5.1-0ubuntu2 old/debian for version 1:1.4.3-1 new/debian for version 1:2.0.0-3 reconstruct/ 1%1.5.1- 0ubuntu2 deconstruct/ 1%1.5.1- 0ubuntu2 logical/ 1%1.5.1- 0ubuntu2
lp1784424/
lp1784424/
lp1784424/
lp1784424/
lp1784424/
lp1784424/