diff -Nru qtiplot-0.9.8/debian/changelog qtiplot-0.9.8/debian/changelog
--- qtiplot-0.9.8/debian/changelog	2010-10-07 00:11:59.000000000 +0100
+++ qtiplot-0.9.8/debian/changelog	2010-10-07 00:27:57.000000000 +0100
@@ -1,3 +1,12 @@
+qtiplot (0.9.8-2ubuntu1) maverick; urgency=low
+
+  * Merge with Debian unstable (LP: #656046).  Remaining changes:
+    - Build-Depends on libqtassistantclient-dev
+      Recommends qt-assistant-compat to fix a FTBFS since qtassistant
+      is removed in qt > 4.6 (LP: #598826)
+
+ -- Alexander Valavanis <valavanisalex@googlemail.com>  Thu, 07 Oct 2010 00:21:00 +0100
+
 qtiplot (0.9.8-2) unstable; urgency=low
 
   * Bump standards version to 3.9.1
@@ -7,6 +16,15 @@
 
  -- Gudjon I. Gudjonsson <gudjon@gudjon.org>  Wed, 29 Sep 2010 21:59:36 +0200
 
+qtiplot (0.9.8-1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable(LP: #605027).  Remaining changes:
+    - Build-Depends on libqtassistantclient-dev
+      Recommends qt-assistant-compat to fix a FTBFS since qtassistant
+      is removed in qt > 4.6 (LP: #598826) 
+
+ -- Scott Howard <showard314@gmail.com>  Tue, 24 Aug 2010 18:09:11 -0400
+
 qtiplot (0.9.8-1) unstable; urgency=low
 
   * New upstream release
@@ -40,6 +58,24 @@
 
  -- Gudjon I. Gudjonsson <gudjon@gudjon.org>  Wed, 28 Apr 2010 08:50:00 +0200
 
+qtiplot (0.9.7.10+r1453-1ubuntu2) lucid; urgency=low
+
+  * Rebuild against new SIP, no changes (LP: #518473)
+
+ -- Scott Howard <showard314@gmail.com>  Sun, 07 Feb 2010 16:13:25 -0500
+
+qtiplot (0.9.7.10+r1453-1ubuntu1) lucid; urgency=low
+
+  * Synced with Debian testing, removed all previous Ubuntu changes
+    (LP: #494111)
+  * New Ubuntu changes:
+  * debian/control
+    - MOTU maintainers
+  * debian/01_build_system.diff
+    - 's/python2.5/python2.6/'
+
+ -- Scott Howard <showard314@gmail.com>  Tue, 08 Dec 2009 18:06:27 -0500
+
 qtiplot (0.9.7.10+r1453-1) unstable; urgency=low
 
   [ Gudjon I. Gudjonsson ]
diff -Nru qtiplot-0.9.8/debian/control qtiplot-0.9.8/debian/control
--- qtiplot-0.9.8/debian/control	2010-10-07 00:11:59.000000000 +0100
+++ qtiplot-0.9.8/debian/control	2010-10-07 00:20:43.000000000 +0100
@@ -1,13 +1,15 @@
 Source: qtiplot
 Section: math
 Priority: optional
-Maintainer:  Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer:  Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
 Uploaders: Gudjon I. Gudjonsson <gudjon@gudjon.org>,
  Andreas Tille <tille@debian.org>
 Build-Depends: debhelper (>= 7), quilt, dblatex, docbook-utils, doxygen,
  libgsl0-dev, zlib1g-dev, libpng12-dev,
  liborigin2-dev (>=1:06042009+svn1724), libmuparser-dev (>=1.32), python-all-dev (>= 2.4.4),
- python-qt4, python-qt4-dev, python-sip4-dev, sip4, libqt4-opengl-dev
+ python-qt4, python-qt4-dev, python-sip4-dev, sip4, libqt4-opengl-dev,
+ libqtassistantclient-dev
 Standards-Version: 3.9.1
 Homepage: http://soft.proindependent.com/qtiplot.html
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/qtiplot/trunk/
@@ -18,6 +20,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python-qt4, libqt4-opengl,
  python-central, python-sip4 (>=4.9-1)
+Recommends: qt-assistant-compat
 Description: data analysis and scientific plotting
  Qtiplot is a fully fledged plotting software similar to the OriginLab Origin
  software (See http://www.originlab.com for more information about Origin).