#
# patch "ChangeLog"
#  from [862fae236c72be34dd0cc89ac3a166902bf8af5c]
#    to [ca06092389315b504e13f1f14bd1a9b260e5a55f]
#
# patch "UPGRADE"
#  from [e39fe0a44ab0769d00a9b4aa9d0bcfaeb7d5955e]
#    to [1a40f29c9b2db0ca595d0e5ee06eb0e14b6fefd5]
#
# patch "configure.ac"
#  from [2271ae5eec684f302df5c57ad4befd7c360250dc]
#    to [6b50b307f85eccc907f7d983675590c3bc18d481]
#
# patch "debian/changelog"
#  from [7e7d19665043624e52133857efe533d33a368ac4]
#    to [a9f28bbb3624abe62501f98644bbc85986e19fff]
#
# patch "monotone.spec"
#  from [33404c56eb0d468a42d9a5565560879512ae815e]
#    to [4c8eaba71057e6f501208563b3648731748a3d23]
#
# patch "win32/monotone.iss"
#  from [7c4cb5f7fb63006a9f90eeb859f675dd7a4814d7]
#    to [f9b4baaefa8a68a48114276252339a534eebd9cf]
#
========================================================================
--- ChangeLog	862fae236c72be34dd0cc89ac3a166902bf8af5c
+++ ChangeLog	ca06092389315b504e13f1f14bd1a9b260e5a55f
@@ -1,5 +1,11 @@
 2005-11-26  Nathaniel Smith  <address@hidden>

+	* UPGRADE: Update for 0.24.
+	* configure.ac, win32/monotone.iss, monotone.spec:
+	* debian/changelog: Bump version number.
+
+2005-11-26  Nathaniel Smith  <address@hidden>
+
 	* ChangeLog: fixup after merge.

 2005-11-27  Daniel Carosone  <address@hidden>
========================================================================
--- UPGRADE	e39fe0a44ab0769d00a9b4aa9d0bcfaeb7d5955e
+++ UPGRADE	1a40f29c9b2db0ca595d0e5ee06eb0e14b6fefd5
@@ -1,11 +1,15 @@
-upgrading monotone to 0.23
+upgrading monotone to 0.24
 ==========================

 if you are upgrading from:
+  - 0.23 or earlier: keys are now stored in ~/.monotone/keys (Unix,
+    OS X), or %APPDATA%\Monotone\keys (Windows).  You must run 'db
+    migrate' against each of your databases; this will automatically
+    migrate the keys.  See NEWS for details.
+    On Windows only, monotone now looks in a different place for the
+    monotonerc file; see NEWS for details.
   - 0.21 or earlier: hooks governing netsync read permission have
     changed again; see NEWS for 0.22.
-  - 0.20 or earlier: you need to run 'db migrate' against each of your
-    databases.
   - 0.19 or earlier: there are incompatible command line and server
     configuration changes; see NEWS for 0.20.
   - 0.18 or earlier: if you have created a ~/.monotonerc, rename it to
========================================================================
--- configure.ac	2271ae5eec684f302df5c57ad4befd7c360250dc
+++ configure.ac	6b50b307f85eccc907f7d983675590c3bc18d481
@@ -1,8 +1,8 @@
 # -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.58)
-AC_INIT(monotone, 0.23, address@hidden)
+AC_INIT(monotone, 0.24, address@hidden)
 AM_INIT_AUTOMAKE(1.7.1)
 AC_CONFIG_SRCDIR([app_state.cc])
 AC_CONFIG_TESTDIR([tests])
========================================================================
--- debian/changelog	7e7d19665043624e52133857efe533d33a368ac4
+++ debian/changelog	a9f28bbb3624abe62501f98644bbc85986e19fff
@@ -1,3 +1,9 @@
+monotone (0.24-0.1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Nathaniel Smith <address@hidden>  Sat, 26 Nov 2005 17:33:48 -0800
+
 monotone (0.23-2) unstable; urgency=low

   * Arm, hppa and m68k is now build-depending on g++-3.4
========================================================================
--- monotone.spec	33404c56eb0d468a42d9a5565560879512ae815e
+++ monotone.spec	4c8eaba71057e6f501208563b3648731748a3d23
@@ -1,6 +1,6 @@
 Summary: monotone is a distributed version control tool
 Name: monotone
-Version: 0.23
+Version: 0.24
 Release: 1
 License: GPL
 Group: Development/Tools
@@ -63,6 +63,9 @@


 %changelog
+* Sat Nov 26 2005 nathaniel smith <address@hidden>
+- 0.24 release
+
 * Thu Sep 29 2005 nathaniel smith <address@hidden>
 - 0.23 release

========================================================================
--- win32/monotone.iss	7c4cb5f7fb63006a9f90eeb859f675dd7a4814d7
+++ win32/monotone.iss	f9b4baaefa8a68a48114276252339a534eebd9cf
@@ -1,6 +1,6 @@
 [Setup]
 AppName=monotone
-AppVerName=monotone 0.23
+AppVerName=monotone 0.24
 AppCopyright=Copyright © 2002-2005 Graydon Hoare et al.
 DefaultDirName={pf}\monotone
 DefaultGroupName=monotone
@@ -10,7 +10,7 @@
 AllowNoIcons=1
 AppPublisher=venge.net
 AppPublisherURL=http://venge.net/monotone
-AppVersion=0.23
+AppVersion=0.24
 Compression=lzma/ultra
 SolidCompression=yes
 LicenseFile="..\COPYING"