xkeyboard-config ChangeLog, 1.393, 1.394 NEWS, 1.12, 1.13 configure.in, 1.57, 1.58

Committed by: svu

Update of /cvs/xkeyboard-config/xkeyboard-config
In directory kemper:/tmp/cvs-serv31297

Modified Files:
	ChangeLog NEWS configure.in 
Log Message:
preparing release 1.2

Index: ChangeLog
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/ChangeLog,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -d -r1.393 -r1.394
--- ChangeLog	24 Jan 2008 23:21:05 -0000	1.393
+++ ChangeLog	29 Jan 2008 21:47:46 -0000	1.394
@@ -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,

Index: NEWS
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/NEWS,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- NEWS	25 Sep 2007 21:13:47 -0000	1.12
+++ NEWS	29 Jan 2008 21:47:46 -0000	1.13
@@ -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.

Index: configure.in
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/configure.in,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- configure.in	2 Oct 2007 21:51:04 -0000	1.57
+++ configure.in	29 Jan 2008 21:47:46 -0000	1.58
@@ -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