--- trunk/debian/changelog	2009/02/05 20:08:46	51
+++ branches/ports/maemo/debian/changelog	2009/04/01 18:40:42	157
@@ -1,3 +1,25 @@
+osm2go (0.6.14.1-maemo1) unstable; urgency=low
+
+  * New trunk release.
+  * Bump debian/rules etc. for build.
+
+ -- Andrew Chadwick <andrewc@piffle.org>  Sat, 21 Mar 2009 22:38:13 +0000
+
+osm2go (0.6.13-maemo1) unstable; urgency=low
+
+  * New trunk release.
+  * Update from trunk.
+  * Parse build-specific version prefixes and suffixes from this file.
+
+ -- Andrew Chadwick <andrewc@piffle.org>  Mon, 16 Feb 2009 21:00:42 +0000
+
+osm2go (0.6.12-maemo1) unstable; urgency=low
+
+  * Merge trunk, and begin building in the new way.
+  * Version prefix/suffix parser merged from branches/ports/debian.
+
+ -- Andrew Chadwick <andrewc@piffle.org>  Sun, 08 Feb 2009 22:34:12 +0000
+
 osm2go (0.6-11) unstable; urgency=low
 
   * New presets.xml
@@ -11,7 +33,7 @@
 
   * Use hash tables to find nodes and ways faster via their ids
   * Some minor gtk handling/warning fixes
-	
+
  -- Till Harbaum <till@harbaum.org>  Wed, 21 Jan 2009 19:24:22 +0100
 
 osm2go (0.6-9) unstable; urgency=low