diff -Nru spice-protocol-0.8.1/configure spice-protocol-0.10.0/configure --- spice-protocol-0.8.1/configure 2011-07-15 12:03:25.000000000 +0000 +++ spice-protocol-0.10.0/configure 2011-11-10 16:18:35.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for spice-protocol 0.8.1. +# Generated by GNU Autoconf 2.68 for spice-protocol 0.10.0. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -556,8 +556,8 @@ # Identity of this package. PACKAGE_NAME='spice-protocol' PACKAGE_TARNAME='spice-protocol' -PACKAGE_VERSION='0.8.1' -PACKAGE_STRING='spice-protocol 0.8.1' +PACKAGE_VERSION='0.10.0' +PACKAGE_STRING='spice-protocol 0.10.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1177,7 +1177,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures spice-protocol 0.8.1 to adapt to many kinds of systems. +\`configure' configures spice-protocol 0.10.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1243,7 +1243,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of spice-protocol 0.8.1:";; + short | recursive ) echo "Configuration of spice-protocol 0.10.0:";; esac cat <<\_ACEOF @@ -1317,7 +1317,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -spice-protocol configure 0.8.1 +spice-protocol configure 0.10.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1334,7 +1334,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by spice-protocol $as_me 0.8.1, which was +It was created by spice-protocol $as_me 0.10.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2154,7 +2154,7 @@ # Define the identity of the package. PACKAGE='spice-protocol' - VERSION='0.8.1' + VERSION='0.10.0' cat >>confdefs.h <<_ACEOF @@ -2743,7 +2743,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by spice-protocol $as_me 0.8.1, which was +This file was extended by spice-protocol $as_me 0.10.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2805,7 +2805,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -spice-protocol config.status 0.8.1 +spice-protocol config.status 0.10.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru spice-protocol-0.8.1/configure.ac spice-protocol-0.10.0/configure.ac --- spice-protocol-0.8.1/configure.ac 2011-07-18 08:35:58.000000000 +0000 +++ spice-protocol-0.10.0/configure.ac 2011-11-10 16:17:55.000000000 +0000 @@ -1,8 +1,8 @@ AC_PREREQ([2.57]) m4_define([SPICE_MAJOR], 0) -m4_define([SPICE_MINOR], 8) -m4_define([SPICE_MICRO], 1) +m4_define([SPICE_MINOR], 10) +m4_define([SPICE_MICRO], 0) AC_INIT(spice-protocol, [SPICE_MAJOR.SPICE_MINOR.SPICE_MICRO], [], spice-protocol) diff -Nru spice-protocol-0.8.1/debian/changelog spice-protocol-0.10.0/debian/changelog --- spice-protocol-0.8.1/debian/changelog 2011-07-18 13:59:48.000000000 +0000 +++ spice-protocol-0.10.0/debian/changelog 2011-11-14 09:19:13.000000000 +0000 @@ -1,3 +1,10 @@ +spice-protocol (0.10.0-2ubuntu3) oneiric; urgency=high + + * New upstream release + + -- Boris Derzhavets Mon, 14 Nov 2011 21:57:56 +0800 + + spice-protocol (0.8.1-1) unstable; urgency=low * New upstream release diff -Nru spice-protocol-0.8.1/debian/README.Debian spice-protocol-0.10.0/debian/README.Debian --- spice-protocol-0.8.1/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 +++ spice-protocol-0.10.0/debian/README.Debian 2011-11-14 02:27:40.000000000 +0000 @@ -0,0 +1,39 @@ +spice-protocol for Debian +------------------------- + + + + -- root +daemon +bin +sys +sync +games +man +lp +mail +news +uucp +proxy +www-data +backup +Mailing List Manager +ircd +Gnats Bug-Reporting System (admin) +nobody + + +colord colour management daemon + +Light Display Manager +Avahi autoip daemon +Avahi mDNS daemon +usbmux daemon +Kernel Oops Tracking Daemon +PulseAudio daemon +RealtimeKit +Speech Dispatcher +HPLIP system user + +boris +Libvirt Qemu Fri, 16 Sep 2011 19:02:57 +0400 diff -Nru spice-protocol-0.8.1/debian/README.source spice-protocol-0.10.0/debian/README.source --- spice-protocol-0.8.1/debian/README.source 1970-01-01 00:00:00.000000000 +0000 +++ spice-protocol-0.10.0/debian/README.source 2011-11-14 02:27:40.000000000 +0000 @@ -0,0 +1,9 @@ +spice-protocol for Debian +------------------------- + + + + + + diff -Nru spice-protocol-0.8.1/NEWS spice-protocol-0.10.0/NEWS --- spice-protocol-0.8.1/NEWS 2011-07-18 08:41:52.000000000 +0000 +++ spice-protocol-0.10.0/NEWS 2011-11-10 16:17:55.000000000 +0000 @@ -1,3 +1,16 @@ +Major changes in 0.10.0 +======================= +* no changes, released to match version with spice + +Major changes in 0.9.1 (same as 0.8.2 in 0.8 branch) +====================== +* Add support for semi-seamless migration + +Major changes in 0.9.0 +====================== +* Add support for generic spicevmc chardev passthrough messages +* Add USB redirection channel + Major changes in 0.8.1 ====================== * Add support for volume change diff -Nru spice-protocol-0.8.1/spice/enums.h spice-protocol-0.10.0/spice/enums.h --- spice-protocol-0.8.1/spice/enums.h 2011-07-18 08:35:58.000000000 +0000 +++ spice-protocol-0.10.0/spice/enums.h 2011-11-10 16:17:55.000000000 +0000 @@ -329,8 +329,11 @@ SPICE_CHANNEL_RECORD, SPICE_CHANNEL_TUNNEL, SPICE_CHANNEL_SMARTCARD, + SPICE_CHANNEL_USBREDIR, - SPICE_END_CHANNEL + SPICE_END_CHANNEL, + + SPICE_CHANNEL_USER_DEFINED_START = 128 }; enum { @@ -364,6 +367,7 @@ SPICE_MSG_MAIN_AGENT_DATA, SPICE_MSG_MAIN_AGENT_TOKEN, SPICE_MSG_MAIN_MIGRATE_SWITCH_HOST, + SPICE_MSG_MAIN_MIGRATE_END, SPICE_MSG_END_MAIN }; @@ -377,6 +381,7 @@ SPICE_MSGC_MAIN_AGENT_START, SPICE_MSGC_MAIN_AGENT_DATA, SPICE_MSGC_MAIN_AGENT_TOKEN, + SPICE_MSGC_MAIN_MIGRATE_END, SPICE_MSGC_END_MAIN }; @@ -519,4 +524,16 @@ SPICE_MSGC_END_SMARTCARD }; +enum { + SPICE_MSG_SPICEVMC_DATA = 101, + + SPICE_MSG_END_SPICEVMC +}; + +enum { + SPICE_MSGC_SPICEVMC_DATA = 101, + + SPICE_MSGC_END_SPICEVMC +}; + #endif /* _H_SPICE_ENUMS */ diff -Nru spice-protocol-0.8.1/spice/macros.h spice-protocol-0.10.0/spice/macros.h --- spice-protocol-0.8.1/spice/macros.h 2011-07-18 08:41:52.000000000 +0000 +++ spice-protocol-0.10.0/spice/macros.h 2011-11-10 16:17:55.000000000 +0000 @@ -101,6 +101,12 @@ # define SPICE_END_DECLS #endif +#ifdef __GNUC__ +#define INLINE inline +#else +#define INLINE _inline +#endif /* __GNUC__ */ + #ifndef FALSE #define FALSE (0) #endif diff -Nru spice-protocol-0.8.1/spice/protocol.h spice-protocol-0.10.0/spice/protocol.h --- spice-protocol-0.8.1/spice/protocol.h 2011-07-18 08:35:58.000000000 +0000 +++ spice-protocol-0.10.0/spice/protocol.h 2011-11-10 16:17:55.000000000 +0000 @@ -37,7 +37,7 @@ #define SPICE_MAGIC (*(uint32_t*)"REDQ") #define SPICE_VERSION_MAJOR 2 -#define SPICE_VERSION_MINOR 0 +#define SPICE_VERSION_MINOR 1 // Encryption & Ticketing Parameters #define SPICE_MAX_PASSWORD_LENGTH 60 @@ -111,6 +111,10 @@ SPICE_RECORD_CAP_VOLUME, }; +enum { + SPICE_MAIN_CAP_SEMI_SEAMLESS_MIGRATE, +}; + #include #endif /* _H_SPICE_PROTOCOL */