[telepathy-qt4/master] Prepare version 0.2.1

[Simon McVittie]

---
 NEWS         |   30 +++++++++++++++++++++++++++++-
 configure.ac |    8 ++++----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index d0c92ec..05aaa03 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,40 @@
-telepathy-qt4 0.2.9999 (UNRELEASED)
+telepathy-qt4 0.2.1 (2009-12-04)
 ================================
 
+The "all you want, only better" release.
+
 Fixes:
 
 * fd.o #25058: reduce the scope of our workaround for Qt 4.5 bug
   <http://qt.gitorious.org/qt/qt/merge_requests/1657>, fixing compilation
   against Qt versions >= 4.6 beta, where this bug has been fixed (smcv)
 
+* Avoid the installed AccountManager (if any) being service-activated during
+  distcheck under some circumstances (smcv)
+
+* Compile with symbols hidden by default, explicitly export a few
+  symbols that were mistakenly not exported, and improve the code generation
+  tools to be more correct about their exports (smcv)
+
+* Improve the code-generation tools to cope with UTF-8 in the spec (wjt, smcv)
+
+* Enable Automake 1.11 silent building (./configure --enable-silent-rules
+  to enable this) (wjt)
+
+Code generation release notes:
+
+* qt4-types-gen.py and qt4-client-gen.py previously forced the generated
+  classes to be exported, in a way that's not actually correct for code outside
+  telepathy-qt4 (the TELEPATHY_QT4_EXPORT macro).
+  
+  They now use a macro set by --visibility, defaulting to nothing; if you're
+  building a shared library with -fvisibility=hidden, or supporting Windows,
+  you may need to use --visibility=YOUR_LIB_EXPORT when running these scripts.
+
+  See TelepathyQt4/global.h or QtDBus/qdbusmacros.h for an example of setting
+  up such a macro (unfortunately, the only correct way to do this seems to be
+  for each shared library to define its own).
+
 telepathy-qt4 0.2.0 (2009-11-10)
 ================================
 
diff --git a/configure.ac b/configure.ac
index dff3d6a..b2a9202 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,8 @@ AC_PREREQ([2.59])
 
 m4_define([tp_qt4_major_version], [0])
 m4_define([tp_qt4_minor_version], [2])
-m4_define([tp_qt4_micro_version], [9999])
-m4_define([tp_qt4_nano_version], [1])
+m4_define([tp_qt4_micro_version], [1])
+m4_define([tp_qt4_nano_version], [0])
 
 # If library source has changed since last release, increment revision
 # If interfaces have been added, removed or changed since last release,
@@ -26,9 +26,9 @@ m4_define([tp_qt4_nano_version], [1])
 # (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_qt4_lt_current], [0])
+m4_define([tp_qt4_lt_current], [1])
 m4_define([tp_qt4_lt_revision], [0])
-m4_define([tp_qt4_lt_age], [0])
+m4_define([tp_qt4_lt_age], [1])
 
 # Some magic
 m4_define([tp_qt4_base_version],
-- 
1.5.6.5