[telepathy-glib/master] Start 0.10.1 development

[Simon McVittie]

* Simplify instructions in configure.ac: this branch shouldn't gain API
* Upload 0.10.x docs to .../telepathy-glib-0.10.x/ in future
* Ask people to report bugs with ...&version=0.10
---
 Makefile.am  |    2 +-
 NEWS         |    5 +++++
 configure.ac |   19 +++++--------------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0dd0366..ef2a8a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ check-valgrind:
 maintainer-upload-release: _maintainer-upload-release-local
 _maintainer-upload-release-local: _maintainer-upload-release-check
 	rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX docs/reference/html/ \
-	telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib/
+	telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib-0.10.x/
 
 BRANCH = $(shell sh tools/git-which-branch.sh misc | tr -d '\n' | tr -C "[:alnum:]" _)
 UPLOAD_BRANCH_TO = people.freedesktop.org:public_html/telepathy-glib
diff --git a/NEWS b/NEWS
index 76de10a..4d8fbb3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+telepathy-glib 0.10.1 (UNRELEASED)
+==================================
+
+...
+
 telepathy-glib 0.10.0 (2010-01-21)
 ==================================
 
diff --git a/configure.ac b/configure.ac
index dafb17b..e0a1248 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,20 +12,11 @@ AC_PREREQ([2.59])
 m4_define([tp_glib_major_version], [0])
 m4_define([tp_glib_minor_version], [10])
 m4_define([tp_glib_micro_version], [0])
-m4_define([tp_glib_nano_version], [0])
-
-# If library source has changed since last release, increment revision
-# If interfaces have been added, removed or changed since last release,
-#  increment current and set revision to 0
-# If interfaces have been added since last release, increment age
-# 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/0.7.3.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).
+m4_define([tp_glib_nano_version], [1])
 
+# If library source has changed since last release, increment revision.
+# Do not add new API or ABI, or make incompatible changes, on this branch
+# (which means that current and age should remain 32).
 m4_define([tp_glib_lt_current], [32])
 m4_define([tp_glib_lt_revision], [1])
 m4_define([tp_glib_lt_age], [32])
@@ -38,7 +29,7 @@ m4_define([tp_glib_version],
               [tp_glib_base_version].[tp_glib_nano_version])])
 
 AC_INIT([Telepathy-GLib], [tp_glib_version],
-        [https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-glib])
+        [https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-glib&version=0.10])
 
 AC_CONFIG_MACRO_DIR([m4])
 
-- 
1.5.6.5