diff -u mnemosyne-1.2.1/debian/changelog mnemosyne-1.2.1/debian/changelog
--- mnemosyne-1.2.1/debian/changelog
+++ mnemosyne-1.2.1/debian/changelog
@@ -1,3 +1,29 @@
+mnemosyne (1.2.1-2.1ubuntu1) maverick; urgency=low
+
+  * Merge from debian testing. (LP: #602564) Remaining changes:
+    - Fix FTBFS.
+    - Fix python deprecation warnings.
+    - Clean all pyc files in debian/rules clean.
+    - Clean 'build'.
+    - Reintroduce dropped call to --install-platlib.
+    - Add dvipng to suggests
+    - This new version fixes corrupt mnemosyne.png problem.
+    - debian/rules: also delete build directory Mnemosyne.egg-info
+   
+  * Added package kdelibs to Recommends. (LP: #465967)
+
+ -- Bilal Akhtar <bilalakhtar96@yahoo.com>  Wed, 07 Jul 2010 10:04:30 +0300
+
+mnemosyne (1.2.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Pass --install-layout=deb to setup.py to install files correctly
+    when build with Python 2.6 as default (Closes: #571480)
+  * Increase minimum build-dependency on python-support to 0.90
+    and on Python to 2.5.3-1~.
+
+ -- Jonathan Wiltshire <debian@jwiltshire.org.uk>  Fri, 05 Mar 2010 12:35:40 +0000
+
 mnemosyne (1.2.1-2ubuntu1) lucid; urgency=low
 
   [ Bhavani Shankar ]
diff -u mnemosyne-1.2.1/debian/rules mnemosyne-1.2.1/debian/rules
--- mnemosyne-1.2.1/debian/rules
+++ mnemosyne-1.2.1/debian/rules
@@ -26,7 +26,7 @@
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	python setup.py install --no-compile --root=$(PREFIX) --install-lib=/usr/share/python-support/mnemosyne --prefix=/usr
+	python setup.py install --no-compile --root=$(PREFIX) --install-layout=deb
 
 binary-indep: build install
 	dh_testdir
diff -u mnemosyne-1.2.1/debian/control mnemosyne-1.2.1/debian/control
--- mnemosyne-1.2.1/debian/control
+++ mnemosyne-1.2.1/debian/control
@@ -3,12 +3,13 @@
 Priority: extra
 Maintainer: Robert Collins <robert@ubuntu.com>
 XSBC-Original-Maintainer: Robert Lemmen <robertle@semistable.com>
-Build-Depends: debhelper (>= 7), python-support, python, python-setuptools, sharutils, imagemagick
+Build-Depends: debhelper (>= 7), python-support (>= 0.90), python (>= 2.5.3-1~), python-setuptools, sharutils, imagemagick
 Standards-Version: 3.8.3
 
 Package: mnemosyne
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-qt3, python-pygame
+Recommends: kdelibs
 Suggests: dvipng
 Homepage: http://mnemosyne-proj.sourceforge.net
 Description: spaced repetition flash-card program