r40232 - in /desktop/experimental/gnome-boxes/debian: changelog control control.in patches/0001-Revert-Update-to-libvirt-gconfig-0.1.7.patch patches/series rules
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Mon Nov 4 15:02:14 UTC 2013
Author: ah
Date: Mon Nov 4 15:02:14 2013
New Revision: 40232
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40232
Log:
* Add debian/patches/0001-Revert-Update-to-libvirt-gconfig-0.1.7.patch
- revert upstream commit bumping requirement to 0.1.7 while
waiting for maintainer action on Debian bug #726582
* Lower build-dependency on libvirt-glib-1.0-dev to 0.1.6
* Use dh-autoreconf to regenerate build scripts because of above changes
- build-depend on dh-autoreconf and include it in debian/rules
- build-depend on yelp-tools for the m4 macro used in configure.ac
Added:
desktop/experimental/gnome-boxes/debian/patches/0001-Revert-Update-to-libvirt-gconfig-0.1.7.patch
Modified:
desktop/experimental/gnome-boxes/debian/changelog
desktop/experimental/gnome-boxes/debian/control
desktop/experimental/gnome-boxes/debian/control.in
desktop/experimental/gnome-boxes/debian/patches/series
desktop/experimental/gnome-boxes/debian/rules
Modified: desktop/experimental/gnome-boxes/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-boxes/debian/changelog?rev=40232&op=diff
==============================================================================
--- desktop/experimental/gnome-boxes/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-boxes/debian/changelog [utf-8] Mon Nov 4 15:02:14 2013
@@ -1,4 +1,4 @@
-gnome-boxes (3.10.0-1) UNRELEASED; urgency=low
+gnome-boxes (3.10.0-1) experimental; urgency=low
* Sync from Ubuntu Gnome3 Staging PPA (3.10.0-0ubuntu1~saucy1)
@@ -9,7 +9,16 @@
libvirt-glib-1.0-dev (>= 0.1.7)
- Require vala-0.22 (>= 0.21.1)
- -- Andreas Henriksson <andreas at fatal.se> Wed, 16 Oct 2013 22:01:58 +0200
+ [ Andreas Henriksson ]
+ * Add debian/patches/0001-Revert-Update-to-libvirt-gconfig-0.1.7.patch
+ - revert upstream commit bumping requirement to 0.1.7 while
+ waiting for maintainer action on Debian bug #726582
+ * Lower build-dependency on libvirt-glib-1.0-dev to 0.1.6
+ * Use dh-autoreconf to regenerate build scripts because of above changes
+ - build-depend on dh-autoreconf and include it in debian/rules
+ - build-depend on yelp-tools for the m4 macro used in configure.ac
+
+ -- Andreas Henriksson <andreas at fatal.se> Mon, 04 Nov 2013 15:33:55 +0100
gnome-boxes (3.8.4-1) unstable; urgency=low
Modified: desktop/experimental/gnome-boxes/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-boxes/debian/control?rev=40232&op=diff
==============================================================================
--- desktop/experimental/gnome-boxes/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-boxes/debian/control [utf-8] Mon Nov 4 15:02:14 2013
@@ -12,6 +12,7 @@
gnome-pkg-tools (>= 0.10),
gnome-common,
debhelper (>= 8),
+ dh-autoreconf,
desktop-file-utils,
gobject-introspection (>= 0.9.6),
itstool,
@@ -19,19 +20,20 @@
libclutter-gtk-1.0-dev (>= 1.3.2),
libgirepository1.0-dev,
libglib2.0-dev (>= 2.32),
- libgtk-3-dev (>= 3.5.5),
+ libgtk-3-dev (>= 3.9),
libgtk-vnc-2.0-dev (>= 0.4.4),
libgudev-1.0-dev (>= 165),
- libosinfo-1.0-dev (>= 0.2.6),
+ libosinfo-1.0-dev (>= 0.2.7),
libsoup2.4-dev,
libspice-client-gtk-3.0-dev (>= 0.15),
libvirt-dev,
- libvirt-glib-1.0-dev (>= 0.1.5),
+ libvirt-glib-1.0-dev (>= 0.1.6),
libxml2-dev (>= 2.7.8),
libxml2-utils,
libtracker-sparql-0.16-dev,
uuid-dev (>= 1.41.3),
- valac (>= 0.17.3)
+ valac-0.22 (>= 0.21.1),
+ yelp-tools
Standards-Version: 3.9.4
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-boxes
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-boxes/
Modified: desktop/experimental/gnome-boxes/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-boxes/debian/control.in?rev=40232&op=diff
==============================================================================
--- desktop/experimental/gnome-boxes/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-boxes/debian/control.in [utf-8] Mon Nov 4 15:02:14 2013
@@ -7,6 +7,7 @@
gnome-pkg-tools (>= 0.10),
gnome-common,
debhelper (>= 8),
+ dh-autoreconf,
desktop-file-utils,
gobject-introspection (>= 0.9.6),
itstool,
@@ -21,12 +22,13 @@
libsoup2.4-dev,
libspice-client-gtk-3.0-dev (>= 0.15),
libvirt-dev,
- libvirt-glib-1.0-dev (>= 0.1.7),
+ libvirt-glib-1.0-dev (>= 0.1.6),
libxml2-dev (>= 2.7.8),
libxml2-utils,
libtracker-sparql-0.16-dev,
uuid-dev (>= 1.41.3),
- valac-0.22 (>= 0.21.1)
+ valac-0.22 (>= 0.21.1),
+ yelp-tools
Standards-Version: 3.9.4
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-boxes
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-boxes/
Added: desktop/experimental/gnome-boxes/debian/patches/0001-Revert-Update-to-libvirt-gconfig-0.1.7.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-boxes/debian/patches/0001-Revert-Update-to-libvirt-gconfig-0.1.7.patch?rev=40232&op=file
==============================================================================
--- desktop/experimental/gnome-boxes/debian/patches/0001-Revert-Update-to-libvirt-gconfig-0.1.7.patch (added)
+++ desktop/experimental/gnome-boxes/debian/patches/0001-Revert-Update-to-libvirt-gconfig-0.1.7.patch [utf-8] Mon Nov 4 15:02:14 2013
@@ -0,0 +1,77 @@
+From e45cce9e50e6c1cb6b7fcb3bcf0a734eaa1d6e0b Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas at fatal.se>
+Date: Mon, 4 Nov 2013 15:31:03 +0100
+Subject: [PATCH] Revert "Update to libvirt-gconfig 0.1.7"
+
+This reverts commit c0870d9d91055d0106e13ff0ac5ba2f3df9a3db7.
+---
+ configure.ac | 2 +-
+ src/installer-media.vala | 2 +-
+ src/unattended-installer.vala | 4 ++--
+ src/vm-configurator.vala | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2668156..6056f10 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,7 +54,7 @@ GOVIRT_MIN_VERSION=0.2.0
+ GTK_MIN_VERSION=3.9
+ GTK_VNC_MIN_VERSION=0.4.4
+ LIBVIRT_GLIB_MIN_VERSION=0.1.5
+-LIBVIRT_GCONFIG_MIN_VERSION=0.1.7
++LIBVIRT_GCONFIG_MIN_VERSION=0.1.6
+ LIBXML2_MIN_VERSION=2.7.8
+ SPICE_GTK_MIN_VERSION=0.15
+ GUDEV_MIN_VERSION=165
+diff --git a/src/installer-media.vala b/src/installer-media.vala
+index 86a8421..e59aa99 100644
+--- a/src/installer-media.vala
++++ b/src/installer-media.vala
+@@ -135,7 +135,7 @@ protected void add_cd_config (Domain domain,
+ disk.set_type (type);
+ disk.set_guest_device_type (DomainDiskGuestDeviceType.CDROM);
+ disk.set_driver_name ("qemu");
+- disk.set_driver_format (DomainDiskFormat.RAW);
++ disk.set_driver_type ("raw");
+ disk.set_target_dev (device_name);
+ disk.set_source (iso_path);
+ disk.set_target_bus (DomainDiskBus.IDE);
+diff --git a/src/unattended-installer.vala b/src/unattended-installer.vala
+index c6a79a1..f2c8858 100644
+--- a/src/unattended-installer.vala
++++ b/src/unattended-installer.vala
+@@ -560,7 +560,7 @@ private void on_key_text_inserted (string text, int text_length, ref int positio
+ var disk = new DomainDisk ();
+ disk.set_type (DomainDiskType.FILE);
+ disk.set_driver_name ("qemu");
+- disk.set_driver_format (DomainDiskFormat.RAW);
++ disk.set_driver_type ("raw");
+ disk.set_source (disk_file.get_path ());
+
+ // FIXME: Ideally, we shouldn't need to check for distro
+@@ -585,7 +585,7 @@ private void on_key_text_inserted (string text, int text_length, ref int positio
+ var disk = new DomainDisk ();
+ disk.set_type (DomainDiskType.FILE);
+ disk.set_driver_name ("qemu");
+- disk.set_driver_format (DomainDiskFormat.RAW);
++ disk.set_driver_type ("raw");
+ disk.set_source (secondary_disk_file.get_path ());
+ disk.set_target_dev ((path_format == PathFormat.DOS)? "E" : "hdd");
+ disk.set_guest_device_type (DomainDiskGuestDeviceType.CDROM);
+diff --git a/src/vm-configurator.vala b/src/vm-configurator.vala
+index 491a2ec..09bccbd 100644
+--- a/src/vm-configurator.vala
++++ b/src/vm-configurator.vala
+@@ -211,7 +211,7 @@ private static void set_target_media_config (Domain domain, string target_path,
+ disk.set_type (DomainDiskType.FILE);
+ disk.set_guest_device_type (DomainDiskGuestDeviceType.DISK);
+ disk.set_driver_name ("qemu");
+- disk.set_driver_format (DomainDiskFormat.QCOW2);
++ disk.set_driver_type ("qcow2");
+ disk.set_source (target_path);
+ disk.set_driver_cache (DomainDiskCacheType.NONE);
+
+--
+1.8.4.2
+
Modified: desktop/experimental/gnome-boxes/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-boxes/debian/patches/series?rev=40232&op=diff
==============================================================================
--- desktop/experimental/gnome-boxes/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-boxes/debian/patches/series [utf-8] Mon Nov 4 15:02:14 2013
@@ -1 +1,2 @@
01_drop-onlyshowin.patch
+0001-Revert-Update-to-libvirt-gconfig-0.1.7.patch
Modified: desktop/experimental/gnome-boxes/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-boxes/debian/rules?rev=40232&op=diff
==============================================================================
--- desktop/experimental/gnome-boxes/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-boxes/debian/rules [utf-8] Mon Nov 4 15:02:14 2013
@@ -6,6 +6,7 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
GNOME_MODULE := gnome-boxes
More information about the pkg-gnome-commits
mailing list