diff -u pytrainer-1.7.2/debian/control pytrainer-1.7.2/debian/control
--- pytrainer-1.7.2/debian/control
+++ pytrainer-1.7.2/debian/control
@@ -1,7 +1,8 @@
 Source: pytrainer
 Section: utils
 Priority: optional
-Maintainer: Noèl Köthe <noel@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Noèl Köthe <noel@debian.org>
 Build-Depends-Indep: python (>= 2.5.3-1~), python-support (>= 1.0.0)
 Build-Depends: debhelper (>= 5.0.0)
 Standards-Version: 3.8.4
@@ -9,7 +10,7 @@
 
 Package: pytrainer
 Architecture: all
-Depends: ${misc:Depends}, python, python-libxml2, python-lxml, python-pysqlite2, python-glade2, python-gtk2, python-matplotlib, python-scipy, python-numpy, gpsbabel, iceweasel | firefox | abrowser, python-gtkmozembed, python-soappy, zenity
+Depends: ${misc:Depends}, python, python-libxml2, python-lxml, python-pysqlite2, python-gtk2, python-matplotlib, python-scipy, python-numpy, gpsbabel, firefox | abrowser, python-gtkmozembed, python-soappy, zenity
 Description: The Free Sport Training Center
  Pytrainer is a tool to log your sport activities. This software was
  originally thought for cyclists, but it can also be used for other
diff -u pytrainer-1.7.2/debian/changelog pytrainer-1.7.2/debian/changelog
--- pytrainer-1.7.2/debian/changelog
+++ pytrainer-1.7.2/debian/changelog
@@ -1,3 +1,12 @@
+pytrainer (1.7.2-1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable (LP: #599457), remaining changes:
+    - debian/control:
+      + Replace Depends on iceweasel with firefox | abrowser.
+      + Drop dependency on python-glade2 (libglade -> gtkbuilder transition).
+
+ -- Lorenzo De Liso <blackz@ubuntu.com>  Mon, 28 Jun 2010 18:53:32 +0200
+
 pytrainer (1.7.2-1) unstable; urgency=low
 
   * new upstream release from 2010-04-11
@@ -10,6 +19,15 @@
 
  -- Noèl Köthe <noel@debian.org>  Wed, 12 May 2010 15:33:22 +0200
 
+pytrainer (1.7.1-1.1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, remaining changes
+    - debian/control:
+      + Replace Depends on iceweasel with firefox | abrowser.
+      - Drop dependency on python-glade2 (libglade -> gtkbuilder transition).
+
+ -- Luke Faraone <luke@faraone.cc>  Tue, 16 Mar 2010 09:14:39 -0400
+
 pytrainer (1.7.1-1.1) unstable; urgency=low
 
   * Non-maintainer upload, to prepare for Python 2.6 transition
@@ -29,6 +47,19 @@
 
  -- Sandro Tosi <morph@debian.org>  Thu, 04 Mar 2010 15:00:30 +0100
 
+pytrainer (1.7.1-1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, remaining changes:
+    - debian/control:
+      + Replace Depends on iceweasel with firefox | abrowser.
+      + Bump python-dev,debhelper build-dependencies.
+      - Drop dependency on python-glade2 (libglade -> gtkbuilder transition).
+    - debian/rules:
+      + Append --install-laoyut=deb to setup.py install to prevent a build
+        failure with Python 2.6.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Thu, 04 Feb 2010 06:07:11 +0100
+
 pytrainer (1.7.1-1) unstable; urgency=low
 
   * new upstream release from 2010-01-24
@@ -42,6 +73,17 @@
 
  -- Noèl Köthe <noel@debian.org>  Sun, 24 Jan 2010 20:54:37 +0100
 
+pytrainer (1.7.0-1ubuntu1) lucid; urgency=low
+
+  * Merge from debian unstable (LP: #477875), Ubuntu remaining changes:
+    - Replace Depends on iceweasel with firefox | abrowser.
+    - Add --install-layout=deb to setup.py install arguments to prevent FTBFS
+      with Python 2.6 on Ubuntu.
+    - Bump-up debhelper, python-dev build-dependencies.
+  * Remove python-glade2 (libglade -> gtkbuilder transition).
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Sun, 13 Dec 2009 03:01:28 +0100
+
 pytrainer (1.7.0-1) unstable; urgency=low
 
   * new upstream release
@@ -64,6 +106,20 @@
 
  -- Noèl Köthe <noel@debian.org>  Thu, 24 Sep 2009 07:49:38 +0200
 
+pytrainer (1.6.0.8-1ubuntu2) karmic; urgency=low
+
+  * Replace Depends on iceweasel with firefox | abrowser.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Fri, 14 Aug 2009 08:56:38 +0200
+
+pytrainer (1.6.0.8-1ubuntu1) karmic; urgency=low
+
+  * Add --install-layout=deb to setup.py install arguments to build with
+    Python 2.6, fix FTBFS.
+  * Bump-up debhelper, python-dev build-dependencies.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Mon, 25 May 2009 14:45:08 +0200
+
 pytrainer (1.6.0.8-1) unstable; urgency=low
 
   * new upstream release from 2009-04-19