diff -u agtl-0.5.1/debian/control agtl-0.5.1/debian/control
--- agtl-0.5.1/debian/control
+++ agtl-0.5.1/debian/control
@@ -1,9 +1,10 @@
 Source: agtl
 Section: python
 Priority: extra
-Maintainer: Heiko Stuebner <heiko@sntech.de>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Heiko Stuebner <heiko@sntech.de>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5.0.38), cdbs (>= 0.4.49), python2.5-dev (>= 2.3.5-11), python-support (>= 0.5.3), python-setuptools, cython
+Build-Depends: debhelper (>= 5.0.38), cdbs (>= 0.4.49), python-dev (>= 2.3.5-11), python-support (>= 0.5.3), python-setuptools, cython
 Standards-Version: 3.8.3
 Homepage: http://wiki.openmoko.org/wiki/Advanced_Geocaching_Tool_for_Linux
 Vcs-git: git://git.debian.org/pkg-fso/advancedcaching.git
diff -u agtl-0.5.1/debian/changelog agtl-0.5.1/debian/changelog
--- agtl-0.5.1/debian/changelog
+++ agtl-0.5.1/debian/changelog
@@ -1,9 +1,25 @@
+agtl (0.5.1-1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, remaining changes: (LP: #523357)
+    - debian/control: Replace python2.5-dev Build-Depends with python-dev
+    - debian/pyversions: Replace "2.5" with "2.6-" to fix FTBFS
+
+ -- Artur Rona <ari-tczew@tlen.pl>  Wed, 17 Feb 2010 19:48:08 +0100
+
 agtl (0.5.1-1) unstable; urgency=low
 
   * New upstream release
 
  -- Heiko Stuebner <heiko@sntech.de>  Sat, 23 Jan 2010 22:03:18 +0100
 
+agtl (0.4.2+git20100113-1ubuntu1) lucid; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #507820)
+    - debian/control: Replace python2.5-dev Build-Depends with python-dev
+    - debian/pyversions: Replace "2.5" with "2.6-" to fix FTBFS (LP: #492792)
+
+ -- Andreas Moog <amoog@ubuntu.com>  Fri, 15 Jan 2010 09:46:47 +0100
+
 agtl (0.4.2+git20100113-1) unstable; urgency=low
 
   * New upstream-snapshot
@@ -11,6 +27,13 @@
 
  -- Heiko Stuebner <heiko@sntech.de>  Wed, 13 Jan 2010 20:18:23 +0100
 
+agtl (0.4.2-1ubuntu1) lucid; urgency=low
+
+  * debian/control: Replace python2.5-dev Build-Depends with python-dev
+  * debian/pyversions: Replace "2.5" with "2.6-" to fix FTBFS (LP: #492792)
+
+ -- David Futcher <bobbo@ubuntu.com>  Sat, 05 Dec 2009 10:54:03 +0000
+
 agtl (0.4.2-1) unstable; urgency=low
 
   * new upstream-release
diff -u agtl-0.5.1/debian/pyversions agtl-0.5.1/debian/pyversions
--- agtl-0.5.1/debian/pyversions
+++ agtl-0.5.1/debian/pyversions
@@ -1 +1 @@
-2.5
+2.6-