[Pkg-libvirt-commits] [virt-manager] 02/03: Move GConf values to GSettings

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1%1.0.1-2
in repository virt-manager.

commit 27878ebaca0f56969dd9a8547660de839833479d
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Sep 28 13:26:09 2014 +0200

    Move GConf values to GSettings
    
    Closes: #740047
---
 debian/control                                     |  2 +
 .../patches/Move-GConf-values-to-GSettings.patch   | 61 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/patches/virtinst/Fix-patch-to-pygrub.patch  |  4 +-
 .../patches/virtinst/fix-path-to-hvmloader.patch   |  4 +-
 debian/virt-manager.install                        |  1 +
 6 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index fe07c0b..654ac23 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,8 @@ Depends: ${misc:Depends}, ${python:Depends},
  gir1.2-spice-client-gtk-3.0,
  gir1.2-vte-2.90,
  virtinst (>= ${binary:Version}),
+# For gsettings-data-convert
+ gconf2,
 Recommends: libvirt-daemon (>= 1.2.7), gnome-icon-theme,
  python-spice-client-gtk
 Suggests: virt-viewer, ssh-askpass, gnome-keyring, python-gnomekeyring,
diff --git a/debian/patches/Move-GConf-values-to-GSettings.patch b/debian/patches/Move-GConf-values-to-GSettings.patch
new file mode 100644
index 0000000..55b4efa
--- /dev/null
+++ b/debian/patches/Move-GConf-values-to-GSettings.patch
@@ -0,0 +1,61 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sun, 28 Sep 2014 12:46:41 +0200
+Subject: Move GConf values to GSettings
+
+This makes sure we don't lose already configured connections.
+
+Closes: #740047
+---
+ data/org.virt-manager.virt-manager.convert | 29 +++++++++++++++++++++++++++++
+ setup.py                                   |  2 ++
+ 2 files changed, 31 insertions(+)
+ create mode 100644 data/org.virt-manager.virt-manager.convert
+
+diff --git a/data/org.virt-manager.virt-manager.convert b/data/org.virt-manager.virt-manager.convert
+new file mode 100644
+index 0000000..72e07e2
+--- /dev/null
++++ b/data/org.virt-manager.virt-manager.convert
+@@ -0,0 +1,29 @@
++[org.virt-manager.virt-manager]
++system-tray = /apps/virt-manager/system-tray
++
++[org.virt-manager.virt-manager.connections]
++autostart = /apps/virt-manager/connections/autostart
++uris = /apps/virt-manager/connections/uris
++
++[org.virt-manager.virt-manager.details]
++show-toolbar = /apps/virt-manager/details/show-toolbar
++
++[org.virt-manager.virt-manager.paths]
++image-default = /apps/virt-manager/paths/default-image-path
++media-default = /apps/virt-manager/paths/default-media-path
++
++[org.virt-manager.virt-manager.stats]
++enable-net-poll    = /apps/virt-manager/stats/enable-net-poll
++enable-disk-poll   = /apps/virt-manager/stats/enable-disk-poll
++enable-memory-poll = /apps/virt-manager/stats/enable-mem-poll
++enable-cpu-poll    = /apps/virt-manager/stats/enable-cpu-poll
++
++[org.virt-manager.virt-manager.vmlist-fields]
++cpu-usage       = /apps/virt-manager/vmlist-fields/cpu_usage
++disk-usage      = /apps/virt-manager/vmlist-fields/disk_usage
++host-cpu-usage  = /apps/virt-manager/vmlist-fields/host_cpu_usage
++memory-usage    = /apps/virt-manager/vmlist-fields/memory_usage
++network-traffic = /apps/virt-manager/vmlist-fields/network_traffic
++
++
++
+diff --git a/setup.py b/setup.py
+index 388bdf8..1f6f24c 100755
+--- a/setup.py
++++ b/setup.py
+@@ -607,6 +607,8 @@ setup(
+         ]),
+         ("share/glib-2.0/schemas",
+          ["data/org.virt-manager.virt-manager.gschema.xml"]),
++        ("share/GConf/gsettings",
++         ["data/org.virt-manager.virt-manager.convert"]),
+         ("share/virt-manager/ui", glob.glob("ui/*.ui")),
+ 
+         ("share/man/man1", [
diff --git a/debian/patches/series b/debian/patches/series
index f4f4f00..b028b2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 virtinst/fix-path-to-hvmloader.patch
 virtinst/Fix-patch-to-pygrub.patch
+Move-GConf-values-to-GSettings.patch
diff --git a/debian/patches/virtinst/Fix-patch-to-pygrub.patch b/debian/patches/virtinst/Fix-patch-to-pygrub.patch
index 3e44793..93f582b 100644
--- a/debian/patches/virtinst/Fix-patch-to-pygrub.patch
+++ b/debian/patches/virtinst/Fix-patch-to-pygrub.patch
@@ -8,10 +8,10 @@ Closes: #685749
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/virtinst/guest.py b/virtinst/guest.py
-index eaa7ffa..a0ad3be 100644
+index f1ed182..01dce40 100644
 --- a/virtinst/guest.py
 +++ b/virtinst/guest.py
-@@ -337,7 +337,7 @@ class Guest(XMLBuilder):
+@@ -348,7 +348,7 @@ class Guest(XMLBuilder):
          if (not install and
              self.os.is_xenpv() and
              not self.os.kernel):
diff --git a/debian/patches/virtinst/fix-path-to-hvmloader.patch b/debian/patches/virtinst/fix-path-to-hvmloader.patch
index f22217f..b368b4d 100644
--- a/debian/patches/virtinst/fix-path-to-hvmloader.patch
+++ b/debian/patches/virtinst/fix-path-to-hvmloader.patch
@@ -8,10 +8,10 @@ Closes: #685749
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/virtinst/guest.py b/virtinst/guest.py
-index f713035..eaa7ffa 100644
+index df43a5e..f1ed182 100644
 --- a/virtinst/guest.py
 +++ b/virtinst/guest.py
-@@ -628,7 +628,7 @@ class Guest(XMLBuilder):
+@@ -663,7 +663,7 @@ class Guest(XMLBuilder):
              self.os.init = self.os.init or "/bin/sh"
  
          if not self.os.loader and self.os.is_hvm() and self.type == "xen":
diff --git a/debian/virt-manager.install b/debian/virt-manager.install
index ee798bd..f76f79e 100644
--- a/debian/virt-manager.install
+++ b/debian/virt-manager.install
@@ -2,6 +2,7 @@ usr/bin/virt-manager
 usr/share/man/man1/virt-manager.1
 usr/share/icons/
 usr/share/applications
+usr/share/GConf/
 usr/share/glib-2.0
 usr/share/locale
 usr/share/virt-manager/icons

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/virt-manager.git