#
#
# patch "ChangeLog"
#  from [4611d308f3f4e23d71922d7a12bda5a1df44b439]
#    to [cd000953600724259da484c39709d7346861548f]
#
# patch "INSTALL"
#  from [e8c5a114eb284a7163393b4721179147dbc165ac]
#    to [dbcbecd1cc7f1a0092200291c3d25f5a7bd7eab6]
#
# patch "configure.ac"
#  from [c7984f7ceb6f010a466e3986c73e0088e09c17cb]
#    to [57682c635d8e6c3e5c0e1319012ef0bb38a13963]
#
# patch "debian/changelog"
#  from [75eaeb6f09dbe2ab13fc811a92a0abfaa2780363]
#    to [53710a64f5fc3f98af994fe3e410e9cddd40ab8a]
#
# patch "monotone.spec"
#  from [b00e73feb017514c7dd84e700e9dd539585ecf57]
#    to [63d8fb7623a27d04dc5b5ba8e67979f31daadcf6]
#
# patch "win32/monotone.iss"
#  from [f9c71207ff1d42c58cfdf76018e3c77fb83fbd4a]
#    to [cd969c03ff8cd22ca0e6836b77b993603669ced9]
#
============================================================
--- ChangeLog	4611d308f3f4e23d71922d7a12bda5a1df44b439
+++ ChangeLog	cd000953600724259da484c39709d7346861548f
@@ -1,5 +1,12 @@
 2006-03-29  Nathaniel Smith  <address@hidden>

+	* INSTALL: mtn-related tweaks.
+	* monotone.spec, win32/monotone.iss: Untested mtn-related tweaks,
+	and bump version to 0.26pre3.
+	* debian/changelog: Bump version.
+	
+2006-03-29  Nathaniel Smith  <address@hidden>
+
 	* NEWS: First pass at entry for 0.26pre3.

 2006-03-28  Nathaniel Smith  <address@hidden>
============================================================
--- INSTALL	e8c5a114eb284a7163393b4721179147dbc165ac
+++ INSTALL	dbcbecd1cc7f1a0092200291c3d25f5a7bd7eab6
@@ -144,7 +144,7 @@

 3. building monotone

-  * type "make". this should produce a monotone binary in your current
+  * type "make". this should produce a mtn binary in your current
     directory. if not, please send a build log to
     address@hidden with a description of the failure.

@@ -158,20 +158,12 @@
     be free to share it with others or make changes and submit them to
     us:

-        monotone --db=mt.db db init
+        mtn --db=mt.mtn db init

