From: Richard Kreckel <kreckel@ginac.de>
Date: Sat, 17 Dec 2005 18:28:32 +0000 (+0000)
Subject: * Updated for maintenance branch.
X-Git-Tag: cln_1-1-12~14
X-Git-Url: https://www.ginac.de/CLN/cln.git//cln.git?a=commitdiff_plain;h=238aad023e9ab810da4c02780568d35481793c78;p=cln.git

* Updated for maintenance branch.
---

diff --git a/ChangeLog b/ChangeLog
index fb04bac..d191b4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2005-12-17  Richard B. Kreckel  <kreckel@ginac.de>
 
-	* Created branch cln_1-1 for maintenance patches.
-	This is the main branch, which will eventually become CLN 1.2.0.
+	* Branched cln_1-1. This is the maintenance branch. It is for
+	low-impact patches. The main will eventually become CLN 1.2.0.
 
 2005-12-15  Dmitry V. Kustov  <kustov@telex221.ru>
 
diff --git a/configure.ac b/configure.ac
index 37ebf1d..a47ef2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,8 +82,8 @@ dnl * if any functions/classes have been added, increment CL_AGE,
 dnl * if backwards compatibility has been broken, set CL_AGE to 0.
 dnl $(CL_CURRENT):$(CL_REVISION):$(CL_AGE) results in
 dnl libcln.so.$(CL_CURRENT)-$(CL_AGE)
-CL_CURRENT=5
-CL_REVISION=0
+CL_CURRENT=4
+CL_REVISION=1
 CL_AGE=0
 dnl make substitutions
 AC_SUBST(CL_CURRENT)
@@ -91,8 +91,8 @@ AC_SUBST(CL_REVISION)
 AC_SUBST(CL_AGE)
 dnl release version
 CL_VERSION_MAJOR=1
-CL_VERSION_MINOR=2
-CL_VERSION_PATCHLEVEL=0
+CL_VERSION_MINOR=1
+CL_VERSION_PATCHLEVEL=12
 dnl release version for cln/config.h, so it can be tested by the preprocessor
 AC_DEFINE_UNQUOTED(CL_VERSION_MAJOR, $CL_VERSION_MAJOR)
 AC_DEFINE_UNQUOTED(CL_VERSION_MINOR, $CL_VERSION_MINOR)