diff -Nru cherrypy3-3.5.0/debian/changelog cherrypy3-3.5.0/debian/changelog
--- cherrypy3-3.5.0/debian/changelog	2014-12-02 11:37:42.000000000 +0000
+++ cherrypy3-3.5.0/debian/changelog	2016-06-14 21:02:59.000000000 +0000
@@ -1,3 +1,14 @@
+cherrypy3 (3.5.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Add missing dependency on python-dev, fixes FTBFS.
+  * Adjust __repr__ in NamespaceSet and Appliction classes for reproducibility.
+    The repr string could contain memory addresses which will not
+    be sanitized by Epydoc at the time of documentation generation.
+  * Do not make current timestamp a global variable documented by Epydoc.
+
+ -- Sascha Steinbiss <sascha@steinbiss.name>  Thu, 09 Jun 2016 22:43:55 +0000
+
 cherrypy3 (3.5.0-2) unstable; urgency=medium
 
   * debian/control:
diff -Nru cherrypy3-3.5.0/debian/control cherrypy3-3.5.0/debian/control
--- cherrypy3-3.5.0/debian/control	2014-12-02 11:37:42.000000000 +0000
+++ cherrypy3-3.5.0/debian/control	2016-06-09 22:45:08.000000000 +0000
@@ -2,7 +2,7 @@
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 9), python-setuptools (>= 0.6a9), python-all (>= 2.6.6-3~), help2man, python-nose, python3-all, python3-nose, python3-setuptools, dh-python
+Build-Depends: debhelper (>= 9), python-setuptools (>= 0.6a9), python-all (>= 2.6.6-3~), help2man, python-nose, python3-all, python3-nose, python3-setuptools, dh-python, python-dev, python3-dev
 Build-Depends-Indep: python-epydoc
 Standards-Version: 3.9.5
 Homepage: http://www.cherrypy.org/
diff -Nru cherrypy3-3.5.0/debian/patches/05_reproducible.diff cherrypy3-3.5.0/debian/patches/05_reproducible.diff
--- cherrypy3-3.5.0/debian/patches/05_reproducible.diff	1970-01-01 00:00:00.000000000 +0000
+++ cherrypy3-3.5.0/debian/patches/05_reproducible.diff	2016-06-14 20:53:11.000000000 +0000
@@ -0,0 +1,48 @@
+Description: make build reproducible
+ This patch addresses several peculiarities that cause Epydoc-created
+ documentation to include non-deterministic information, making the build
+ non-reproducible.
+Author: Sascha Steinbiss <sascha@steinbiss.name>
+--- a/cherrypy/lib/reprconf.py
++++ b/cherrypy/lib/reprconf.py
+@@ -120,8 +120,7 @@
+                     handler(k, v)
+ 
+     def __repr__(self):
+-        return "%s.%s(%s)" % (self.__module__, self.__class__.__name__,
+-                              dict.__repr__(self))
++        return "%s.%s" % (self.__module__, self.__class__.__name__)
+ 
+     def __copy__(self):
+         newobj = self.__class__()
+--- a/cherrypy/test/_test_states_demo.py
++++ b/cherrypy/test/_test_states_demo.py
+@@ -1,7 +1,6 @@
+ import os
+ import sys
+ import time
+-starttime = time.time()
+ 
+ import cherrypy
+ 
+@@ -21,6 +20,7 @@
+     pid.exposed = True
+ 
+     def start(self):
++        starttime = time.time()
+         return repr(starttime)
+     start.exposed = True
+ 
+--- a/cherrypy/_cptree.py
++++ b/cherrypy/_cptree.py
+@@ -59,8 +59,8 @@
+             self.merge(config)
+ 
+     def __repr__(self):
+-        return "%s.%s(%r, %r)" % (self.__module__, self.__class__.__name__,
+-                                  self.root, self.script_name)
++        return "%s.%s(%r)" % (self.__module__, self.__class__.__name__,
++                                  self.script_name)
+ 
+     script_name_doc = """The URI "mount point" for this app. A mount point
+     is that portion of the URI which is constant for all URIs that are
diff -Nru cherrypy3-3.5.0/debian/patches/series cherrypy3-3.5.0/debian/patches/series
--- cherrypy3-3.5.0/debian/patches/series	2014-06-30 21:19:07.000000000 +0000
+++ cherrypy3-3.5.0/debian/patches/series	2016-06-14 20:31:17.000000000 +0000
@@ -3,3 +3,4 @@
 02_issue_1328.diff
 03_issue_1199.diff
 04_issue_1315.diff
+05_reproducible.diff