-        monotone --db=mt.db read  <<EOF
-         [pubkey address@hidden
-         MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQCkVU7BYI5bRRJmkJc8gomO9WdTTGG10Lmh
-         PdAEqD6sSdsMkTC9okfsQQ8obE+GODrFa70fX5PJNevNoE+Ryxzu+xtJjmuR2tYTeRNwNa0F
-         dIo/QLteQ4Vwh5162It1kPhLKb1Ki62ZG8aw6ATS4GQVJPci2g1lpn1RG0Z+fFdFJQIBEQ==
-         [end]
-        EOF
+        mtn --db=mt.mtn --key="" pull venge.net net.venge.monotone

-        monotone --db=mt.db --key="" pull off.net net.venge.monotone
+        mtn --db=mt.mtn --branch=net.venge.monotone checkout monotone-sources

-        monotone --db=mt.db --branch=net.venge.monotone checkout monotone-sources
-
 5. upgrading

   * if you have an existing monotone installation, you may need to
============================================================
--- configure.ac	c7984f7ceb6f010a466e3986c73e0088e09c17cb
+++ configure.ac	57682c635d8e6c3e5c0e1319012ef0bb38a13963
@@ -1,8 +1,8 @@
 # -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.58)
-AC_INIT(monotone, 0.26pre2, address@hidden)
+AC_INIT(monotone, 0.26pre3, address@hidden)
 AM_INIT_AUTOMAKE(1.7.1)
 AC_CONFIG_SRCDIR([app_state.cc])
 AC_CONFIG_TESTDIR([tests])
============================================================
--- debian/changelog	75eaeb6f09dbe2ab13fc811a92a0abfaa2780363
+++ debian/changelog	53710a64f5fc3f98af994fe3e410e9cddd40ab8a
@@ -1,3 +1,9 @@
+monotone (0.26pre3-0.1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Nathaniel Smith <address@hidden>  Wed, 29 Mar 2006 03:23:23 -0800
+
 monotone (0.26pre2-0.1) unstable; urgency=low

   * New upstream release.
============================================================
--- monotone.spec	b00e73feb017514c7dd84e700e9dd539585ecf57
+++ monotone.spec	63d8fb7623a27d04dc5b5ba8e67979f31daadcf6
@@ -1,6 +1,6 @@
 Summary: monotone is a distributed version control tool
 Name: monotone
-Version: 0.26pre2
+Version: 0.26pre3
 Release: 1
 License: GPL
 Group: Development/Tools
@@ -56,13 +56,16 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README README.changesets UPGRADE contrib
-%{_bindir}/monotone
-%{_mandir}/man1/monotone.1.gz
+%{_bindir}/mtn
+%{_mandir}/man1/mtn.1.gz
 %{_infodir}/*.info*.gz
 %{_datadir}/locale/*/LC_MESSAGES/monotone.mo


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

============================================================
--- win32/monotone.iss	f9c71207ff1d42c58cfdf76018e3c77fb83fbd4a
+++ win32/monotone.iss	cd969c03ff8cd22ca0e6836b77b993603669ced9
@@ -1,6 +1,6 @@
 [Setup]
 AppName=monotone
-AppVerName=monotone 0.26pre2
+AppVerName=monotone 0.26pre3
 AppCopyright=Copyright © 2002-2006 Graydon Hoare et al.
 DefaultDirName={pf}\monotone
 DefaultGroupName=monotone
@@ -10,13 +10,13 @@
 AllowNoIcons=1
 AppPublisher=venge.net
 AppPublisherURL=http://venge.net/monotone
-AppVersion=0.26pre2
+AppVersion=0.26pre3
 Compression=lzma/ultra
 SolidCompression=yes
 LicenseFile="..\COPYING"

 [Files]
-Source: "..\monotone.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\mtn.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\html\*.*"; DestDir: "{app}\documentation"; Flags: ignoreversion
 Source: "..\COPYING"; DestDir: "{app}"; Flags: ignoreversion
 Source: "\mingw\bin\libiconv-2.dll"; DestDir: "{app}"
@@ -29,8 +29,8 @@
 Name: viewdocs; Description: "View the monotone documentation"; GroupDescription: "Get up and running"

 [Run]
-Filename: "{app}\monotone.exe"; Tasks: initdb; StatusMsg: "Initialising database..."; WorkingDir: "{app}"; Parameters: "--db=""{code:ForceDBPath|monotone.db}"" db init"
-Filename: "{app}\monotone.exe"; Tasks: initdb\genkey; StatusMsg: "Generating key..."; Flags: hidewizard; WorkingDir: "{app}"; Parameters: "--db=""{code:ForceDBPath|monotone.db}"" genkey {code:GetKeyID}"
+Filename: "{app}\mtn.exe"; Tasks: initdb; StatusMsg: "Initialising database..."; WorkingDir: "{app}"; Parameters: "--db=""{code:ForceDBPath|monotone.mtn}"" db init"
+Filename: "{app}\mtn.exe"; Tasks: initdb\genkey; StatusMsg: "Generating key..."; Flags: hidewizard; WorkingDir: "{app}"; Parameters: "--db=""{code:ForceDBPath|monotone.mtn}"" genkey {code:GetKeyID}"
 Filename: "{app}\documentation\index.html"; Tasks: viewdocs; Flags: shellexec nowait; WorkingDir: "{app}\documentation"

 [Icons]
@@ -72,7 +72,7 @@
     Result := DBDidntExist;
     exit;
   end;
-  path := GetDBPath('monotone.db');
+  path := GetDBPath('monotone.mtn');
   DBDidntExist := not FileOrDirExists(path);
   DBChecked := true;
   Result := DBDidntExist;