[next] telepathy-glib: telepathy-glib: micro-manage ABI a bit less

[Simon McVittie]

Module: telepathy-glib
Branch: next
Commit: 5d1ab70aa9b51ff493c838f422cfa1c1c4ba3af9
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=5d1ab70aa9b51ff493c838f422cfa1c1c4ba3af9

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Mar 21 13:48:09 2014 +0000

telepathy-glib: micro-manage ABI a bit less

A symbols version per development release seems like overkill;
all we really need is a symbols version per stable release.

Since 0.23.0 we no longer guarantee ABI within a development branch
anyway (the same as GLib), although we'll do our best not to break it.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=76462
Reviewed-by: Xavier Claessens

---

 configure.ac                                             |    9 +++++----
 telepathy-glib/abi.am                                    |    6 +++---
 telepathy-glib/versions/{core-1.0.0.abi => core-1.0.abi} |    4 ++--
 telepathy-glib/versions/{dbus-1.0.0.abi => dbus-1.0.abi} |    4 ++--
 telepathy-glib/versions/{main-1.0.0.abi => main-1.0.abi} |    4 ++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8b84588..fa4262f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,10 +25,11 @@ m4_define([tp_glib_nano_version], [1])
 # If interfaces have been removed since last release, set age to 0
 #
 # If interfaces have been added, release builds will fail unless you add a new
-# file like telepathy-glib/versions/1.1.0.abi to add them to the official ABI.
-# This also forces binaries built against devel versions to be rebuilt
-# (we don't guarantee that we won't add ABI then remove it again, if it was
-# never seen in a release).
+# file like telepathy-glib/versions/core-1.2.abi to add them to the official
+# ABI of the next stable branch. This also forces binaries built against
+# devel versions to be rebuilt (we don't guarantee that we won't add ABI in
+# a development branch then remove it again, particularly if it was never
+# seen in a release).
 
 # These are shared by libtelepathy-glib-1 and libtelepathy-glib-1-core
 m4_define([tp_glib_lt_current], [0])
diff --git a/telepathy-glib/abi.am b/telepathy-glib/abi.am
index 8d91674..29933d7 100644
--- a/telepathy-glib/abi.am
+++ b/telepathy-glib/abi.am
@@ -1,9 +1,9 @@
 # To be included by Makefile.am.
 
 ABI_LISTS = \
-    versions/core-1.0.0.abi \
-    versions/dbus-1.0.0.abi \
-    versions/main-1.0.0.abi \
+    versions/core-1.0.abi \
+    versions/dbus-1.0.abi \
+    versions/main-1.0.abi \
     $(NULL)
 
 # The quoting here is unnecessary but harmless, and has the useful side-effect
diff --git a/telepathy-glib/versions/core-1.0.0.abi b/telepathy-glib/versions/core-1.0.abi
similarity index 56%
rename from telepathy-glib/versions/core-1.0.0.abi
rename to telepathy-glib/versions/core-1.0.abi
index 60a381f..1f8455d 100644
--- a/telepathy-glib/versions/core-1.0.0.abi
+++ b/telepathy-glib/versions/core-1.0.abi
@@ -1,6 +1,6 @@
-Version: TELEPATHY_GLIB_CORE_1.0.0
+Version: TELEPATHY_GLIB_CORE_1.0
 Extends: -
-Release: 1.0.0
+Release: 1.0
 
 # just to have something in this file
 tp_error_quark
diff --git a/telepathy-glib/versions/dbus-1.0.0.abi b/telepathy-glib/versions/dbus-1.0.abi
similarity index 62%
rename from telepathy-glib/versions/dbus-1.0.0.abi
rename to telepathy-glib/versions/dbus-1.0.abi
index b1ce61a..4da73cf 100644
--- a/telepathy-glib/versions/dbus-1.0.0.abi
+++ b/telepathy-glib/versions/dbus-1.0.abi
@@ -1,6 +1,6 @@
-Version: TELEPATHY_GLIB_DBUS_1.0.0
+Version: TELEPATHY_GLIB_DBUS_1.0
 Extends: -
-Release: 1.0.0
+Release: 1.0
 
 # just to have something in this file
 tp_iface_quark_connection_manager
diff --git a/telepathy-glib/versions/main-1.0.0.abi b/telepathy-glib/versions/main-1.0.abi
similarity index 60%
rename from telepathy-glib/versions/main-1.0.0.abi
rename to telepathy-glib/versions/main-1.0.abi
index daef347..4199150 100644
--- a/telepathy-glib/versions/main-1.0.0.abi
+++ b/telepathy-glib/versions/main-1.0.abi
@@ -1,6 +1,6 @@
-Version: TELEPATHY_GLIB_1.0.0
+Version: TELEPATHY_GLIB_1.0
 Extends: -
-Release: 1.0.0
+Release: 1.0
 
 # just to have something in this file
 tp_account_get_type