From: Jim Evins <evins@snaught.com>
Date: Thu, 22 Dec 2005 03:07:24 +0000 (+0000)
Subject: 	* NEWS:
X-Git-Tag: glabels-2_3_0~388
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3c89931fbeec7d5de710bf1c9b03e01e25c8c157;p=glabels

	* NEWS:
	* configure.in:
		Preparation for 2.1.2.


git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@567 f5e0f49d-192f-0410-a22d-a8d8700d0965
---

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 94b447e2..2389a16e 100644
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-21  Jim Evins  <evins@snaught.com>
+
+	* NEWS:
+	* configure.in:
+		Preparation for 2.1.2.
+	
 2005-12-20  Jim Evins  <evins@snaught.com>
 
 	* src/Makefile.am:
diff --git a/glabels2/NEWS b/glabels2/NEWS
index a1328ee2..a56133b9 100644
--- a/glabels2/NEWS
+++ b/glabels2/NEWS
@@ -1,3 +1,14 @@
+* gLabels 2.1.2 (unstable) release.  Release date 2005-12-21.
+
+- Updated Italian translation (Daniele Medri)
+- Fixed double entry in property bar's font family combobox
+- Don't allow zero width or height when drawing pixbufs
+- Fixed various memory leaks
+- New configure option to disable update-mime-database and update-desktop-database
+- New merge backend for evolution data server (Austin Henry)
+- New minimal merge backend for VCards using evolution data server API (Austin Henry)
+- New templates and fixes
+
 * gLabels 2.1.1 (unstable) release.  Release date 2005-06-21.
 
 - Added document merge tutorial to help documentation
diff --git a/glabels2/configure.in b/glabels2/configure.in
index 851b7bc8..74354c87 100644
--- a/glabels2/configure.in
+++ b/glabels2/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.52)
 
-AC_INIT(glabels, 2.1.1, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116)
+AC_INIT(glabels, 2.1.2, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116)
 AC_CONFIG_SRCDIR(src/glabels.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
@@ -39,9 +39,9 @@ dnl    increment current, and set revision to 0.
 dnl 5. If any interfaces have been added since the last public release, then increment age.
 dnl 6. If any interfaces have been removed since the last public release, then set age
 dnl    to 0.
-LIBGLABELS_C=2
+LIBGLABELS_C=3
 LIBGLABELS_R=0
-LIBGLABELS_A=0
+LIBGLABELS_A=1
 
 LIBGLABELS_VERSION_INFO=${LIBGLABELS_C}:${LIBGLABELS_R}:${LIBGLABELS_A}
 AC_SUBST(LIBGLABELS_VERSION_INFO)