diff -u mgltools-vision-1.5.4.cvs.20100912/debian/rules mgltools-vision-1.5.4.cvs.20100912/debian/rules
--- mgltools-vision-1.5.4.cvs.20100912/debian/rules
+++ mgltools-vision-1.5.4.cvs.20100912/debian/rules
@@ -13,7 +13,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 install::
 	find . -name "runVision" | xargs -r chmod +x 
diff -u mgltools-vision-1.5.4.cvs.20100912/debian/control mgltools-vision-1.5.4.cvs.20100912/debian/control
--- mgltools-vision-1.5.4.cvs.20100912/debian/control
+++ mgltools-vision-1.5.4.cvs.20100912/debian/control
@@ -1,7 +1,8 @@
 Source: mgltools-vision
 Section: non-free/science
 Priority: optional
-Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 XS-Autobuild: yes
 Uploaders: Steffen Moeller <moeller@debian.org>, Sargis Dallakyan <sargis@scripps.edu>,
diff -u mgltools-vision-1.5.4.cvs.20100912/debian/changelog mgltools-vision-1.5.4.cvs.20100912/debian/changelog
--- mgltools-vision-1.5.4.cvs.20100912/debian/changelog
+++ mgltools-vision-1.5.4.cvs.20100912/debian/changelog
@@ -1,3 +1,16 @@
+mgltools-vision (1.5.4.cvs.20100912-1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #670120). Remaining changes:
+    - debian/rules: uncommented the simple-patchsys.mk include
+    - debian/patches/python2.6.patch: patch Vision/bin/vision to use python
+      instead of python2.5
+  * Dropped changes (superceded in Debian):
+    - debian/control:
+      + Added support for python2.6 by updating XS-Python-version
+      + Changed build-dependency from python2.5-dev to python-dev
+
+ -- Angel Abad <angelabad@ubuntu.com>  Tue, 02 Nov 2010 21:23:52 +0100
+
 mgltools-vision (1.5.4.cvs.20100912-1) unstable; urgency=low
 
   * New upstream version.
@@ -19,6 +32,18 @@
   * Allow byte-compilation for Python >= 2.5 (closes: 586851)
 
  -- Piotr Ożarowski <piotr@debian.org>  Fri, 09 Jul 2010 23:55:58 +0200
+
+mgltools-vision (1.5.4.cvs.20090603-1ubuntu1) karmic; urgency=low
+
+  * debian/control: 
+    - Added support for python2.6 (LP: #39196) by updating XS-Python-version
+    - Changed build-dependency from python2.5-dev to python-dev
+  * debian/rules: uncommented the simple-patchsys.mk include
+  * debian/patches/python2.6.patch: patch Vision/bin/vision to use python 
+    instead of python2.5
+
+ -- Fabrice Coutadeur <fabricesp@ubuntu.com>  Thu, 25 Jun 2009 06:07:37 +0000
+
 mgltools-vision (1.5.4.cvs.20090603-1) unstable; urgency=low
 
   * New upstream version.
@@ -56,0 +82 @@
+
only in patch2:
unchanged:
--- mgltools-vision-1.5.4.cvs.20100912.orig/debian/patches/python2.6.patch
+++ mgltools-vision-1.5.4.cvs.20100912/debian/patches/python2.6.patch
@@ -0,0 +1,9 @@
+diff -Nur -x '*.orig' -x '*~' mgltools-vision-1.5.4.cvs.20090603/Vision/bin/vision mgltools-vision-1.5.4.cvs.20090603.new/Vision/bin/vision
+--- mgltools-vision-1.5.4.cvs.20090603/Vision/bin/vision	2007-10-30 21:22:10.000000000 +0000
++++ mgltools-vision-1.5.4.cvs.20090603.new/Vision/bin/vision	2009-06-25 19:35:02.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2.5
++#!/usr/bin/env python
+ #
+ 
+ import sys