#
#
# patch "ChangeLog"
#  from [83870fe15a60a7c182b6b76f8a88e43374d28fad]
#    to [c609155a6c125a258d4d8c585b059f2667705347]
#
# patch "NEWS"
#  from [6eea587efbdeda46ca99469c3d3ad67766fd9643]
#    to [19d7e96291e979d06c34138d99eabf0de582bb4c]
#
# patch "UPGRADE"
#  from [66a47dba0a68403448e658fd2febb5dbe6ae9407]
#    to [807ca2751910f5496e94b82c78c64412911b3ab9]
#
# patch "configure.ac"
#  from [36a5ffa33d6c6fb1ae90da09d0699ae107140775]
#    to [8d66693ebf040f83c89a03d06976b1e5e05a8efd]
#
# patch "debian/changelog"
#  from [a9f28bbb3624abe62501f98644bbc85986e19fff]
#    to [deb2d95fe420ffd939a32c05335a57c88fefed44]
#
# patch "monotone.spec"
#  from [4c8eaba71057e6f501208563b3648731748a3d23]
#    to [7022049eb76af47d7c5395199ee30c4381a97f45]
#
# patch "win32/monotone.iss"
#  from [f9b4baaefa8a68a48114276252339a534eebd9cf]
#    to [be13fcf933bfdc3c400984764d9e2297e2c4bf80]
#
============================================================
--- ChangeLog	83870fe15a60a7c182b6b76f8a88e43374d28fad
+++ ChangeLog	c609155a6c125a258d4d8c585b059f2667705347
@@ -1,3 +1,9 @@
+2005-12-29  Nathaniel Smith  <address@hidden>
+
+	* NEWS: Notes on what to write up for 0.25.
+	* win32/monotone.iss, monotone.spec, debian/changelog:
+	* configure.ac, UPGRADE: Bump.
+
 2005-12-26  Matt Johnston  <address@hidden>

 	* commands.cc (CMD(revert)): revert with no args prints usage,
============================================================
--- NEWS	6eea587efbdeda46ca99469c3d3ad67766fd9643
+++ NEWS	19d7e96291e979d06c34138d99eabf0de582bb4c
@@ -1,3 +1,20 @@
+????????????????????????????
+
+        0.25 release.
+
+        ipv6 now supported.
+        revert now requires an argument.
+        'revert' gives feedback while running
+        database locking was further tweaked, to allow more concurrent
+          access when safe
+        bug fix: don't print out hundreds of lines of tickers on win32.
+        bug fix: can now import 0.23-and-earlier private key packets
+        bug fix: log --diffs restricted to some files now only prints
+          diffs for those files.
+        win9x support?
+
+        new translations: pt_BR
+
 Sat Nov 27 22:29:38 PST 2005

         0.24 release.
============================================================
--- UPGRADE	66a47dba0a68403448e658fd2febb5dbe6ae9407
+++ UPGRADE	807ca2751910f5496e94b82c78c64412911b3ab9
@@ -1,4 +1,4 @@
-upgrading monotone to 0.24
+upgrading monotone to 0.25
 ==========================

 if you are upgrading from:
============================================================
--- configure.ac	36a5ffa33d6c6fb1ae90da09d0699ae107140775
+++ configure.ac	8d66693ebf040f83c89a03d06976b1e5e05a8efd
@@ -1,8 +1,8 @@
 # -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.58)
-AC_INIT(monotone, 0.24, address@hidden)
+AC_INIT(monotone, 0.25, address@hidden)
 AM_INIT_AUTOMAKE(1.7.1)
 AC_CONFIG_SRCDIR([app_state.cc])
 AC_CONFIG_TESTDIR([tests])
============================================================
--- debian/changelog	a9f28bbb3624abe62501f98644bbc85986e19fff
+++ debian/changelog	deb2d95fe420ffd939a32c05335a57c88fefed44
@@ -1,3 +1,9 @@
+monotone (0.25-0.1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Nathaniel Smith <address@hidden>  Thu, 29 Dec 2005 13:28:11 -0800
+
 monotone (0.24-0.1) unstable; urgency=low

   * New upstream release.
============================================================
--- monotone.spec	4c8eaba71057e6f501208563b3648731748a3d23
+++ monotone.spec	7022049eb76af47d7c5395199ee30c4381a97f45
@@ -63,6 +63,9 @@


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

============================================================
--- win32/monotone.iss	f9b4baaefa8a68a48114276252339a534eebd9cf
+++ win32/monotone.iss	be13fcf933bfdc3c400984764d9e2297e2c4bf80
@@ -1,6 +1,6 @@
 [Setup]
 AppName=monotone
-AppVerName=monotone 0.24
+AppVerName=monotone 0.25
 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.24
+AppVersion=0.25
 Compression=lzma/ultra
 SolidCompression=yes
 LicenseFile="..\COPYING"