#
#
# patch "ChangeLog"
#  from [426452641cc1ce421f8e5139e665895f3557bef0]
#    to [6ea1a48164fc5e88e2b2ce7f80c7bd87ed95e894]
#
# patch "NEWS"
#  from [4244015fb774c008339b4803dadde52021f37f91]
#    to [424a7c642334ea366ac331eddd007b2761cc19ef]
#
# patch "configure.ac"
#  from [57682c635d8e6c3e5c0e1319012ef0bb38a13963]
#    to [9a0e730650f554caa768ae612c5583b69bc10330]
#
# patch "debian/changelog"
#  from [53710a64f5fc3f98af994fe3e410e9cddd40ab8a]
#    to [9c13bec1232cf7afa36bfbdc6388f4023aa790ca]
#
# patch "monotone.spec"
#  from [63d8fb7623a27d04dc5b5ba8e67979f31daadcf6]
#    to [c4f1bad0cd7ee2de6ed8c4daeeb096fdeebc1153]
#
# patch "win32/monotone.iss"
#  from [cd969c03ff8cd22ca0e6836b77b993603669ced9]
#    to [b7beb799e4fde0a2450b913c19ba45dcd1da5fbe]
#
============================================================
--- ChangeLog	426452641cc1ce421f8e5139e665895f3557bef0
+++ ChangeLog	6ea1a48164fc5e88e2b2ce7f80c7bd87ed95e894
@@ -1,3 +1,9 @@
+2006-04-08  Nathaniel Smith  <address@hidden>
+
+	* configure.ac, debian/changelog, win32/monotone.iss:
+	* monotone.spec: Bump version number to 0.26.
+	* NEWS: Insert release time.
+
 2006-04-08  Timothy Brownawell  <address@hidden>

 	* commands.cc (process_netsync_args): fix crash when calling netsync
============================================================
--- NEWS	4244015fb774c008339b4803dadde52021f37f91
+++ NEWS	424a7c642334ea366ac331eddd007b2761cc19ef
@@ -1,4 +1,4 @@
-????????????????????????????
+Sat Apr  8 19:33:35 PDT 2006

         0.26 release.  Major enhancements and internal rewrites.
         Please read these notes carefully, as significant changes are
============================================================
--- configure.ac	57682c635d8e6c3e5c0e1319012ef0bb38a13963
+++ configure.ac	9a0e730650f554caa768ae612c5583b69bc10330
@@ -1,8 +1,8 @@
 # -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.58)
-AC_INIT(monotone, 0.26pre3, address@hidden)
+AC_INIT(monotone, 0.26, address@hidden)
 AM_INIT_AUTOMAKE(1.7.1)
 AC_CONFIG_SRCDIR([app_state.cc])
 AC_CONFIG_TESTDIR([tests])
============================================================
--- debian/changelog	53710a64f5fc3f98af994fe3e410e9cddd40ab8a
+++ debian/changelog	9c13bec1232cf7afa36bfbdc6388f4023aa790ca
@@ -1,3 +1,11 @@
+monotone (0.26.0-0.1) unstable; urgency=low
+
+  * New upstream release.  (NB: The official upstream version number
+    is "0.26", but an error with the pre-release packages makes the
+    extra ".0" necessary.)
+
+ -- Nathaniel Smith <address@hidden>  Sat,  8 Apr 2006 19:42:55 -0700
+
 monotone (0.26pre3-0.1) unstable; urgency=low

   * New upstream release.
============================================================
--- monotone.spec	63d8fb7623a27d04dc5b5ba8e67979f31daadcf6
+++ monotone.spec	c4f1bad0cd7ee2de6ed8c4daeeb096fdeebc1153
@@ -1,6 +1,6 @@
 Summary: monotone is a distributed version control tool
 Name: monotone
-Version: 0.26pre3
+Version: 0.26
 Release: 1
 License: GPL
 Group: Development/Tools
@@ -63,6 +63,9 @@


 %changelog
+* Sat Apr 8 2006 nathaniel smith <address@hidden>
+- 0.26 release
+
 * Wed Mar 29 2006 nathaniel smith <address@hidden>
 - 0.26pre3 release

============================================================
--- win32/monotone.iss	cd969c03ff8cd22ca0e6836b77b993603669ced9
+++ win32/monotone.iss	b7beb799e4fde0a2450b913c19ba45dcd1da5fbe
@@ -1,6 +1,6 @@
 [Setup]
 AppName=monotone
-AppVerName=monotone 0.26pre3
+AppVerName=monotone 0.26
 AppCopyright=Copyright © 2002-2006 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.26pre3
+AppVersion=0.26
 Compression=lzma/ultra
 SolidCompression=yes
 LicenseFile="..\COPYING"