diff -u tilp-6.81/debian/control tilp-6.81/debian/control
--- tilp-6.81/debian/control
+++ tilp-6.81/debian/control
@@ -1,13 +1,14 @@
 Source: tilp
 Section: math
 Priority: optional
-Maintainer: Krzysztof Burghardt <krzysztof@burghardt.pl>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Standards-Version: 3.8.0
 Build-Depends: debhelper (>= 4.1.16), dpatch, libticables3-dev (>= 3.9.7), libticalcs4-dev (>= 4.6.2), libtifiles0-dev (>= 0.6.6), libgtk2.0-dev, libglade2-dev, zlib1g-dev, gettext, groff-base, tofrodos, autotools-dev
 
 Package: tilp
 Architecture: any
-Depends: ${shlibs:Depends}, iceape-browser | www-browser
+Depends: ${shlibs:Depends}, firefox | abrowser | www-browser
 Description: TI calculator <-> PC communication program for X
  TiLP is a Texas Instruments calculator <-> PC communication program for
  Linux. It is able to use any type of link, like the original TI GRAPH-LINK
diff -u tilp-6.81/debian/changelog tilp-6.81/debian/changelog
--- tilp-6.81/debian/changelog
+++ tilp-6.81/debian/changelog
@@ -1,3 +1,11 @@
+tilp (6.81-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #295766):
+    - replace depends on iceape-browser with firefox
+    - alternatively depend on abrowser
+
+ -- Nick Ellery <nick.ellery@ubuntu.com>  Sat, 22 Nov 2008 19:21:07 -0800
+
 tilp (6.81-1) unstable; urgency=low
 
   * New upstream release. (Closes: #463687)
@@ -6,6 +14,22 @@
 
  -- Krzysztof Burghardt <krzysztof@burghardt.pl>  Sun, 19 Oct 2008 20:56:06 +0200
 
+tilp (6.80-5ubuntu2) intrepid; urgency=low
+
+  * fix LP: #272772: packages that Depend/Recommend/Suggest firefox
+    (meta-package) must alternatively Depend/Recommend/Suggest abrowser
+    - update debian/control
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 22 Sep 2008 03:38:14 +0200
+
+tilp (6.80-5ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable. (LP: #176635) remaining changes:
+    - debian/control: replace iceape-browser with firefox in the depends field. 
+    - debian/control: Change Maintainer/XSBC-Original-Maintainer field. 
+
+ -- Stefan Ebner <hellboy195@gmail.com>  Sun, 17 Feb 2008 16:21:11 +0100
+
 tilp (6.80-5) unstable; urgency=low
 
   * QA upload.
@@ -22,6 +46,26 @@
 
  -- Philipp Kern <pkern@debian.org>  Sat, 15 Dec 2007 18:31:58 +0100
 
+tilp (6.80-4ubuntu3) gutsy; urgency=low
+
+  * Add debian/patches/03_undef_gtk_disable_deprecated.dpatch. 
+
+ -- Michael Bienia <geser@ubuntu.com>  Mon, 03 Sep 2007 18:18:04 +0200
+
+tilp (6.80-4ubuntu2) feisty; urgency=low
+
+  * Adjusts desktop file according with freedesktop spec (LP: #66901)
+
+ -- Jonh Wendell <wendell@ubuntu.com>  Tue, 20 Mar 2007 17:05:04 -0300
+
+tilp (6.80-4ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/control: replace iceape-browser with firefox in the depends field. 
+  * debian/control: Change Maintainer/XSBC-Original-Maintainer field.
+
+ -- Michael Bienia <geser@ubuntu.com>  Fri, 16 Feb 2007 19:57:04 +0100
+
 tilp (6.80-4) unstable; urgency=low
 
   * QA upload.
@@ -30,6 +74,12 @@
 
  -- Michael Ablassmeier <abi@debian.org>  Mon, 22 Jan 2007 10:26:34 +0100
 
+tilp (6.80-3ubuntu1) feisty; urgency=low
+
+  * debian/control: replace mozilla-browser with firefox in the depends field. 
+
+ -- Michael Bienia <geser@ubuntu.com>  Wed, 14 Feb 2007 17:45:30 +0100
+
 tilp (6.80-3) unstable; urgency=low
 
   * QA upload.
@@ -577,0 +628 @@
+