From 978a2a4bbe25b12f4e6e7baa8632ca7c586b5452 Mon Sep 17 00:00:00 2001
From: Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
Date: Sun, 13 Mar 2011 17:32:06 +0000
Subject: Preparation for 0.60.0_pre1

---
 NEWS         | 13 +++++++++++++
 configure.ac |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 3743b7d62..b908f0bad 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,19 @@ News for Paludis
 This file lists the major changes between versions. For a more detailed list
 of every change, see the Git log.
 
+0.60.0_pre1:
+    * The deprecated 'adjutrix', 'inquisitio', 'importare', 'paludis' and
+      'reconcilio' clients have been removed.
+
+    * 'build_options: split strip' are removed in favour of 'build_options:
+       symbols=preserve|split|strip|compress'.
+
+    * We now generate man pages via 'asciidoc'.
+
+    * The 'cave resolve -D' short option is now '-B' instead.
+
+    * A new special 'nothing' set has been added.
+
 0.58.5:
     * 'cave search' no longer fails when encountering invalid metadata.
 
diff --git a/configure.ac b/configure.ac
index 1ab1b0f82..850a82687 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,9 +7,9 @@ AC_CONFIG_SRCDIR([paludis/paludis.hh])
 AC_CONFIG_AUX_DIR(config)
 
 VERSION_MAJOR=0
-VERSION_MINOR=59
+VERSION_MINOR=60
 VERSION_MICRO=0
-VERSION_SUFFIX=
+VERSION_SUFFIX=_pre1
 VERSION_FULL="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_MICRO$VERSION_SUFFIX"
 VERSION="$VERSION_FULL"
 VERSION_LIB_CURRENT=`expr 100 '*' $VERSION_MAJOR + $VERSION_MINOR`
-- 
cgit v1.2.3