diff -Nru qtiplot-0.9.7.14/debian/changelog qtiplot-0.9.7.14/debian/changelog
--- qtiplot-0.9.7.14/debian/changelog	2010-05-23 13:47:34.000000000 +0530
+++ qtiplot-0.9.7.14/debian/changelog	2010-07-13 21:15:17.000000000 +0530
@@ -1,3 +1,16 @@
+qtiplot (0.9.7.14-1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable. Changes from previous version:
+    - debian/01_build_system.diff
+      + 's/python2.5/python2.6/'
+  * New changes:
+    + debian/control:
+      - Add libqtassistantclient-dev to Build-Depends
+      - Add qt-assistant-compat to Depends
+  * These changes fix FTBFS and hence LP: #605027, LP: #598826
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Tue, 13 Jul 2010 21:09:28 +0530
+
 qtiplot (0.9.7.14-1) unstable; urgency=low
 
   * New upstream release
@@ -23,6 +36,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.7.14/debian/control qtiplot-0.9.7.14/debian/control
--- qtiplot-0.9.7.14/debian/control	2010-05-23 13:47:04.000000000 +0530
+++ qtiplot-0.9.7.14/debian/control	2010-07-13 21:09:20.000000000 +0530
@@ -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.8.4
 Homepage: http://soft.proindependent.com/qtiplot.html
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/qtiplot/trunk/
@@ -17,7 +19,7 @@
 Package: qtiplot
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python-qt4, libqt4-opengl,
- python-central, python-sip4 (>=4.9-1)
+ python-central, python-sip4 (>=4.9-1), 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).
diff -Nru qtiplot-0.9.7.14/debian/patches/01_build_system.diff qtiplot-0.9.7.14/debian/patches/01_build_system.diff
--- qtiplot-0.9.7.14/debian/patches/01_build_system.diff	2010-05-01 13:48:20.000000000 +0530
+++ qtiplot-0.9.7.14/debian/patches/01_build_system.diff	2010-07-13 21:07:12.000000000 +0530
@@ -63,12 +63,12 @@
      isEmpty(PYTHON): PYTHON = python
 -    INCLUDEPATH += $$system($$PYTHON python-includepath.py)
 -    LIBS        += $$system($$PYTHON -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
-+    INCLUDEPATH += /usr/include/python2.5
-+    LIBS        += -lpython2.5
++    INCLUDEPATH += /usr/include/python2.6
++    LIBS        += -lpython2.6 
      LIBS        += -lm
      system(mkdir -p $${SIP_DIR})
 -    system($$system($$PYTHON python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip)
-+    system($$system(python2.5 python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip)
++    system($$system(python2.6 python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip)
    }
  
    win32 {