# 
# 
# patch "ChangeLog"
#  from [fb62d2ef325acf3507b531f5cf96cc9c6919f278]
#    to [3f888c5ab79d6afeb7e404877eaf70d6ad49dede]
# 
# patch "debian/changelog"
#  from [de96322a6bbc5ea570c102a062062e22b5af4dd7]
#    to [40607b1988c517c116d039f3ac42d80095c15111]
# 
============================================================
--- ChangeLog	fb62d2ef325acf3507b531f5cf96cc9c6919f278
+++ ChangeLog	3f888c5ab79d6afeb7e404877eaf70d6ad49dede
@@ -1,3 +1,7 @@
+2006-05-21  Richard Levitte  <address@hidden>
+
+	* debian/changelog: Updated from the latest Debian release.
+
 2006-05-19  Richard Levitte  <address@hidden>
 
 	* ui.cc (tick_write_count::write_ticks): Simplify the condition
============================================================
--- debian/changelog	de96322a6bbc5ea570c102a062062e22b5af4dd7
+++ debian/changelog	40607b1988c517c116d039f3ac42d80095c15111
@@ -1,3 +1,18 @@
+monotone (0.26.0-2) unstable; urgency=low
+
+  * Closes: #358096: FTBFS with G++ 4.1: extra qualification
+  * Closes: #358220: upgrade to 0.25
+  * Closes: #363440: New upstream release
+  * Closes: #366908: please update to 0.26
+
+ -- Tomas Fasth <address@hidden>  Sun, 14 May 2006 06:22:59 +0000
+
+monotone (0.26.0-1) unstable; urgency=low
+
+  * Built (with pdebuild) for upload to debian archive.
+
+ -- Tomas Fasth <address@hidden>  Sun, 14 May 2006 06:21:14 +0000
+
 monotone (0.26.0-0.2) unstable; urgency=low
 
   * Added examples to the files that should end up in the documentation.
@@ -30,6 +45,12 @@
 
  -- Nathaniel Smith <address@hidden>  Sun,  8 Jan 2006 21:25:54 -0800
 
+monotone (0.25-1) unstable; urgency=low
+
+  * Built (with pdebuild) for upload to debian archive.
+
+ -- Tomas Fasth <address@hidden>  Sun,  8 Jan 2006 09:27:17 +0000
+
 monotone (0.25-0.1) unstable; urgency=low
 
   * New upstream release.