From e9279ed990f591d662c914a7d57c0c56b3c02679 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Fri, 4 Dec 2009 21:38:15 +0100
Subject: Prepare release 1.2.4 (sync change log and release notes, bump
 version)

---
 CHANGES           | 12 +++++++++++-
 RELEASE_NOTES     | 19 +++++++++++++++----
 doc/layman.8.xml  |  6 +++---
 layman/version.py |  6 ++++--
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index 77ee5f0..8aa505e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,21 @@
 CHANGES
 -------
 
-TODO
+Version 1.2.4 - Released 2009/12/05
 ===================================
 
+ - Add option "-d" to calls of "cvs update" so it checks out new
+   directories properly (#278807)
+
+ - Fix reading of CDATA sections
+
  - Add support for repositories.xml database format
 
+ - Substitute path "/usr/portage/local/layman" by "/usr/local/portage/layman"
+   in the documentation (#271457)
+
+ - Fix grammar errors in program output (#259188)
+
 
 Version 1.2.3 - Released 2009/01/01
 ===================================
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 01286b9..0058c45 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,17 +1,28 @@
-Version 1.2.3 - Released 2009/01/01
+Version 1.2.4 - Released 2009/12/05
 ===================================
 
 FULL CHANGES
 ------------
 
- - Support setting the terminal screen width (also fixes #253016)
+ - Add option "-d" to calls of "cvs update" so it checks out new
+   directories properly (#278807)
+
+ - Fix reading of CDATA sections
+
+ - Add support for repositories.xml database format
+
+ - Substitute path "/usr/portage/local/layman" by "/usr/local/portage/layman"
+   in the documentation (#271457)
+
+ - Fix grammar errors in program output (#259188)
 
- - layman -S fetches each overlay twice (#253241)
 
 SHORT CHANGES
 -------------
 
- layman-1.2.3 is a bug fix release that fixes a few minor bugs.
+ layman-1.2.4 comes with both new features as well as bug fixes,
+ most importantly a major bug affecting CVS-based overlays.
+
 
 FRESHMEAT
 =========
diff --git a/doc/layman.8.xml b/doc/layman.8.xml
index a7df688..ba3a093 100644
--- a/doc/layman.8.xml
+++ b/doc/layman.8.xml
@@ -195,11 +195,11 @@
     <refentry id="layman-manpage">
       <refentryinfo>
 	<title>layman</title>
-	<date>September 2007</date>
+	<date>December 2009</date>
 	<productname>layman</productname>
-	<productnumber>1.1</productnumber>
+	<productnumber>1.2.4</productnumber>
 	<copyright>
-	  <year>2005-2008</year>
+	  <year>2005-2009</year>
 	  <holder>Gunnar Wrobel</holder>
 	</copyright>
 	<legalnotice>
diff --git a/layman/version.py b/layman/version.py
index a366b47..371d88f 100644
--- a/layman/version.py
+++ b/layman/version.py
@@ -8,17 +8,19 @@
 #             Current version number
 #
 # Copyright:
-#             (c) 2005 - 2008 Gunnar Wrobel
+#             (c) 2005 - 2009 Gunnar Wrobel
+#             (c) 2009        Sebastian Pipping
 #             Distributed under the terms of the GNU General Public License v2
 #
 # Author(s):
 #             Gunnar Wrobel <wrobel@gentoo.org>
+#             Sebastian Pipping <sebastian@pipping.org>
 #
 
 __version__ = "$Id: version.py 309 2007-04-09 16:23:38Z wrobel $"
 
 
-VERSION = '1.2.3'
+VERSION = '1.2.4'
 
 if __name__ == '__main__':
     print VERSION
-- 
cgit v1.2.3-1-g7c22