From ecfa49d4e43284b98c0e4ec0cab434a79c4a504c Mon Sep 17 00:00:00 2001
From: Simon McVittie
Date: Thu, 16 Feb 2012 10:07:08 +0000
Subject: [PATCH 1/3] Version the names and node-names of all versioned
interfaces
Otherwise, either we can't generate code for Foo1 and Foo2 simultaneously,
or the rules for when you version and when you don't are really
confusing. See fd.o #26866.
---
...ssing.xml => Account_Interface_Addressing1.xml} | 2 +-
...ce_Avatar.xml => Account_Interface_Avatar1.xml} | 2 +-
...count_Interface_External_Password_Storage1.xml} | 2 +-
...ce_Hidden.xml => Account_Interface_Hidden1.xml} | 2 +-
..._Storage.xml => Account_Interface_Storage1.xml} | 2 +-
...n.xml => Account_Manager_Interface_Hidden1.xml} | 2 +-
...l => Call_Content_Interface_Audio_Control1.xml} | 2 +-
...l => Call_Content_Interface_Video_Control1.xml} | 2 +-
...scription_Interface_RTCP_Extended_Reports1.xml} | 2 +-
...Media_Description_Interface_RTCP_Feedback1.xml} | 2 +-
...scription_Interface_RTP_Header_Extensions1.xml} | 2 +-
...annel_Dispatcher_Interface_Operation_List1.xml} | 2 +-
...ssing.xml => Channel_Interface_Addressing1.xml} | 2 +-
...nymity.xml => Channel_Interface_Anonymity1.xml} | 2 +-
...State.xml => Channel_Interface_Chat_State1.xml} | 2 +-
...rence.xml => Channel_Interface_Conference1.xml} | 2 +-
... => Channel_Interface_Credentials_Storage1.xml} | 2 +-
...erface_DTMF.xml => Channel_Interface_DTMF1.xml} | 2 +-
...able.xml => Channel_Interface_Destroyable1.xml} | 2 +-
... Channel_Interface_File_Transfer_Metadata1.xml} | 2 +-
...face_Group.xml => Channel_Interface_Group1.xml} | 2 +-
...erface_HTML.xml => Channel_Interface_HTML1.xml} | 2 +-
...erface_Hold.xml => Channel_Interface_Hold1.xml} | 2 +-
...=> Channel_Interface_Mergeable_Conference1.xml} | 2 +-
...assword.xml => Channel_Interface_Password1.xml} | 2 +-
..._Picture.xml => Channel_Interface_Picture1.xml} | 2 +-
...erface_Room.xml => Channel_Interface_Room1.xml} | 2 +-
...nfig.xml => Channel_Interface_Room_Config1.xml} | 2 +-
... => Channel_Interface_SASL_Authentication1.xml} | 2 +-
...nterface_SMS.xml => Channel_Interface_SMS1.xml} | 2 +-
...urable.xml => Channel_Interface_Securable1.xml} | 2 +-
...nt.xml => Channel_Interface_Service_Point1.xml} | 2 +-
...table.xml => Channel_Interface_Splittable1.xml} | 2 +-
..._Subject.xml => Channel_Interface_Subject1.xml} | 2 +-
...erface_Tube.xml => Channel_Interface_Tube1.xml} | 2 +-
...hannel_Type_Call.xml => Channel_Type_Call1.xml} | 2 +-
...Search.xml => Channel_Type_Contact_Search1.xml} | 2 +-
...e_DBus_Tube.xml => Channel_Type_DBus_Tube1.xml} | 2 +-
...ransfer.xml => Channel_Type_File_Transfer1.xml} | 2 +-
...e_Room_List.xml => Channel_Type_Room_List1.xml} | 2 +-
...xml => Channel_Type_Server_Authentication1.xml} | 2 +-
...xml => Channel_Type_Server_TLS_Connection1.xml} | 2 +-
...ream_Tube.xml => Channel_Type_Stream_Tube1.xml} | 2 +-
...hannel_Type_Text.xml => Channel_Type_Text1.xml} | 2 +-
...ng.xml => Connection_Interface_Addressing1.xml} | 2 +-
...sing.xml => Connection_Interface_Aliasing1.xml} | 2 +-
...ity.xml => Connection_Interface_Anonymity1.xml} | 2 +-
...atars.xml => Connection_Interface_Avatars1.xml} | 2 +-
...lance.xml => Connection_Interface_Balance1.xml} | 2 +-
...ular.xml => Connection_Interface_Cellular1.xml} | 2 +-
....xml => Connection_Interface_Client_Types1.xml} | 2 +-
...Connection_Interface_Communication_Policy1.xml} | 2 +-
... => Connection_Interface_Contact_Blocking1.xml} | 2 +-
...Connection_Interface_Contact_Capabilities1.xml} | 2 +-
...ml => Connection_Interface_Contact_Groups1.xml} | 2 +-
....xml => Connection_Interface_Contact_Info1.xml} | 2 +-
....xml => Connection_Interface_Contact_List1.xml} | 2 +-
...ng.xml => Connection_Interface_Forwarding1.xml} | 2 +-
...ive.xml => Connection_Interface_Keepalive1.xml} | 2 +-
...tion.xml => Connection_Interface_Location1.xml} | 2 +-
...=> Connection_Interface_Mail_Notification1.xml} | 2 +-
....xml => Connection_Interface_Power_Saving1.xml} | 2 +-
...ence.xml => Connection_Interface_Presence1.xml} | 2 +-
...ming.xml => Connection_Interface_Renaming1.xml} | 2 +-
...ces.xml => Connection_Interface_Resources1.xml} | 2 +-
...xml => Connection_Interface_Service_Point1.xml} | 2 +-
...nection_Manager_Interface_Account_Storage1.xml} | 2 +-
spec/{Debug.xml => Debug1.xml} | 2 +-
...sing.xml => Protocol_Interface_Addressing1.xml} | 2 +-
...Avatars.xml => Protocol_Interface_Avatars1.xml} | 2 +-
...esence.xml => Protocol_Interface_Presence1.xml} | 2 +-
spec/all.xml | 142 ++++++++++----------
spec/template.xml | 2 +-
73 files changed, 143 insertions(+), 143 deletions(-)
rename spec/{Account_Interface_Addressing.xml => Account_Interface_Addressing1.xml} (96%)
rename spec/{Account_Interface_Avatar.xml => Account_Interface_Avatar1.xml} (98%)
rename spec/{Account_Interface_External_Password_Storage.xml => Account_Interface_External_Password_Storage1.xml} (97%)
rename spec/{Account_Interface_Hidden.xml => Account_Interface_Hidden1.xml} (98%)
rename spec/{Account_Interface_Storage.xml => Account_Interface_Storage1.xml} (99%)
rename spec/{Account_Manager_Interface_Hidden.xml => Account_Manager_Interface_Hidden1.xml} (98%)
rename spec/{Call_Content_Interface_Audio_Control.xml => Call_Content_Interface_Audio_Control1.xml} (99%)
rename spec/{Call_Content_Interface_Video_Control.xml => Call_Content_Interface_Video_Control1.xml} (98%)
rename spec/{Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml => Call_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml} (98%)
rename spec/{Call_Content_Media_Description_Interface_RTCP_Feedback.xml => Call_Content_Media_Description_Interface_RTCP_Feedback1.xml} (98%)
rename spec/{Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml => Call_Content_Media_Description_Interface_RTP_Header_Extensions1.xml} (97%)
rename spec/{Channel_Dispatcher_Interface_Operation_List.xml => Channel_Dispatcher_Interface_Operation_List1.xml} (98%)
rename spec/{Channel_Interface_Addressing.xml => Channel_Interface_Addressing1.xml} (97%)
rename spec/{Channel_Interface_Anonymity.xml => Channel_Interface_Anonymity1.xml} (98%)
rename spec/{Channel_Interface_Chat_State.xml => Channel_Interface_Chat_State1.xml} (97%)
rename spec/{Channel_Interface_Conference.xml => Channel_Interface_Conference1.xml} (99%)
rename spec/{Channel_Interface_Credentials_Storage.xml => Channel_Interface_Credentials_Storage1.xml} (98%)
rename spec/{Channel_Interface_DTMF.xml => Channel_Interface_DTMF1.xml} (99%)
rename spec/{Channel_Interface_Destroyable.xml => Channel_Interface_Destroyable1.xml} (98%)
rename spec/{Channel_Interface_File_Transfer_Metadata.xml => Channel_Interface_File_Transfer_Metadata1.xml} (98%)
rename spec/{Channel_Interface_Group.xml => Channel_Interface_Group1.xml} (99%)
rename spec/{Channel_Interface_HTML.xml => Channel_Interface_HTML1.xml} (99%)
rename spec/{Channel_Interface_Hold.xml => Channel_Interface_Hold1.xml} (98%)
rename spec/{Channel_Interface_Mergeable_Conference.xml => Channel_Interface_Mergeable_Conference1.xml} (98%)
rename spec/{Channel_Interface_Password.xml => Channel_Interface_Password1.xml} (97%)
rename spec/{Channel_Interface_Picture.xml => Channel_Interface_Picture1.xml} (99%)
rename spec/{Channel_Interface_Room.xml => Channel_Interface_Room1.xml} (99%)
rename spec/{Channel_Interface_Room_Config.xml => Channel_Interface_Room_Config1.xml} (99%)
rename spec/{Channel_Interface_SASL_Authentication.xml => Channel_Interface_SASL_Authentication1.xml} (99%)
rename spec/{Channel_Interface_SMS.xml => Channel_Interface_SMS1.xml} (99%)
rename spec/{Channel_Interface_Securable.xml => Channel_Interface_Securable1.xml} (98%)
rename spec/{Channel_Interface_Service_Point.xml => Channel_Interface_Service_Point1.xml} (97%)
rename spec/{Channel_Interface_Splittable.xml => Channel_Interface_Splittable1.xml} (98%)
rename spec/{Channel_Interface_Subject.xml => Channel_Interface_Subject1.xml} (99%)
rename spec/{Channel_Interface_Tube.xml => Channel_Interface_Tube1.xml} (99%)
rename spec/{Channel_Type_Call.xml => Channel_Type_Call1.xml} (99%)
rename spec/{Channel_Type_Contact_Search.xml => Channel_Type_Contact_Search1.xml} (99%)
rename spec/{Channel_Type_DBus_Tube.xml => Channel_Type_DBus_Tube1.xml} (98%)
rename spec/{Channel_Type_File_Transfer.xml => Channel_Type_File_Transfer1.xml} (99%)
rename spec/{Channel_Type_Room_List.xml => Channel_Type_Room_List1.xml} (98%)
rename spec/{Channel_Type_Server_Authentication.xml => Channel_Type_Server_Authentication1.xml} (97%)
rename spec/{Channel_Type_Server_TLS_Connection.xml => Channel_Type_Server_TLS_Connection1.xml} (99%)
rename spec/{Channel_Type_Stream_Tube.xml => Channel_Type_Stream_Tube1.xml} (99%)
rename spec/{Channel_Type_Text.xml => Channel_Type_Text1.xml} (99%)
rename spec/{Connection_Interface_Addressing.xml => Connection_Interface_Addressing1.xml} (98%)
rename spec/{Connection_Interface_Aliasing.xml => Connection_Interface_Aliasing1.xml} (98%)
rename spec/{Connection_Interface_Anonymity.xml => Connection_Interface_Anonymity1.xml} (99%)
rename spec/{Connection_Interface_Avatars.xml => Connection_Interface_Avatars1.xml} (99%)
rename spec/{Connection_Interface_Balance.xml => Connection_Interface_Balance1.xml} (99%)
rename spec/{Connection_Interface_Cellular.xml => Connection_Interface_Cellular1.xml} (99%)
rename spec/{Connection_Interface_Client_Types.xml => Connection_Interface_Client_Types1.xml} (99%)
rename spec/{Connection_Interface_Communication_Policy.xml => Connection_Interface_Communication_Policy1.xml} (99%)
rename spec/{Connection_Interface_Contact_Blocking.xml => Connection_Interface_Contact_Blocking1.xml} (98%)
rename spec/{Connection_Interface_Contact_Capabilities.xml => Connection_Interface_Contact_Capabilities1.xml} (99%)
rename spec/{Connection_Interface_Contact_Groups.xml => Connection_Interface_Contact_Groups1.xml} (99%)
rename spec/{Connection_Interface_Contact_Info.xml => Connection_Interface_Contact_Info1.xml} (99%)
rename spec/{Connection_Interface_Contact_List.xml => Connection_Interface_Contact_List1.xml} (99%)
rename spec/{Connection_Interface_Forwarding.xml => Connection_Interface_Forwarding1.xml} (99%)
rename spec/{Connection_Interface_Keepalive.xml => Connection_Interface_Keepalive1.xml} (98%)
rename spec/{Connection_Interface_Location.xml => Connection_Interface_Location1.xml} (99%)
rename spec/{Connection_Interface_Mail_Notification.xml => Connection_Interface_Mail_Notification1.xml} (99%)
rename spec/{Connection_Interface_Power_Saving.xml => Connection_Interface_Power_Saving1.xml} (99%)
rename spec/{Connection_Interface_Presence.xml => Connection_Interface_Presence1.xml} (99%)
rename spec/{Connection_Interface_Renaming.xml => Connection_Interface_Renaming1.xml} (97%)
rename spec/{Connection_Interface_Resources.xml => Connection_Interface_Resources1.xml} (99%)
rename spec/{Connection_Interface_Service_Point.xml => Connection_Interface_Service_Point1.xml} (97%)
rename spec/{Connection_Manager_Interface_Account_Storage.xml => Connection_Manager_Interface_Account_Storage1.xml} (98%)
rename spec/{Debug.xml => Debug1.xml} (99%)
rename spec/{Protocol_Interface_Addressing.xml => Protocol_Interface_Addressing1.xml} (99%)
rename spec/{Protocol_Interface_Avatars.xml => Protocol_Interface_Avatars1.xml} (99%)
rename spec/{Protocol_Interface_Presence.xml => Protocol_Interface_Presence1.xml} (99%)
diff --git a/spec/Account_Interface_Addressing.xml b/spec/Account_Interface_Addressing1.xml
similarity index 96%
rename from spec/Account_Interface_Addressing.xml
rename to spec/Account_Interface_Addressing1.xml
index 28c366c..4212811 100644
--- a/spec/Account_Interface_Addressing.xml
+++ b/spec/Account_Interface_Addressing1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2010 Collabora Ltd
This library is free software; you can redistribute it and/or
diff --git a/spec/Account_Interface_Avatar.xml b/spec/Account_Interface_Avatar1.xml
similarity index 98%
rename from spec/Account_Interface_Avatar.xml
rename to spec/Account_Interface_Avatar1.xml
index 6ffe0a0..db77838 100644
--- a/spec/Account_Interface_Avatar.xml
+++ b/spec/Account_Interface_Avatar1.xml
@@ -1,5 +1,5 @@
-
Copyright (C) 2008 Collabora Ltd.
Copyright (C) 2008 Nokia Corporation
diff --git a/spec/Account_Interface_External_Password_Storage.xml b/spec/Account_Interface_External_Password_Storage1.xml
similarity index 97%
rename from spec/Account_Interface_External_Password_Storage.xml
rename to spec/Account_Interface_External_Password_Storage1.xml
index 1224687..cfa07fa 100644
--- a/spec/Account_Interface_External_Password_Storage.xml
+++ b/spec/Account_Interface_External_Password_Storage1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2011 Collabora Ltd.
diff --git a/spec/Account_Interface_Hidden.xml b/spec/Account_Interface_Hidden1.xml
similarity index 98%
rename from spec/Account_Interface_Hidden.xml
rename to spec/Account_Interface_Hidden1.xml
index 3f98c1b..a786360 100644
--- a/spec/Account_Interface_Hidden.xml
+++ b/spec/Account_Interface_Hidden1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2010 Collabora Ltd.
diff --git a/spec/Account_Interface_Storage.xml b/spec/Account_Interface_Storage1.xml
similarity index 99%
rename from spec/Account_Interface_Storage.xml
rename to spec/Account_Interface_Storage1.xml
index f486fbd..8a4809e 100644
--- a/spec/Account_Interface_Storage.xml
+++ b/spec/Account_Interface_Storage1.xml
@@ -1,5 +1,5 @@
-
Copyright (C) 2010 Collabora Ltd.
diff --git a/spec/Account_Manager_Interface_Hidden.xml b/spec/Account_Manager_Interface_Hidden1.xml
similarity index 98%
rename from spec/Account_Manager_Interface_Hidden.xml
rename to spec/Account_Manager_Interface_Hidden1.xml
index 1387e98..2a4d32e 100644
--- a/spec/Account_Manager_Interface_Hidden.xml
+++ b/spec/Account_Manager_Interface_Hidden1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2010 Collabora Ltd.
Copyright © 2010 Nokia Corporation
diff --git a/spec/Call_Content_Interface_Audio_Control.xml b/spec/Call_Content_Interface_Audio_Control1.xml
similarity index 99%
rename from spec/Call_Content_Interface_Audio_Control.xml
rename to spec/Call_Content_Interface_Audio_Control1.xml
index e2c6dce..be7b659 100644
--- a/spec/Call_Content_Interface_Audio_Control.xml
+++ b/spec/Call_Content_Interface_Audio_Control1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2009-2011 Collabora Ltd.
diff --git a/spec/Call_Content_Interface_Video_Control.xml b/spec/Call_Content_Interface_Video_Control1.xml
similarity index 98%
rename from spec/Call_Content_Interface_Video_Control.xml
rename to spec/Call_Content_Interface_Video_Control1.xml
index 80644b4..5da172b 100644
--- a/spec/Call_Content_Interface_Video_Control.xml
+++ b/spec/Call_Content_Interface_Video_Control1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2011 Collabora Ltd.
diff --git a/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml b/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml
similarity index 98%
rename from spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml
rename to spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml
index 29696b8..efefa11 100644
--- a/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml
+++ b/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2005-2010 Nokia Corporation
Copyright © 2005-2010 Collabora Ltd
diff --git a/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml b/spec/Call_Content_Media_Description_Interface_RTCP_Feedback1.xml
similarity index 98%
rename from spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml
rename to spec/Call_Content_Media_Description_Interface_RTCP_Feedback1.xml
index 263b5ee..5a7f067 100644
--- a/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml
+++ b/spec/Call_Content_Media_Description_Interface_RTCP_Feedback1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2005-2010 Nokia Corporation
Copyright © 2005-2010 Collabora Ltd
diff --git a/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml b/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions1.xml
similarity index 97%
rename from spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml
rename to spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions1.xml
index babafec..ef3214a 100644
--- a/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml
+++ b/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2005-2010 Nokia Corporation
Copyright © 2005-2010 Collabora Ltd
diff --git a/spec/Channel_Dispatcher_Interface_Operation_List.xml b/spec/Channel_Dispatcher_Interface_Operation_List1.xml
similarity index 98%
rename from spec/Channel_Dispatcher_Interface_Operation_List.xml
rename to spec/Channel_Dispatcher_Interface_Operation_List1.xml
index 46a22a3..f2d365a 100644
--- a/spec/Channel_Dispatcher_Interface_Operation_List.xml
+++ b/spec/Channel_Dispatcher_Interface_Operation_List1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2008-2009 Collabora Ltd.
diff --git a/spec/Channel_Interface_Addressing.xml b/spec/Channel_Interface_Addressing1.xml
similarity index 97%
rename from spec/Channel_Interface_Addressing.xml
rename to spec/Channel_Interface_Addressing1.xml
index 9fa27b0..9daada9 100644
--- a/spec/Channel_Interface_Addressing.xml
+++ b/spec/Channel_Interface_Addressing1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2010 Collabora Limited
This library is free software; you can redistribute it and/or
diff --git a/spec/Channel_Interface_Anonymity.xml b/spec/Channel_Interface_Anonymity1.xml
similarity index 98%
rename from spec/Channel_Interface_Anonymity.xml
rename to spec/Channel_Interface_Anonymity1.xml
index 54c6216..f98311f 100644
--- a/spec/Channel_Interface_Anonymity.xml
+++ b/spec/Channel_Interface_Anonymity1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2008-2010 Nokia Corporation
diff --git a/spec/Channel_Interface_Chat_State.xml b/spec/Channel_Interface_Chat_State1.xml
similarity index 97%
rename from spec/Channel_Interface_Chat_State.xml
rename to spec/Channel_Interface_Chat_State1.xml
index 7274320..f2f1dab 100644
--- a/spec/Channel_Interface_Chat_State.xml
+++ b/spec/Channel_Interface_Chat_State1.xml
@@ -1,5 +1,5 @@
-
+
Copyright (C) 2007 Collabora Limited
This library is free software; you can redistribute it and/or
diff --git a/spec/Channel_Interface_Conference.xml b/spec/Channel_Interface_Conference1.xml
similarity index 99%
rename from spec/Channel_Interface_Conference.xml
rename to spec/Channel_Interface_Conference1.xml
index a5923b2..41a833c 100644
--- a/spec/Channel_Interface_Conference.xml
+++ b/spec/Channel_Interface_Conference1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2009 Collabora Limited
Copyright © 2009 Nokia Corporation
diff --git a/spec/Channel_Interface_Credentials_Storage.xml b/spec/Channel_Interface_Credentials_Storage1.xml
similarity index 98%
rename from spec/Channel_Interface_Credentials_Storage.xml
rename to spec/Channel_Interface_Credentials_Storage1.xml
index 10ce2ce..0f5226a 100644
--- a/spec/Channel_Interface_Credentials_Storage.xml
+++ b/spec/Channel_Interface_Credentials_Storage1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2011 Collabora Limited
diff --git a/spec/Channel_Interface_DTMF.xml b/spec/Channel_Interface_DTMF1.xml
similarity index 99%
rename from spec/Channel_Interface_DTMF.xml
rename to spec/Channel_Interface_DTMF1.xml
index d8b9a15..b0da4c8 100644
--- a/spec/Channel_Interface_DTMF.xml
+++ b/spec/Channel_Interface_DTMF1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2005-2010 Collabora Limited
Copyright © 2005-2010 Nokia Corporation
Copyright © 2006 INdT
diff --git a/spec/Channel_Interface_Destroyable.xml b/spec/Channel_Interface_Destroyable1.xml
similarity index 98%
rename from spec/Channel_Interface_Destroyable.xml
rename to spec/Channel_Interface_Destroyable1.xml
index 2cc6dc8..e373bf5 100644
--- a/spec/Channel_Interface_Destroyable.xml
+++ b/spec/Channel_Interface_Destroyable1.xml
@@ -1,5 +1,5 @@
-
Copyright (C) 2008 Collabora Ltd.
Copyright (C) 2008 Nokia Corporation
diff --git a/spec/Channel_Interface_File_Transfer_Metadata.xml b/spec/Channel_Interface_File_Transfer_Metadata1.xml
similarity index 98%
rename from spec/Channel_Interface_File_Transfer_Metadata.xml
rename to spec/Channel_Interface_File_Transfer_Metadata1.xml
index ffe1c98..26d3374 100644
--- a/spec/Channel_Interface_File_Transfer_Metadata.xml
+++ b/spec/Channel_Interface_File_Transfer_Metadata1.xml
@@ -1,5 +1,5 @@
-
Copyright (C) 2011 Collabora Ltd.
diff --git a/spec/Channel_Interface_Group.xml b/spec/Channel_Interface_Group1.xml
similarity index 99%
rename from spec/Channel_Interface_Group.xml
rename to spec/Channel_Interface_Group1.xml
index fc40839..ca2201d 100644
--- a/spec/Channel_Interface_Group.xml
+++ b/spec/Channel_Interface_Group1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2005-2009 Collabora Limited
Copyright © 2005-2009 Nokia Corporation
Copyright © 2006 INdT
diff --git a/spec/Channel_Interface_HTML.xml b/spec/Channel_Interface_HTML1.xml
similarity index 99%
rename from spec/Channel_Interface_HTML.xml
rename to spec/Channel_Interface_HTML1.xml
index fca6e12..245ad1b 100644
--- a/spec/Channel_Interface_HTML.xml
+++ b/spec/Channel_Interface_HTML1.xml
@@ -1,5 +1,5 @@
-
Copyright (C) 2008 Collabora Ltd.
Copyright (C) 2008 Nokia Corporation
diff --git a/spec/Channel_Interface_Hold.xml b/spec/Channel_Interface_Hold1.xml
similarity index 98%
rename from spec/Channel_Interface_Hold.xml
rename to spec/Channel_Interface_Hold1.xml
index 96d1f65..9801827 100644
--- a/spec/Channel_Interface_Hold.xml
+++ b/spec/Channel_Interface_Hold1.xml
@@ -1,5 +1,5 @@
-
+
Copyright (C) 2005-2008 Collabora Limited
Copyright (C) 2005-2008 Nokia Corporation
Copyright (C) 2006 INdT
diff --git a/spec/Channel_Interface_Mergeable_Conference.xml b/spec/Channel_Interface_Mergeable_Conference1.xml
similarity index 98%
rename from spec/Channel_Interface_Mergeable_Conference.xml
rename to spec/Channel_Interface_Mergeable_Conference1.xml
index 5ff5d69..91ed105 100644
--- a/spec/Channel_Interface_Mergeable_Conference.xml
+++ b/spec/Channel_Interface_Mergeable_Conference1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2009 Collabora Limited
Copyright © 2009 Nokia Corporation
diff --git a/spec/Channel_Interface_Password.xml b/spec/Channel_Interface_Password1.xml
similarity index 97%
rename from spec/Channel_Interface_Password.xml
rename to spec/Channel_Interface_Password1.xml
index aec04b8..e2a35b8 100644
--- a/spec/Channel_Interface_Password.xml
+++ b/spec/Channel_Interface_Password1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2005-2011 Collabora Limited
Copyright © 2005-2009 Nokia Corporation
diff --git a/spec/Channel_Interface_Picture.xml b/spec/Channel_Interface_Picture1.xml
similarity index 99%
rename from spec/Channel_Interface_Picture.xml
rename to spec/Channel_Interface_Picture1.xml
index ba8f1d6..ae1bbeb 100644
--- a/spec/Channel_Interface_Picture.xml
+++ b/spec/Channel_Interface_Picture1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2011 Collabora Ltd.
diff --git a/spec/Channel_Interface_Room.xml b/spec/Channel_Interface_Room1.xml
similarity index 99%
rename from spec/Channel_Interface_Room.xml
rename to spec/Channel_Interface_Room1.xml
index 8b9d239..f0cad30 100644
--- a/spec/Channel_Interface_Room.xml
+++ b/spec/Channel_Interface_Room1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2010 Collabora Ltd.
diff --git a/spec/Channel_Interface_Room_Config.xml b/spec/Channel_Interface_Room_Config1.xml
similarity index 99%
rename from spec/Channel_Interface_Room_Config.xml
rename to spec/Channel_Interface_Room_Config1.xml
index 8079ef5..9fba3a4 100644
--- a/spec/Channel_Interface_Room_Config.xml
+++ b/spec/Channel_Interface_Room_Config1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2011 Collabora Ltd.
diff --git a/spec/Channel_Interface_SASL_Authentication.xml b/spec/Channel_Interface_SASL_Authentication1.xml
similarity index 99%
rename from spec/Channel_Interface_SASL_Authentication.xml
rename to spec/Channel_Interface_SASL_Authentication1.xml
index 4206789..b58c90e 100644
--- a/spec/Channel_Interface_SASL_Authentication.xml
+++ b/spec/Channel_Interface_SASL_Authentication1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2010 Collabora Limited
diff --git a/spec/Channel_Interface_SMS.xml b/spec/Channel_Interface_SMS1.xml
similarity index 99%
rename from spec/Channel_Interface_SMS.xml
rename to spec/Channel_Interface_SMS1.xml
index eb0225e..f785c8b 100644
--- a/spec/Channel_Interface_SMS.xml
+++ b/spec/Channel_Interface_SMS1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2008–2010 Nokia Corporation
Copyright © 2010 Collabora Ltd.
diff --git a/spec/Channel_Interface_Securable.xml b/spec/Channel_Interface_Securable1.xml
similarity index 98%
rename from spec/Channel_Interface_Securable.xml
rename to spec/Channel_Interface_Securable1.xml
index 9e2dedc..6a139a3 100644
--- a/spec/Channel_Interface_Securable.xml
+++ b/spec/Channel_Interface_Securable1.xml
@@ -1,5 +1,5 @@
-
Copyright (C) 2010 Collabora Ltd.
diff --git a/spec/Channel_Interface_Service_Point.xml b/spec/Channel_Interface_Service_Point1.xml
similarity index 97%
rename from spec/Channel_Interface_Service_Point.xml
rename to spec/Channel_Interface_Service_Point1.xml
index 732b0e6..c2d37e6 100644
--- a/spec/Channel_Interface_Service_Point.xml
+++ b/spec/Channel_Interface_Service_Point1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2005-2010 Nokia Corporation
Copyright © 2005-2010 Collabora Ltd
diff --git a/spec/Channel_Interface_Splittable.xml b/spec/Channel_Interface_Splittable1.xml
similarity index 98%
rename from spec/Channel_Interface_Splittable.xml
rename to spec/Channel_Interface_Splittable1.xml
index 4e29395..52976ed 100644
--- a/spec/Channel_Interface_Splittable.xml
+++ b/spec/Channel_Interface_Splittable1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2009 Collabora Limited
Copyright © 2009 Nokia Corporation
diff --git a/spec/Channel_Interface_Subject.xml b/spec/Channel_Interface_Subject1.xml
similarity index 99%
rename from spec/Channel_Interface_Subject.xml
rename to spec/Channel_Interface_Subject1.xml
index 069a074..a5fee4f 100644
--- a/spec/Channel_Interface_Subject.xml
+++ b/spec/Channel_Interface_Subject1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2010–2011 Collabora Ltd.
diff --git a/spec/Channel_Interface_Tube.xml b/spec/Channel_Interface_Tube1.xml
similarity index 99%
rename from spec/Channel_Interface_Tube.xml
rename to spec/Channel_Interface_Tube1.xml
index 25faccd..e02ce2c 100644
--- a/spec/Channel_Interface_Tube.xml
+++ b/spec/Channel_Interface_Tube1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2008-2009 Collabora Limited
Copyright © 2008-2009 Nokia Corporation
diff --git a/spec/Channel_Type_Call.xml b/spec/Channel_Type_Call1.xml
similarity index 99%
rename from spec/Channel_Type_Call.xml
rename to spec/Channel_Type_Call1.xml
index 9690061..db9f2f8 100644
--- a/spec/Channel_Type_Call.xml
+++ b/spec/Channel_Type_Call1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2009-2010 Collabora Limited
Copyright © 2009-2010 Nokia Corporation
diff --git a/spec/Channel_Type_Contact_Search.xml b/spec/Channel_Type_Contact_Search1.xml
similarity index 99%
rename from spec/Channel_Type_Contact_Search.xml
rename to spec/Channel_Type_Contact_Search1.xml
index 2d8fa45..4c20a8a 100644
--- a/spec/Channel_Type_Contact_Search.xml
+++ b/spec/Channel_Type_Contact_Search1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2005-2009 Collabora Limited
Copyright © 2005-2009 Nokia Corporation
Copyright © 2006 INdT
diff --git a/spec/Channel_Type_DBus_Tube.xml b/spec/Channel_Type_DBus_Tube1.xml
similarity index 98%
rename from spec/Channel_Type_DBus_Tube.xml
rename to spec/Channel_Type_DBus_Tube1.xml
index 5b4c748..21e4ac4 100644
--- a/spec/Channel_Type_DBus_Tube.xml
+++ b/spec/Channel_Type_DBus_Tube1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2008-2009 Collabora Limited
Copyright © 2008-2009 Nokia Corporation
diff --git a/spec/Channel_Type_File_Transfer.xml b/spec/Channel_Type_File_Transfer1.xml
similarity index 99%
rename from spec/Channel_Type_File_Transfer.xml
rename to spec/Channel_Type_File_Transfer1.xml
index cecd3c8..dbfe542 100644
--- a/spec/Channel_Type_File_Transfer.xml
+++ b/spec/Channel_Type_File_Transfer1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2008-2009 Collabora Limited
diff --git a/spec/Channel_Type_Room_List.xml b/spec/Channel_Type_Room_List1.xml
similarity index 98%
rename from spec/Channel_Type_Room_List.xml
rename to spec/Channel_Type_Room_List1.xml
index c5567f8..f462e3a 100644
--- a/spec/Channel_Type_Room_List.xml
+++ b/spec/Channel_Type_Room_List1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2005-2009 Collabora Limited
Copyright © 2005-2009 Nokia Corporation
Copyright © 2006 INdT
diff --git a/spec/Channel_Type_Server_Authentication.xml b/spec/Channel_Type_Server_Authentication1.xml
similarity index 97%
rename from spec/Channel_Type_Server_Authentication.xml
rename to spec/Channel_Type_Server_Authentication1.xml
index eec13cd..461cef0 100644
--- a/spec/Channel_Type_Server_Authentication.xml
+++ b/spec/Channel_Type_Server_Authentication1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2010 Collabora Limited
This library is free software; you can redistribute it and/or
diff --git a/spec/Channel_Type_Server_TLS_Connection.xml b/spec/Channel_Type_Server_TLS_Connection1.xml
similarity index 99%
rename from spec/Channel_Type_Server_TLS_Connection.xml
rename to spec/Channel_Type_Server_TLS_Connection1.xml
index 7d01a8e..89fe43c 100644
--- a/spec/Channel_Type_Server_TLS_Connection.xml
+++ b/spec/Channel_Type_Server_TLS_Connection1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2010 Collabora Limited
diff --git a/spec/Channel_Type_Stream_Tube.xml b/spec/Channel_Type_Stream_Tube1.xml
similarity index 99%
rename from spec/Channel_Type_Stream_Tube.xml
rename to spec/Channel_Type_Stream_Tube1.xml
index 548ea1d..e2f169d 100644
--- a/spec/Channel_Type_Stream_Tube.xml
+++ b/spec/Channel_Type_Stream_Tube1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2008-2009 Collabora Limited
Copyright © 2008-2009 Nokia Corporation
diff --git a/spec/Channel_Type_Text.xml b/spec/Channel_Type_Text1.xml
similarity index 99%
rename from spec/Channel_Type_Text.xml
rename to spec/Channel_Type_Text1.xml
index b78c2c3..c051c94 100644
--- a/spec/Channel_Type_Text.xml
+++ b/spec/Channel_Type_Text1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2005-2011 Collabora Limited
Copyright © 2005-2009 Nokia Corporation
Copyright © 2006 INdT
diff --git a/spec/Connection_Interface_Addressing.xml b/spec/Connection_Interface_Addressing1.xml
similarity index 98%
rename from spec/Connection_Interface_Addressing.xml
rename to spec/Connection_Interface_Addressing1.xml
index b617134..6bec6d6 100644
--- a/spec/Connection_Interface_Addressing.xml
+++ b/spec/Connection_Interface_Addressing1.xml
@@ -1,5 +1,5 @@
-
+
Copyright (C) 2010 Collabora Limited
This library is free software; you can redistribute it and/or modify it
diff --git a/spec/Connection_Interface_Aliasing.xml b/spec/Connection_Interface_Aliasing1.xml
similarity index 98%
rename from spec/Connection_Interface_Aliasing.xml
rename to spec/Connection_Interface_Aliasing1.xml
index 7fa5bcc..676f04e 100644
--- a/spec/Connection_Interface_Aliasing.xml
+++ b/spec/Connection_Interface_Aliasing1.xml
@@ -1,5 +1,5 @@
-
+
Copyright (C) 2005, 2006 Collabora Limited
Copyright (C) 2005, 2006 Nokia Corporation
Copyright (C) 2006 INdT
diff --git a/spec/Connection_Interface_Anonymity.xml b/spec/Connection_Interface_Anonymity1.xml
similarity index 99%
rename from spec/Connection_Interface_Anonymity.xml
rename to spec/Connection_Interface_Anonymity1.xml
index 788610a..8e626d0 100644
--- a/spec/Connection_Interface_Anonymity.xml
+++ b/spec/Connection_Interface_Anonymity1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2008-2010 Nokia Corporation
diff --git a/spec/Connection_Interface_Avatars.xml b/spec/Connection_Interface_Avatars1.xml
similarity index 99%
rename from spec/Connection_Interface_Avatars.xml
rename to spec/Connection_Interface_Avatars1.xml
index 889d902..e204098 100644
--- a/spec/Connection_Interface_Avatars.xml
+++ b/spec/Connection_Interface_Avatars1.xml
@@ -1,5 +1,5 @@
-
+
Copyright (C) 2005-2008 Collabora Limited
Copyright (C) 2005-2008 Nokia Corporation
Copyright (C) 2006 INdT
diff --git a/spec/Connection_Interface_Balance.xml b/spec/Connection_Interface_Balance1.xml
similarity index 99%
rename from spec/Connection_Interface_Balance.xml
rename to spec/Connection_Interface_Balance1.xml
index 8e737aa..a01b824 100644
--- a/spec/Connection_Interface_Balance.xml
+++ b/spec/Connection_Interface_Balance1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2009 Collabora Ltd.
Copyright © 2009 Nokia Corporation
diff --git a/spec/Connection_Interface_Cellular.xml b/spec/Connection_Interface_Cellular1.xml
similarity index 99%
rename from spec/Connection_Interface_Cellular.xml
rename to spec/Connection_Interface_Cellular1.xml
index 83ba19d..d5f6697 100644
--- a/spec/Connection_Interface_Cellular.xml
+++ b/spec/Connection_Interface_Cellular1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2008-2010 Nokia Corporation
diff --git a/spec/Connection_Interface_Client_Types.xml b/spec/Connection_Interface_Client_Types1.xml
similarity index 99%
rename from spec/Connection_Interface_Client_Types.xml
rename to spec/Connection_Interface_Client_Types1.xml
index c08d8c1..753da3c 100644
--- a/spec/Connection_Interface_Client_Types.xml
+++ b/spec/Connection_Interface_Client_Types1.xml
@@ -1,5 +1,5 @@
-
Copyright (C) 2010 Collabora Ltd.
diff --git a/spec/Connection_Interface_Communication_Policy.xml b/spec/Connection_Interface_Communication_Policy1.xml
similarity index 99%
rename from spec/Connection_Interface_Communication_Policy.xml
rename to spec/Connection_Interface_Communication_Policy1.xml
index e9797ab..33e9c56 100644
--- a/spec/Connection_Interface_Communication_Policy.xml
+++ b/spec/Connection_Interface_Communication_Policy1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2010 Collabora Limited
diff --git a/spec/Connection_Interface_Contact_Blocking.xml b/spec/Connection_Interface_Contact_Blocking1.xml
similarity index 98%
rename from spec/Connection_Interface_Contact_Blocking.xml
rename to spec/Connection_Interface_Contact_Blocking1.xml
index c524a07..594aff3 100644
--- a/spec/Connection_Interface_Contact_Blocking.xml
+++ b/spec/Connection_Interface_Contact_Blocking1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2009–2011 Collabora Ltd.
Copyright © 2009 Nokia Corporation
diff --git a/spec/Connection_Interface_Contact_Capabilities.xml b/spec/Connection_Interface_Contact_Capabilities1.xml
similarity index 99%
rename from spec/Connection_Interface_Contact_Capabilities.xml
rename to spec/Connection_Interface_Contact_Capabilities1.xml
index bddc35c..4a04f30 100644
--- a/spec/Connection_Interface_Contact_Capabilities.xml
+++ b/spec/Connection_Interface_Contact_Capabilities1.xml
@@ -1,5 +1,5 @@
-
+
Copyright (C) 2005, 2006, 2008 Collabora Limited
Copyright (C) 2005, 2006, 2008 Nokia Corporation
Copyright (C) 2006 INdT
diff --git a/spec/Connection_Interface_Contact_Groups.xml b/spec/Connection_Interface_Contact_Groups1.xml
similarity index 99%
rename from spec/Connection_Interface_Contact_Groups.xml
rename to spec/Connection_Interface_Contact_Groups1.xml
index cd86c75..68ee9cc 100644
--- a/spec/Connection_Interface_Contact_Groups.xml
+++ b/spec/Connection_Interface_Contact_Groups1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2009-2010 Collabora Ltd.
Copyright © 2009 Nokia Corporation
diff --git a/spec/Connection_Interface_Contact_Info.xml b/spec/Connection_Interface_Contact_Info1.xml
similarity index 99%
rename from spec/Connection_Interface_Contact_Info.xml
rename to spec/Connection_Interface_Contact_Info1.xml
index 88812ca..6056b6a 100644
--- a/spec/Connection_Interface_Contact_Info.xml
+++ b/spec/Connection_Interface_Contact_Info1.xml
@@ -1,5 +1,5 @@
-
+
Copyright (C) 2008 Collabora Limited
Copyright (C) 2008 Nokia Corporation
diff --git a/spec/Connection_Interface_Contact_List.xml b/spec/Connection_Interface_Contact_List1.xml
similarity index 99%
rename from spec/Connection_Interface_Contact_List.xml
rename to spec/Connection_Interface_Contact_List1.xml
index 714ea39..895bbbb 100644
--- a/spec/Connection_Interface_Contact_List.xml
+++ b/spec/Connection_Interface_Contact_List1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2009-2010 Collabora Ltd.
Copyright © 2009 Nokia Corporation
diff --git a/spec/Connection_Interface_Forwarding.xml b/spec/Connection_Interface_Forwarding1.xml
similarity index 99%
rename from spec/Connection_Interface_Forwarding.xml
rename to spec/Connection_Interface_Forwarding1.xml
index ab680ef..60aab7a 100644
--- a/spec/Connection_Interface_Forwarding.xml
+++ b/spec/Connection_Interface_Forwarding1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2005-2010 Nokia Corporation
diff --git a/spec/Connection_Interface_Keepalive.xml b/spec/Connection_Interface_Keepalive1.xml
similarity index 98%
rename from spec/Connection_Interface_Keepalive.xml
rename to spec/Connection_Interface_Keepalive1.xml
index f39b23a..e2c32dc 100644
--- a/spec/Connection_Interface_Keepalive.xml
+++ b/spec/Connection_Interface_Keepalive1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2010 Collabora Ltd.
diff --git a/spec/Connection_Interface_Location.xml b/spec/Connection_Interface_Location1.xml
similarity index 99%
rename from spec/Connection_Interface_Location.xml
rename to spec/Connection_Interface_Location1.xml
index 6fba12e..1f717eb 100644
--- a/spec/Connection_Interface_Location.xml
+++ b/spec/Connection_Interface_Location1.xml
@@ -1,5 +1,5 @@
-
Copyright (C) 2008 Collabora Ltd.
Copyright (C) 2008 Nokia Corporation
diff --git a/spec/Connection_Interface_Mail_Notification.xml b/spec/Connection_Interface_Mail_Notification1.xml
similarity index 99%
rename from spec/Connection_Interface_Mail_Notification.xml
rename to spec/Connection_Interface_Mail_Notification1.xml
index 0fff4f3..b8ef504 100644
--- a/spec/Connection_Interface_Mail_Notification.xml
+++ b/spec/Connection_Interface_Mail_Notification1.xml
@@ -1,5 +1,5 @@
-
Copyright (C) 2007 Collabora Limited
diff --git a/spec/Connection_Interface_Power_Saving.xml b/spec/Connection_Interface_Power_Saving1.xml
similarity index 99%
rename from spec/Connection_Interface_Power_Saving.xml
rename to spec/Connection_Interface_Power_Saving1.xml
index 80879ca..c491380 100644
--- a/spec/Connection_Interface_Power_Saving.xml
+++ b/spec/Connection_Interface_Power_Saving1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2007-2010 Collabora Limited
diff --git a/spec/Connection_Interface_Presence.xml b/spec/Connection_Interface_Presence1.xml
similarity index 99%
rename from spec/Connection_Interface_Presence.xml
rename to spec/Connection_Interface_Presence1.xml
index 3e77513..1e27cc2 100644
--- a/spec/Connection_Interface_Presence.xml
+++ b/spec/Connection_Interface_Presence1.xml
@@ -1,5 +1,5 @@
-
+
Copyright (C) 2005-2008 Collabora Limited
Copyright (C) 2005, 2006 Nokia Corporation
Copyright (C) 2006 INdT
diff --git a/spec/Connection_Interface_Renaming.xml b/spec/Connection_Interface_Renaming1.xml
similarity index 97%
rename from spec/Connection_Interface_Renaming.xml
rename to spec/Connection_Interface_Renaming1.xml
index 1fd7488..15b7a9a 100644
--- a/spec/Connection_Interface_Renaming.xml
+++ b/spec/Connection_Interface_Renaming1.xml
@@ -1,5 +1,5 @@
-
+
Copyright (C) 2005, 2006 Collabora Limited
Copyright (C) 2005, 2006 Nokia Corporation
Copyright (C) 2006 INdT
diff --git a/spec/Connection_Interface_Resources.xml b/spec/Connection_Interface_Resources1.xml
similarity index 99%
rename from spec/Connection_Interface_Resources.xml
rename to spec/Connection_Interface_Resources1.xml
index 0f39ba2..ca7dddd 100644
--- a/spec/Connection_Interface_Resources.xml
+++ b/spec/Connection_Interface_Resources1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2010 Collabora Ltd.
diff --git a/spec/Connection_Interface_Service_Point.xml b/spec/Connection_Interface_Service_Point1.xml
similarity index 97%
rename from spec/Connection_Interface_Service_Point.xml
rename to spec/Connection_Interface_Service_Point1.xml
index 9daf3e9..a650141 100644
--- a/spec/Connection_Interface_Service_Point.xml
+++ b/spec/Connection_Interface_Service_Point1.xml
@@ -1,5 +1,5 @@
-
+
Copyright © 2005-2010 Nokia Corporation
Copyright © 2005-2010 Collabora Ltd
diff --git a/spec/Connection_Manager_Interface_Account_Storage.xml b/spec/Connection_Manager_Interface_Account_Storage1.xml
similarity index 98%
rename from spec/Connection_Manager_Interface_Account_Storage.xml
rename to spec/Connection_Manager_Interface_Account_Storage1.xml
index 2229afe..a3af965 100644
--- a/spec/Connection_Manager_Interface_Account_Storage.xml
+++ b/spec/Connection_Manager_Interface_Account_Storage1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2011 Collabora Ltd.
diff --git a/spec/Debug.xml b/spec/Debug1.xml
similarity index 99%
rename from spec/Debug.xml
rename to spec/Debug1.xml
index fd491c5..ae98c2d 100644
--- a/spec/Debug.xml
+++ b/spec/Debug1.xml
@@ -1,5 +1,5 @@
-
Copyright (C) 2009 Collabora Ltd.
diff --git a/spec/Protocol_Interface_Addressing.xml b/spec/Protocol_Interface_Addressing1.xml
similarity index 99%
rename from spec/Protocol_Interface_Addressing.xml
rename to spec/Protocol_Interface_Addressing1.xml
index 84501b4..d3abe06 100644
--- a/spec/Protocol_Interface_Addressing.xml
+++ b/spec/Protocol_Interface_Addressing1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2010 Collabora Ltd.
diff --git a/spec/Protocol_Interface_Avatars.xml b/spec/Protocol_Interface_Avatars1.xml
similarity index 99%
rename from spec/Protocol_Interface_Avatars.xml
rename to spec/Protocol_Interface_Avatars1.xml
index 6612429..9faefe6 100644
--- a/spec/Protocol_Interface_Avatars.xml
+++ b/spec/Protocol_Interface_Avatars1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2009-2010 Collabora Ltd.
diff --git a/spec/Protocol_Interface_Presence.xml b/spec/Protocol_Interface_Presence1.xml
similarity index 99%
rename from spec/Protocol_Interface_Presence.xml
rename to spec/Protocol_Interface_Presence1.xml
index 52fe28f..9ae79e5 100644
--- a/spec/Protocol_Interface_Presence.xml
+++ b/spec/Protocol_Interface_Presence1.xml
@@ -1,5 +1,5 @@
-
Copyright © 2009-2010 Collabora Ltd.
diff --git a/spec/all.xml b/spec/all.xml
index fbb1049..64330ad 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -32,11 +32,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
+
-
-
-
+
+
+
@@ -62,9 +62,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-
+
+
+
@@ -77,15 +77,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -96,16 +96,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -130,15 +130,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Each Channel implements one of the following types:
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -151,21 +151,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -173,9 +173,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
namespace='imt1.Channel.Type'>Text.
-
-
-
+
+
+
@@ -184,8 +184,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
namespace='imt1.Channel.Type'>Call1.
-
-
+
+
@@ -197,9 +197,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
channels, but may also appear on other types of channel.
-
-
-
+
+
+
@@ -219,20 +219,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
+
+
-
-
+
+
+ href="Call_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml"/>
-
+
@@ -246,13 +246,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
+
-
-
-
-
-
+
+
+
+
+
@@ -264,7 +264,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
+
diff --git a/spec/template.xml b/spec/template.xml
index 33cc0e1..f5a9529 100644
--- a/spec/template.xml
+++ b/spec/template.xml
@@ -1,5 +1,5 @@
-
Copyright © 2010 Collabora Ltd.
--
1.7.9