#
# patch "ChangeLog"
#  from [0194ee317c42827ba6a2cb95dbbdce3c8b87037f]
#    to [18d49951f0df2a781f2ceafd29a120354915574c]
#
# patch "NEWS"
#  from [2aa0fd8da22bd0fd882f3b8015ca2bf3a93e88b9]
#    to [106c13bdcd530b49c45d767173017431b172a515]
#
# patch "configure.ac"
#  from [7d94da3b93e410e1e2f48ee75437fcf109b6cbc3]
#    to [d1e7f9b83ba767fe79589322bdf084a03c57d16d]
#
# patch "debian/changelog"
#  from [7820e83cc894b3d7fb4cbe7f936af17b4e969e3c]
#    to [aed75da72f6cb39722401ca50ab0abfc5039d984]
#
# patch "monotone.spec"
#  from [c3e492f579a5f3588b6af13ac55783b8c31b7313]
#    to [48e6c789a56e5481b23e7aa104fbbda64014a7ff]
#
# patch "win32/monotone.iss"
#  from [a9e19c238eb0dbf3d7333d664daa093d39d6fdeb]
#    to [3a876bb2f3782096637648d59ddb57c0dff4234d]
#
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,11 @@
 2005-07-17  Nathaniel Smith  <address@hidden>

+	* configure.ac, win32/monotone.iss, monotone.spec:
+	* debian/changelog: Bump version numbers to 0.21.
+	* NEWS: Commit to a timestamp.
+
+2005-07-17  Nathaniel Smith  <address@hidden>
+
 	* NEWS: Add diff changes, more tweaking.
 	* UPGRADE: Update for 0.21.
 	* AUTHORS: Add Vladimir Vukicevic.
--- NEWS
+++ NEWS
@@ -1,4 +1,4 @@
-????????????????????????????
+Sun Jul 17 16:48:26 PDT 2005

         0.21 release.  bug fixes, performance improvements, and ui
         improvements.
--- configure.ac
+++ configure.ac
@@ -1,8 +1,8 @@
 # -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.58)
-AC_INIT(monotone, 0.20, address@hidden)
+AC_INIT(monotone, 0.21, address@hidden)
 AM_INIT_AUTOMAKE(1.7.1)
 AC_CONFIG_SRCDIR([app_state.cc])
 AC_CONFIG_TESTDIR([tests])
--- debian/changelog
+++ debian/changelog
@@ -1,3 +1,9 @@
+monotone (0.21-0.1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- nathaniel smith <address@hidden>  Sun, 17 Jul 2005 15:44:29 -0700
+
 monotone (0.20-1) unstable; urgency=low

   * Rebuild in clean environment (pdebuild) for upload to debian archive.
--- monotone.spec
+++ monotone.spec
@@ -1,6 +1,6 @@
 Summary: monotone is a distributed version control tool
 Name: monotone
-Version: 0.20
+Version: 0.21
 Release: 1
 License: GPL
 Group: Development/Tools
@@ -62,6 +62,9 @@


 %changelog
+* Sun Jul 17 2005 nathaniel smith <address@hidden>
+- 0.21 release
+
 * Tue Jul 5 2005 nathaniel smith <address@hidden>
 - 0.20 release

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