diff -Nru mgltools-vision-1.5.4.cvs.20090603/debian/changelog mgltools-vision-1.5.4.cvs.20100912/debian/changelog
--- mgltools-vision-1.5.4.cvs.20090603/debian/changelog	2010-11-02 21:42:02.000000000 +0100
+++ mgltools-vision-1.5.4.cvs.20100912/debian/changelog	2010-11-02 21:42:04.000000000 +0100
@@ -1,3 +1,38 @@
+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.
+
+ -- Steffen Moeller <moeller@debian.org>  Sun, 12 Sep 2010 00:20:31 +0200
+
+mgltools-vision (1.5.4.cvs.20090603-2) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Enhances: autodocktools
+    - debhelper 7
+    - Standards-Version: 3.8.3 (no changes needed)
+
+ -- Andreas Tille <tille@debian.org>  Fri, 16 Oct 2009 22:31:10 +0200
+
+mgltools-vision (1.5.4.cvs.20090603-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * 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: 
@@ -44,3 +79,4 @@
   * Initial release, contributes to closing ITP #458811.
 
  -- Steffen Moeller <moeller@debian.org>  Thu, 31 Jul 2008 22:00:08 +0200
+
diff -Nru mgltools-vision-1.5.4.cvs.20090603/debian/compat mgltools-vision-1.5.4.cvs.20100912/debian/compat
--- mgltools-vision-1.5.4.cvs.20090603/debian/compat	2010-11-02 21:42:02.000000000 +0100
+++ mgltools-vision-1.5.4.cvs.20100912/debian/compat	2010-11-02 21:42:04.000000000 +0100
@@ -1 +1 @@
-5
+7
diff -Nru mgltools-vision-1.5.4.cvs.20090603/debian/control mgltools-vision-1.5.4.cvs.20100912/debian/control
--- mgltools-vision-1.5.4.cvs.20090603/debian/control	2010-11-02 21:42:02.000000000 +0100
+++ mgltools-vision-1.5.4.cvs.20100912/debian/control	2010-11-02 21:42:04.000000000 +0100
@@ -1,14 +1,15 @@
 Source: mgltools-vision
 Section: non-free/science
 Priority: optional
-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
-XSBC-Original-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>
-Build-Depends: debhelper (>= 5.0.38), python-central (>= 0.5.6), cdbs (>= 0.4), python-dev
-Standards-Version: 3.8.1
-XS-Python-Version: 2.6
+Uploaders: Steffen Moeller <moeller@debian.org>, Sargis Dallakyan <sargis@scripps.edu>,
+ Andreas Tille <tille@debian.org>
+Build-Depends: debhelper (>= 7), python-central (>= 0.5.6), cdbs (>= 0.4), python-all
+Standards-Version: 3.9.1.0
+XS-Python-Version: >= 2.5
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mgltools/vision/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/mgltools/vision/trunk/
 Homepage: http://mgltools.scripps.edu/
@@ -17,6 +18,7 @@
 XB-Python-Version: ${python:Versions}
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, mgltools-networkeditor, mgltools-mglutil
+Enhances: autodocktools
 Description: Python-based Visual Programming Environment
  This package is part of the mgltools set of Python libraries which
  provide an infrastructure for the analysis of protein structures and