diff -u epsilon-0.6.0/debian/changelog epsilon-0.6.0/debian/changelog
--- epsilon-0.6.0/debian/changelog
+++ epsilon-0.6.0/debian/changelog
@@ -1,9 +1,19 @@
-epsilon (0.6.0-1ubuntu1) lucid; urgency=low
+epsilon (0.6.0-3) unstable; urgency=low
 
-  * debian/patches/python-2.6.diff: Fine-tune the Python 2.6 patch. (taken from
-    Debian SVN. Thanks Jakub Wilk). This fixes a FTBFS in python-axiom.
+  * Fix another FTBFS due to setUpClass being removed from Twisted
+    Trial. Closes: #573695.
 
- -- Fabrice Coutadeur <fabricesp@ubuntu.com>  Fri, 19 Feb 2010 21:10:03 +0000
+ -- Vincent Bernat <bernat@debian.org>  Sun, 14 Mar 2010 12:08:33 +0100
+
+epsilon (0.6.0-2) unstable; urgency=low
+
+  [ Jakub Wilk ]
+  * Fine-tune the Python 2.6 patch.
+
+  [ Vincent Bernat ]
+  * Bump Standards Version To 3.8.4.
+
+ -- Vincent Bernat <bernat@debian.org>  Mon, 01 Mar 2010 20:56:25 +0100
 
 epsilon (0.6.0-1) unstable; urgency=low
 
diff -u epsilon-0.6.0/debian/runtrial.py epsilon-0.6.0/debian/runtrial.py
--- epsilon-0.6.0/debian/runtrial.py
+++ epsilon-0.6.0/debian/runtrial.py
@@ -9,7 +9,7 @@
 _path = sys.path[:]
 sys.path[:] = []
 addsitedir(join(root, site_packages[1:]))
-addsitedir(join(root, 'usr/lib/python2.6/site-packages')) #for whatever reason cdbs still installs python modules in site-packages
+addsitedir(join(root, site_packages[1:].replace('dist-packages', 'site-packages'))) # cdbs installs python modules in site-packages even for Python 2.6
 sys.path.extend(_path)
 
 from twisted.scripts.trial import run
diff -u epsilon-0.6.0/debian/control epsilon-0.6.0/debian/control
--- epsilon-0.6.0/debian/control
+++ epsilon-0.6.0/debian/control
@@ -1,12 +1,11 @@
 Source: epsilon
 Section: python
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
+Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Stefano Zacchiroli <zack@debian.org>, Tristan Seligmann <mithrandi@mithrandi.net>, Vincent Bernat <bernat@debian.org>
 Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), python, python-support (>= 0.4), quilt
 Build-Depends-Indep: python-twisted-core, python-openssl, python-nevow, python-zopeinterface
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/epsilon/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/epsilon/trunk/
 Homepage: http://www.divmod.org/trac/wiki/DivmodEpsilon
diff -u epsilon-0.6.0/debian/patches/series epsilon-0.6.0/debian/patches/series
--- epsilon-0.6.0/debian/patches/series
+++ epsilon-0.6.0/debian/patches/series
@@ -3,0 +4 @@
+dont-use-setupclass.diff
only in patch2:
unchanged:
--- epsilon-0.6.0.orig/debian/patches/dont-use-setupclass.diff
+++ epsilon-0.6.0/debian/patches/dont-use-setupclass.diff
@@ -0,0 +1,16 @@
+Fix for #573695.
+
+Using setUp instead of setUpClass works just fine. The initialization is done for
+each test, but everything seems to work.
+
+--- a/epsilon/test/test_sslverify.py~	2008-08-13 16:37:06.000000000 +0200
++++ a/epsilon/test/test_sslverify.py	2010-03-14 12:09:22.000000000 +0100
+@@ -83,7 +83,7 @@
+             message="Use twisted.internet.ssl instead of epsilon.sslverify.",
+             category=DeprecationWarning)]
+ 
+-    def setUpClass(self):
++    def setUp(self):
+         # Import the module here so that the warning emitted at import time
+         # gets suppressed.  Modify a global instead of setting an attribute
+         # or some other such nice thing so as not to have to change a bunch