diff -Nru qtiplot-0.9.8/debian/changelog qtiplot-0.9.8/debian/changelog
--- qtiplot-0.9.8/debian/changelog	2010-10-07 00:12:50.000000000 +0100
+++ qtiplot-0.9.8/debian/changelog	2010-10-07 00:27:57.000000000 +0100
@@ -1,3 +1,21 @@
+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
+  * Add comments to patches
+  * Removing accidental patch, debian-changes that prevents qtiplot from
+    depending on python 2.6 (Closes: #594341) 
+
+ -- 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:
diff -Nru qtiplot-0.9.8/debian/control qtiplot-0.9.8/debian/control
--- qtiplot-0.9.8/debian/control	2010-10-07 00:12:50.000000000 +0100
+++ qtiplot-0.9.8/debian/control	2010-10-07 00:20:43.000000000 +0100
@@ -10,7 +10,7 @@
  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,
  libqtassistantclient-dev
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://soft.proindependent.com/qtiplot.html
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/qtiplot/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/qtiplot/trunk
diff -Nru qtiplot-0.9.8/debian/patches/01_build_system.diff qtiplot-0.9.8/debian/patches/01_build_system.diff
--- qtiplot-0.9.8/debian/patches/01_build_system.diff	2010-10-07 00:12:50.000000000 +0100
+++ qtiplot-0.9.8/debian/patches/01_build_system.diff	2010-10-07 00:14:06.000000000 +0100
@@ -1,3 +1,5 @@
+Changes the build system to use libraries from the Debian package system
+and fixes installation directories
 --- a/qtiplot.pro
 +++ b/qtiplot.pro
 @@ -1,7 +1,5 @@
diff -Nru qtiplot-0.9.8/debian/patches/02_fix_paths.diff qtiplot-0.9.8/debian/patches/02_fix_paths.diff
--- qtiplot-0.9.8/debian/patches/02_fix_paths.diff	2010-10-07 00:12:50.000000000 +0100
+++ qtiplot-0.9.8/debian/patches/02_fix_paths.diff	2010-10-07 00:14:06.000000000 +0100
@@ -1,3 +1,4 @@
+Installs qti_wordlist to /usr/share/qtiplot
 --- a/qtiplot/src/core/ApplicationWindow.cpp
 +++ b/qtiplot/src/core/ApplicationWindow.cpp
 @@ -17735,7 +17735,7 @@
diff -Nru qtiplot-0.9.8/debian/patches/debian-changes-0.9.8-1 qtiplot-0.9.8/debian/patches/debian-changes-0.9.8-1
--- qtiplot-0.9.8/debian/patches/debian-changes-0.9.8-1	2010-10-07 00:12:50.000000000 +0100
+++ qtiplot-0.9.8/debian/patches/debian-changes-0.9.8-1	1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-Description: Upstream changes introduced in version 0.9.8-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- qtiplot (0.9.8-1) unstable; urgency=low
- .
-   * New upstream release
-   * Bump standards version to 3.9.0
-   * Change python version to 2.6
- .
- The person named in the Author field signed this changelog entry.
-Author: Gudjon I. Gudjonsson <gudjon@gudjon.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- qtiplot-0.9.8.orig/qtiplot/qtiplot.pro
-+++ qtiplot-0.9.8/qtiplot/qtiplot.pro
-@@ -166,11 +166,11 @@ contains(SCRIPTING_LANGS, Python) {
- 
-   unix {
-     isEmpty(PYTHON): PYTHON = python
--    INCLUDEPATH += /usr/include/python2.6
--    LIBS        += -lpython2.6
-+    INCLUDEPATH += /usr/include/python2.5
-+    LIBS        += -lpython2.5
-     LIBS        += -lm
-     system(mkdir -p $${SIP_DIR})
--    system($$system(python2.6 python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip)
-+    system($$system(python2.5 python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip)
-   }
- 
-   win32 {