Merge commit '1791e84e583eb268bbcb82e05801ba6dd0137ab3' into next

Conflicts:
	NEWS

14 files changed, 22 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 79e4b57a..6d050726 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,12 @@ DISTNAME := telepathy-spec-$(VERSION)
 GENERATED_FILES = \
 	doc/spec/index.html \
 	FIXME.out \
+	doc/spec/NEWS \
 	$(NULL)
 
+doc/spec/NEWS: NEWS
+	install -m644 $< $@
+
 doc/spec/index.html: $(XMLS) tools/doc-generator.py tools/specparser.py $(TEMPLATES)
 	rm -rf doc/spec
 	install -d doc/spec
@@ -74,8 +78,7 @@ maintainer-upload-release: doc/spec/index.html check
 	gpg --verify telepathy-spec-$(VERSION).tar.gz.asc
 	rsync -vzP telepathy-spec-$(VERSION).tar.gz telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/telepathy-spec/
 	rsync -vzP telepathy-spec-$(VERSION).tar.gz.asc telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/telepathy-spec/
-	rsync $(DOC_RSYNC_FLAGS) doc/spec/ telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/spec/
-	rsync $(DOC_RSYNC_FLAGS) doc/spec/ telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/spec-snapshot/
+	rsync $(DOC_RSYNC_FLAGS) doc/spec/ telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/spec-next/
 
 dist: check
 	@install -d tmp
diff --git a/NEWS b/NEWS
index 83a88c70..9649b609 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
-Telepathy 0.99.1 (2013-09-16)
+Telepathy 0.99.1 (2013-09-17)
 =============================
 
+The “house of cards” release.
+
 This is the first snapshot towards Telepathy 1, a new major version of
 Telepathy. It is not usable yet - we're releasing this snapshot so we
 have a reference point for converting everything else.
diff --git a/spec/Channel.xml b/spec/Channel.xml
index 136b0776..ef5bf5e8 100644
--- a/spec/Channel.xml
+++ b/spec/Channel.xml
@@ -397,7 +397,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       as a prefix.
     </tp:changed>
 
-    <tp:changed version="UNRELEASED">Deprecated methods
+    <tp:changed version="0.99.1">Deprecated methods
       (GetChannelType, GetHandle, and GetInterfaces) have been removed
       from this interface.</tp:changed>
   </interface>
diff --git a/spec/Channel_Interface_Group1.xml b/spec/Channel_Interface_Group1.xml
index 1204c322..ffe0af3e 100644
--- a/spec/Channel_Interface_Group1.xml
+++ b/spec/Channel_Interface_Group1.xml
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   </tp:license>
   <interface name="im.telepathy1.Channel.Interface.Group1">
     <tp:requires interface="im.telepathy1.Channel"/>
-    <tp:changed version="UNRELEASED">Deprecated methods, signals, and
+    <tp:changed version="0.99.1">Deprecated methods, signals, and
       properties have all been removed.</tp:changed>
 
     <tp:struct name="Local_Pending_Info" array-name="Local_Pending_Info_List">
diff --git a/spec/Channel_Interface_Tube1.xml b/spec/Channel_Interface_Tube1.xml
index 6a16880e..cacc2533 100644
--- a/spec/Channel_Interface_Tube1.xml
+++ b/spec/Channel_Interface_Tube1.xml
@@ -182,7 +182,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     <tp:enum name="Socket_Access_Control" type="u"
       array-name="Socket_Access_Control_List">
-      <tp:changed version="UNRELEASED">The deprecated Netmask enum
+      <tp:changed version="0.99.1">The deprecated Netmask enum
         value has been removed.</tp:changed>
       <tp:enumvalue suffix="Localhost" value="0">
         <tp:docstring>
diff --git a/spec/Channel_Type_Contact_Search1.xml b/spec/Channel_Type_Contact_Search1.xml
index 4c20a8a7..8503cddd 100644
--- a/spec/Channel_Type_Contact_Search1.xml
+++ b/spec/Channel_Type_Contact_Search1.xml
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       rather than handles; consequently, the values need not include
       <tt>x-telepathy-identifier</tt>.
     </tp:added>
-    <tp:changed version="UNRELEASED">
+    <tp:changed version="0.99.1">
       The requestable channel class now fixes TargetHandleType=NONE.
     </tp:changed>
 
diff --git a/spec/Channel_Type_Text.xml b/spec/Channel_Type_Text.xml
index b50beb80..b848bf09 100644
--- a/spec/Channel_Type_Text.xml
+++ b/spec/Channel_Type_Text.xml
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       namespace='imt1.Channel.Interface'>Subject1</tp:dbus-ref> and
       <tp:dbus-ref namespace='imt1.Channel.Interface'>RoomConfig1</tp:dbus-ref>
       interfaces.</tp:changed>
-    <tp:changed version="UNRELEASED">Deprecated methods and types have
+    <tp:changed version="0.99.1">Deprecated methods and types have
       removed from this interface. Additionally, this interface has
       been merged with the old, now-removed, Messages interface as it
       was a requirement since version 0.21.5.</tp:changed>
diff --git a/spec/Connection.xml b/spec/Connection.xml
index 4347776c..f21059b0 100644
--- a/spec/Connection.xml
+++ b/spec/Connection.xml
@@ -81,9 +81,6 @@ USA.</p>
         is not yet in the CONNECTED state, this signal is not guaranteed
         to be emitted.
       </tp:docstring>
