Prepare for release

svn path=/trunk/; revision=485

diff --git a/Makefile.am b/Makefile.am
index 374608ff63eaecd4bff548db1b12506b8723a3ea..b8aa51d26517e6a3ad22a3b87cebdc446f5cb529 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollke
 # Build ChangeLog from SVN history (r470 was the first ChangeLog-less checkin).
 # Only build this when in an svn checkout.
 
-ChangeLog:
+ChangeLog: ChangeLog.old
        @if test -f $(top_srcdir)/.svn/entries; then \
                svn log -v --xml -r HEAD:470 $(SVN_ROOT)/$(SVN_MODULE) | \
                        xsltproc --stringparam strip-prefix "$(SVN_MODULE)/$(SVN_BRANCH)" \

diff --git a/NEWS b/NEWS
index db393af808fc6a0ca17d4c00f4b7c1c0e4560af3..c99cdd3ebf183ac248fb1b17dc229e2331a69781 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+NEW in 0.21.4:
+=============
+ - Cache avatar pixbuf in EmpathyChatView to avoid having a new pixbuf in memory
+   for each message a contact sends
+ - Generate ChangeLog from svn commits. Copy generator from epiphany.
+ - Correctly store/restore presence when NM state changes.
+ - Split EmpathyContactFactory to have one EmpathyTpContactFactory per account.
+ - When NM is in sleeping (=disabled) state, do just like if it was connected.
+   Add a gconf key to disable NM support completely.
+
 NEW in 0.21.3:
 =============
  - Request new Text Channel if the contact is online again and CM don't support

diff --git a/configure.ac b/configure.ac
index bd6df769da870de6646ab1d6c1d2cd56ec85e8db..a8fc1c4ff15cfdafd63b64fa9f533c04c8284d63 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@ AC_HEADER_STDC
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
 #   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
 #   (No interfaces changed:                   REVISION++)
-LIBEMPATHY_CURRENT=7
-LIBEMPATHY_AGE=0
+LIBEMPATHY_CURRENT=8
+LIBEMPATHY_AGE=1
 LIBEMPATHY_REVISION=0
 
-LIBEMPATHY_GTK_CURRENT=7
-LIBEMPATHY_GTK_AGE=0
+LIBEMPATHY_GTK_CURRENT=8
+LIBEMPATHY_GTK_AGE=1
 LIBEMPATHY_GTK_REVISION=0
 
 AC_SUBST(LIBEMPATHY_CURRENT)