From c1a01312827c4edd23494f2f9c561c8507628323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= <stephane.raimbault@gmail.com>
Date: Sun, 5 Jun 2011 12:47:59 +0200
Subject: [PATCH] Bump version to 2.9.4

All related scripts and config files have been updated too.
---
 NEWS             |  4 ++--
 configure.ac     |  5 +++--
 debian/changelog |  6 ++++++
 debian/rules     |  1 +
 libmodbus.spec   | 13 ++++++++-----
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/NEWS b/NEWS
index 79f635703..4f2b22325 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-libmodbus 2.9.4 (2011-06-XX)
+libmodbus 2.9.4 (2011-06-05)
 ============================
 
 - IPv6 support
@@ -10,7 +10,7 @@ libmodbus 2.9.4 (2011-06-XX)
   Raimbault
 - Avoid an iteration in flush function
 - New functions to send and receive raw requests (modbus_send_raw_request,
-  odbus_receive_confirmation)
+  modbus_receive_confirmation)
 - Fix flush function of TCP backend on Windows
 - API changes for server/slave:
     * modbus_receive doesn't take socket/fd argument anymore
diff --git a/configure.ac b/configure.ac
index 06ae00c54..c8c2a4bf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
 #
 m4_define([libmodbus_version_major], [2])
 m4_define([libmodbus_version_minor], [9])
-m4_define([libmodbus_version_micro], [3])
+m4_define([libmodbus_version_micro], [4])
 
 m4_define([libmodbus_release_status],
             [m4_if(m4_eval(libmodbus_version_minor % 2), [1], [snapshot],
@@ -41,7 +41,8 @@ AC_SUBST(LIBMODBUS_VERSION_MICRO)
 AC_SUBST(LIBMODBUS_VERSION)
 
 # ABI version
-LIBMODBUS_LD_CURRENT=4
+# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+LIBMODBUS_LD_CURRENT=5
 LIBMODBUS_LD_REVISION=0
 LIBMODBUS_LD_AGE=0
 LIBMODBUS_LT_VERSION_INFO=$LIBMODBUS_LD_CURRENT:$LIBMODBUS_LD_REVISION:$LIBMODBUS_LD_AGE
diff --git a/debian/changelog b/debian/changelog
index a444382ee..373d7b052 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libmodbus (2.9.4-1) maverick; urgency=low
+
+  * New upstream release
+
+ -- Stéphane Raimbault <stephane.raimbault@gmail.com>  Sun, 05 Jun 2011 12:38:34 +0200
+
 libmodbus (2.9.3-1) maverick; urgency=low
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 44b37902b..f61b7bd27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,4 +18,5 @@ clean::
 	rm -f missing
 	rm -f src/Makefile.in
 	rm -f tests/Makefile.in
+        rm -f doc/Makefile.in
 
diff --git a/libmodbus.spec b/libmodbus.spec
index 359c75305..77adf43c4 100644
--- a/libmodbus.spec
+++ b/libmodbus.spec
@@ -1,15 +1,15 @@
 Summary: A Modbus library written in C
 Name: libmodbus
-Version: 2.9.3
+Version: 2.9.4
 Release: 1%{?dist%}
 License: LGPL V3+
 Packager: Stéphane Raimbault
 URL: http://www.libmodbus.org
 Group: Applications/System
-Provides: libmodbus=2.9.3
+Provides: libmodbus=2.9.4
 Requires: ,/bin/sh
 
-Source0: libmodbus-2.9.3.tar.gz
+Source0: libmodbus-2.9.4.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake
@@ -47,9 +47,9 @@ rm -rf %{buildroot}
 %attr(0755,root,root) %dir %{_libdir}/pkgconfig
 %attr(0755,root,root) %dir %{_includedir}
 %attr(0755,root,root) %dir %{_includedir}/modbus/
-%dir %{_libdir}/libmodbus.so.4
+%dir %{_libdir}/libmodbus.so.5
 %dir %{_libdir}/libmodbus.so
-%attr(0755,root,root) %{_libdir}/libmodbus.so.4.0.0
+%attr(0755,root,root) %{_libdir}/libmodbus.so.5.0.0
 %attr(0755,root,root) %{_libdir}/libmodbus.la
 %attr(0644,root,root) %{_libdir}/pkgconfig/libmodbus.pc
 %attr(0644,root,root) %{_includedir}/modbus/modbus.h
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Jun 5 2011 Stéphane Raimbault <stephane.raimbault@gmail.com> - 2.9.4-1
+- new upstream release
+
 * Mon Jan 10 2011 Stéphane Raimbault <stephane.raimbault@gmail.com> - 2.9.3-1
 - new upstream release