Merge lp:~oif-team/geis/release-2.0.0 into lp:geis

[Stephen M. Webb]

Fixes up the package and .so versions for the 2.0 release.

This is the first official release of GEIS v2.0.

[Henrik Rydberg (rydberg)]

And the version info magic is just bumping api, keeping abi at 1? What is the resulting library version number?

review: Needs Information

[Stephen M. Webb (bregma)]

The generated library is libutouch-geis.so.1.2.0 and the appropriate links will be generated by the deb packaging on installation. The ELF SONAME section continues to have the value "libutouch-geis.so.1" so any existing applications that link to the previously release .so will continue to work.

Excellent documentation on libtool version-info can be found at <http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html>.

[Henrik Rydberg (rydberg)]

Thanks - 1.2.0 was the information I sought.

review: Approve

[Chase Douglas (chasedouglas)]

Looks good here too!

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2011-02-21 14:23:43 +0000
+++ ChangeLog	2011-02-21 16:14:39 +0000
@@ -1,3 +1,11 @@
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Release version 2.0.0
+
+  * configure.ac (AC_INIT): bumped package version to 2.0.0
+  * libutouch-geis/Makefile.am (libutouch_geis_la_LDFLAGS): bumped version-info
+    to 3:0:2 (gives .so version 1.2.0) to reflect the addition of a new interface
+
 2011-02-21  Stephen M. Webb  <[e-mail]>
 
   Added support for setting the XCB sysflg through the GEIS v1 interface.
 
=== modified file 'NEWS'
--- NEWS	2010-08-16 21:16:38 +0000
+++ NEWS	2011-02-21 16:14:39 +0000
@@ -1,1 +1,8 @@
-No news is good news.
+uTouch-geis NEWS -- a history of user-visible changes
+
+Copyright 2010, 2011 Canonical Ltd.
+
+* Changes in v2.0.0
+
+** Introduction of the GEIS v2.0 API
+
 
=== modified file 'configure.ac'
--- configure.ac	2011-01-31 17:57:52 +0000
+++ configure.ac	2011-02-21 16:14:39 +0000
@@ -20,7 +20,7 @@
 #
 
 AC_PREREQ(2.65)
-AC_INIT([utouch-geis],[1.0.13],
+AC_INIT([utouch-geis],[2.0.0],
 	[[e-mail]],,
 	[https://launchpad.net/utouch-geis])
 AC_CONFIG_HEADERS([geis_config.h])
 
=== modified file 'libutouch-geis/Makefile.am'
--- libutouch-geis/Makefile.am	2011-02-19 16:14:41 +0000
+++ libutouch-geis/Makefile.am	2011-02-21 16:14:39 +0000
@@ -58,7 +58,7 @@
 
 libutouch_geis_la_LDFLAGS = \
 	-Wl,-z,defs -Wl,--as-needed \
-	-version-info 2:0:1 \
+	-version-info 3:0:2 \
 	-Wl,--version-script=$(version_script) \
 	-lm