diff -u guppy-0.1.9/debian/changelog guppy-0.1.9/debian/changelog
--- guppy-0.1.9/debian/changelog
+++ guppy-0.1.9/debian/changelog
@@ -1,3 +1,11 @@
+guppy (0.1.9-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix test fail on python 2.7. (Closes: 614498)
+    Thanks to Sebastian Ramacher.
+
+ -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Thu, 29 Sep 2011 19:36:15 +0900
+
 guppy (0.1.9-2) unstable; urgency=low
 
   * Boosted policy compliance to 3.8.4.0 -- no changes seems to be due.
diff -u guppy-0.1.9/src/sets/bitset.c guppy-0.1.9/src/sets/bitset.c
--- guppy-0.1.9/src/sets/bitset.c
+++ guppy-0.1.9/src/sets/bitset.c
@@ -2011,7 +2011,11 @@
 {
     NyBits *buf;
     int r = -1;
+#if PY_VERSION_HEX >= 0x02070000
+    Py_ssize_t e;
+#else
     int e;
+#endif
     long num_poses, num_bytes;
     double num_bits, x;
     int cpl = 0;