-      <tp:added version="0.UNRELEASED">Clients MAY assume that if the
-        SelfHandle and SelfID property exists, this signal will be emitted when
-        necessary.</tp:added>
 
       <arg type="u" tp:type="Contact_Handle" name="Self_Handle">
         <tp:docstring>
@@ -120,7 +117,7 @@ USA.</p>
         If the connection is not yet in the CONNECTED state, the value of
         this property MAY be empty string.
       </tp:docstring>
-      <tp:added version="0.UNRELEASED"/>
+      <tp:added version="0.99.1"/>
     </property>
 
     <property name="Status" tp:name-for-bindings="Status"
@@ -743,7 +740,7 @@ USA.</p>
       are now mandatory. Their functionality will be merged into the main
       Connection interface at some point in future.</tp:changed>
 
-    <tp:changed version="UNRELEASED">All deprecated types, methods,
+    <tp:changed version="0.99.1">All deprecated types, methods,
       and signals have been removed from this interface including
       anything to do with handle reference counting.</tp:changed>
 
diff --git a/spec/Connection_Interface_Aliasing1.xml b/spec/Connection_Interface_Aliasing1.xml
index a5614acd..55b11dca 100644
--- a/spec/Connection_Interface_Aliasing1.xml
+++ b/spec/Connection_Interface_Aliasing1.xml
@@ -59,7 +59,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     <property name="AliasFlags"
       tp:name-for-bindings="Alias_Flags" type="u" access="read"
       tp:immutable="yes">
-      <tp:added version="0.UNRELEASED"/>
+      <tp:added version="0.99.1"/>
       <tp:docstring>
         A bitwise OR of flags from ConnectionAliasFlags detailing the behaviour
         of aliases on this connection.
diff --git a/spec/Connection_Interface_Avatars1.xml b/spec/Connection_Interface_Avatars1.xml
index e2040984..1d3f4626 100644
--- a/spec/Connection_Interface_Avatars1.xml
+++ b/spec/Connection_Interface_Avatars1.xml
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   </tp:license>
   <interface name="im.telepathy1.Connection.Interface.Avatars1">
     <tp:requires interface="im.telepathy1.Connection"/>
-    <tp:changed version="UNRELEASED">The deprecated method,
+    <tp:changed version="0.99.1">The deprecated method,
       GetAvatarRequirements, has been removed in favour of using the
       D-Bus properties instead.</tp:changed>
 
diff --git a/spec/Connection_Interface_Contact_List1.xml b/spec/Connection_Interface_Contact_List1.xml
index 2c0cbf97..a1ff6802 100644
--- a/spec/Connection_Interface_Contact_List1.xml
+++ b/spec/Connection_Interface_Contact_List1.xml
@@ -21,7 +21,7 @@
   <interface name="im.telepathy1.Connection.Interface.ContactList1">
     <tp:requires interface="im.telepathy1.Connection"/>
     <tp:added version="0.21.0">(as stable API)</tp:added>
-    <tp:changed version="UNRELEASED">The deprecated ContactsChanged
+    <tp:changed version="0.99.1">The deprecated ContactsChanged
       signal has been replaced with the ContactsChangedWithID
       version.</tp:changed>
 
diff --git a/spec/Connection_Interface_Requests.xml b/spec/Connection_Interface_Requests.xml
index 1d825d95..8707630b 100644
--- a/spec/Connection_Interface_Requests.xml
+++ b/spec/Connection_Interface_Requests.xml
@@ -374,7 +374,7 @@
       <tp:added version="0.17.11">(as stable API)</tp:added>
       <tp:changed version="0.17.14">Added a guarantee of ordering
         relative to the old NewChannel signal (now removed)</tp:changed>
-      <tp:changed version="0.UNRELEASED">Added recommendation against
+      <tp:changed version="0.27.1">Added recommendation against
         announcing channels together</tp:changed>
 
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Connection_Interface_Sidecars1.xml b/spec/Connection_Interface_Sidecars1.xml
index 08fe37da..3ab8b27d 100644
--- a/spec/Connection_Interface_Sidecars1.xml
+++ b/spec/Connection_Interface_Sidecars1.xml
@@ -22,7 +22,7 @@
 
   <interface name="im.telepathy1.Connection.Interface.Sidecars1">
     <tp:requires interface="im.telepathy1.Connection"/>
-    <tp:added version="0.UNRELEASED">from Connection.FUTURE</tp:added>
+    <tp:added version="0.99.1">from Connection.FUTURE</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>A <a href="http://en.wikipedia.org/wiki/Sidecar">sidecar</a>
diff --git a/spec/Connection_Manager.xml b/spec/Connection_Manager.xml
index 090908a3..37c0c9f6 100644
--- a/spec/Connection_Manager.xml
+++ b/spec/Connection_Manager.xml
@@ -103,7 +103,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
       <tp:changed version="0.17.1">Prior to version 0.17.1, the allowed
         characters were not specified</tp:changed>
-      <tp:changed version="UNRELEASED">
+      <tp:changed version="0.99.1">
         In Telepathy 0.x, protocol names could contain hyphen/minus signs,
         but not underscores.
       </tp:changed>
@@ -589,7 +589,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     <tp:changed version="0.25.2">Prior to version 0.25.2 the
       serialization of object-path arrays (signature 'ao') was not
       defined</tp:changed>
-    <tp:changed version="0.UNRELEASED">GetParameters and ListProtocols
+    <tp:changed version="0.99.1">GetParameters and ListProtocols
       have been removed in favour of the
       <tp:member-ref>Protocols</tp:member-ref> property.</tp:changed>
   </interface>