~ubuntu-branches/ubuntu/precise/virt-manager/precise-proposed

« back to all changes in this revision

Viewing changes to debian/patches/custom-icon-installation.patch

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-02-03 10:35:22 UTC
  • mfrom: (2.3.3 experimental)
  • Revision ID: james.westby@ubuntu.com-20110203103522-j8and6dsy3taczbj
Tags: 0.8.6-1ubuntu1
* Merge from debian experimental. Remaining changes:
  - Depend on python-appindicator for appindicator support.
  - Add a /usr/share/pixmaps/virt-manager-icon.svg symlink to link icon to
    where the Application Indicator can find it.
  - Add patch da_l10n.patch since it is not integrated. (refreshed)
  - Add patch show_session_or_system_in_console to make the overview
    screen show which local qemu session you're connected to. (refreshed)
  - Add patch more_helpful_error_message to explain to the user why he
    can't connect to qemu:///system and what he can do fix it.
  - Add patch qemu-system-by-default to automatically add qemu:///system
    to the list of hypervisors if the user has write access to the UNIX
    socket.
  - Drop patchsys-quilt include since dpkg-source does the quilt dance for
    us.
  - debian/control: lower libvirt-bin from Recommends to Suggests; seems
    some users (like netbooks) want to manage VMs, but not host them; see
    meta packages (ubuntu-virt, ubuntu-virt-server, ubuntu-virt-mgmt) for
    group installation of virt package sets.
* Removed patches:
  - debian/patches/custom-icon-installation.patch: Upstream.
  - debian/patches/remove-appindicator-workarounds.patch: Upstream.
  - debian/patches/fix-nc-with-zsh.patch: Upstream
* Removed python-ipy dependency as it is in universe:
  - debian/control: remove python-ipy from Depends
  - debian/series: disable 0002-Use-IPy-from-python-ipy.patch patch so
    we use the one that's included in the virt-manager source.
  - debian/rules: don't delete the IPy file.
* debian/patches/fix-cpu-wrong-types.patch: fix "value is of wrong type
  for this column" error by making sure we are using strings in
  src/virtManager/details.py.
* debian/patches/dont-always-launch-consoles.patch: Don't always launch
  consoles for running domains in src/virtManager/manager.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Description: fix icon installation location
2
 
Origin: upstream, http://hg.fedorahosted.org/hg/virt-manager/rev/5e11e6b33fec
3
 
Bug-Ubuntu: https://bugs.launchpad.net/bugs/597378
4
 
 
5
 
diff -Nur virt-manager-0.8.4/pixmaps/hicolor/16x16/actions/Makefile.am virt-manager-0.8.4.new/pixmaps/hicolor/16x16/actions/Makefile.am
6
 
--- virt-manager-0.8.4/pixmaps/hicolor/16x16/actions/Makefile.am        2010-03-23 14:26:52.000000000 -0400
7
 
+++ virt-manager-0.8.4.new/pixmaps/hicolor/16x16/actions/Makefile.am    2010-06-22 14:14:00.000000000 -0400
8
 
@@ -1,5 +1,5 @@
9
 
 
10
 
-pixmapdir = $(pkgdatadir)/pixmaps/hicolor/16x16/action
11
 
+pixmapdir = $(pkgdatadir)/pixmaps/hicolor/16x16/actions
12
 
 pixmap_DATA = $(wildcard *.png)
13
 
 
14
 
 EXTRA_DIST = $(pixmap_DATA)
15
 
diff -Nur virt-manager-0.8.4/pixmaps/hicolor/22x22/actions/Makefile.am virt-manager-0.8.4.new/pixmaps/hicolor/22x22/actions/Makefile.am
16
 
--- virt-manager-0.8.4/pixmaps/hicolor/22x22/actions/Makefile.am        2010-03-23 14:26:52.000000000 -0400
17
 
+++ virt-manager-0.8.4.new/pixmaps/hicolor/22x22/actions/Makefile.am    2010-06-22 14:14:00.000000000 -0400
18
 
@@ -1,5 +1,5 @@
19
 
 
20
 
-pixmapdir = $(pkgdatadir)/pixmaps/hicolor/22x22/action
21
 
+pixmapdir = $(pkgdatadir)/pixmaps/hicolor/22x22/actions
22
 
 pixmap_DATA = $(wildcard *.png)
23
 
 
24
 
 EXTRA_DIST = $(pixmap_DATA)
25
 
diff -Nur virt-manager-0.8.4/pixmaps/hicolor/24x24/actions/Makefile.am virt-manager-0.8.4.new/pixmaps/hicolor/24x24/actions/Makefile.am
26
 
--- virt-manager-0.8.4/pixmaps/hicolor/24x24/actions/Makefile.am        2010-03-23 14:26:52.000000000 -0400
27
 
+++ virt-manager-0.8.4.new/pixmaps/hicolor/24x24/actions/Makefile.am    2010-06-22 14:14:00.000000000 -0400
28
 
@@ -1,4 +1,4 @@
29
 
-pixmapdir = $(pkgdatadir)/pixmaps/hicolor/24x24/action
30
 
+pixmapdir = $(pkgdatadir)/pixmaps/hicolor/24x24/actions
31
 
 pixmap_DATA = $(wildcard *.png)
32
 
 
33
 
 EXTRA_DIST = $(pixmap_DATA)
34
 
diff -Nur virt-manager-0.8.4/pixmaps/hicolor/32x32/actions/Makefile.am virt-manager-0.8.4.new/pixmaps/hicolor/32x32/actions/Makefile.am
35
 
--- virt-manager-0.8.4/pixmaps/hicolor/32x32/actions/Makefile.am        2010-03-23 14:26:52.000000000 -0400
36
 
+++ virt-manager-0.8.4.new/pixmaps/hicolor/32x32/actions/Makefile.am    2010-06-22 14:14:00.000000000 -0400
37
 
@@ -1,4 +1,4 @@
38
 
-pixmapdir = $(pkgdatadir)/pixmaps/hicolor/32x32/action
39
 
+pixmapdir = $(pkgdatadir)/pixmaps/hicolor/32x32/actions
40
 
 pixmap_DATA = $(wildcard *.png)
41
 
 
42
 
 EXTRA_DIST = $(pixmap_DATA)