From: svu <svu>
Date: Tue, 29 Jan 2008 21:47:46 +0000 (+0000)
Subject: preparing release 1.2
X-Git-Tag: v_1_2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ebeea961456785b66490b38f92aca1ace0fe1ca0;p=platform%2Fupstream%2Fxkeyboard-config.git

preparing release 1.2
---

diff --git a/ChangeLog b/ChangeLog
index 2665326..cc22f16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-29  Sergey Udaltsov
+
+	* NEWS, configure.in: preparing release 1.2
+
 2008-01-24  Sergey Udaltsov
 
 	* symbols/af, symbols/ara, symbols/et, symbols/group, symbols/in,
diff --git a/NEWS b/NEWS
index c7c7510..0f277cc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,5 @@
-1.0	First time-based release. Bugfixes (27). Updated/new translations, renewed relations with TP. Renamed (for clarity) types. Some new layouts and models.
-0.9	Maintenance release. Bugfixes (76). Updated/new translations. Updated/new layouts.
-0.8	Maintenance release. Bugfixes. Updated/new translations. Updated/new layouts.
+1.2	Bugfixes (36). Updated/new translations, renewed relations with TP. Some new layouts and models. A lot of changes from OLPC project. Changed base.xml merging schema (.gmo files are installed and used explicitly)
+1.1	First time-based release. Bugfixes (27). Updated/new translations, renewed relations with TP. Renamed (for clarity) types. Some new layouts and models.
 1.0	Maintenance release. Bugfixes (72). Updated/new translations. Updated/new layouts and models.
 0.9	Maintenance release. Bugfixes (76). Updated/new translations. Updated/new layouts.
 0.8	Maintenance release. Bugfixes. Updated/new translations. Updated/new layouts.
diff --git a/configure.in b/configure.in
index ae0aded..960d008 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(xkeyboard-config, 1.1)
+AC_INIT(xkeyboard-config, 1.2)
 AC_CONFIG_SRCDIR(rules/base.xml.in)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE