diff -Nru python-cyclone-1.1/debian/changelog python-cyclone-1.1/debian/changelog
--- python-cyclone-1.1/debian/changelog	2013-08-14 22:24:22.000000000 +0000
+++ python-cyclone-1.1/debian/changelog	2015-08-08 21:30:31.000000000 +0000
@@ -1,3 +1,15 @@
+python-cyclone (1.1-2) unstable; urgency=low
+
+  * Update and fix watch file to use simple PyPI API.
+  * Update Vcs-Browser URL.
+  * Switch to debhelper 9, dh-python, and pybuild.
+  * Only override permissions for examples that need it. This
+    should make the build reproducible.
+  * Add lintian overrides for some errors triggered by examples.
+  * Bump Standards-Version, no changes required.
+
+ -- Jérémy Bobbio <lunar@debian.org>  Sat, 08 Aug 2015 23:30:16 +0200
+
 python-cyclone (1.1-1) unstable; urgency=low
 
   * Initial release. (Closes: #719233)
diff -Nru python-cyclone-1.1/debian/compat python-cyclone-1.1/debian/compat
--- python-cyclone-1.1/debian/compat	2013-08-14 22:24:22.000000000 +0000
+++ python-cyclone-1.1/debian/compat	2015-08-08 21:30:31.000000000 +0000
@@ -1 +1 @@
-8
+9
diff -Nru python-cyclone-1.1/debian/control python-cyclone-1.1/debian/control
--- python-cyclone-1.1/debian/control	2013-08-14 22:24:22.000000000 +0000
+++ python-cyclone-1.1/debian/control	2015-08-08 21:30:31.000000000 +0000
@@ -2,14 +2,15 @@
 Maintainer: Jérémy Bobbio <lunar@debian.org>
 Section: python
 Priority: extra
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
+               dh-python,
                python-all (>= 2.6.6-3~),
                python-setuptools,
                python-twisted
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 X-Python-Version: >= 2.6
 Vcs-Git: git://anonscm.debian.org/git/collab-maint/python-cyclone.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/python-cyclone.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/python-cyclone.git
 Homepage: http://cyclone.io/
 
 Package: python-cyclone
diff -Nru python-cyclone-1.1/debian/python-cyclone.lintian-overrides python-cyclone-1.1/debian/python-cyclone.lintian-overrides
--- python-cyclone-1.1/debian/python-cyclone.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ python-cyclone-1.1/debian/python-cyclone.lintian-overrides	2015-08-08 21:30:31.000000000 +0000
@@ -0,0 +1,9 @@
+# These are exmaples, so it's up to people using them to treat users right
+python-cyclone binary: privacy-breach-may-use-debian-package usr/share/doc/python-cyclone/examples/chat/templates/index.html You may use libjs-jquery package. (http://ajax.googleapis.com/ajax/libs/jquery/1.3/jquery.min.js)
+python-cyclone binary: privacy-breach-facebook usr/share/doc/python-cyclone/examples/fbgraphapi/templates/modules/post.html (//graph.facebook.com/{{ escape(post[)
+python-cyclone binary: privacy-breach-may-use-debian-package usr/share/doc/python-cyclone/examples/websocket/chat/templates/index.html You may use libjs-jquery package. (http://ajax.googleapis.com/ajax/libs/jquery/1.3/jquery.min.js)
+python-cyclone binary: privacy-breach-may-use-debian-package usr/share/doc/python-cyclone/examples/websocket/chat/templates/stats.html You may use libjs-jquery package. (http://yandex.st/jquery/1.7.1/jquery.min.js)
+python-cyclone binary: privacy-breach-may-use-debian-package usr/share/doc/python-cyclone/examples/websocket/chat/templates/stats.html You may use libjs-jquery-flot package. (http://yandex.st/jquery/flot/0.7/jquery.flot.min.js)
+
+# This script is indeed for twistd, no problem
+python-cyclone binary: example-unusual-interpreter usr/share/doc/python-cyclone/examples/helloworld/helloworld_twistd.py #!twistd
diff -Nru python-cyclone-1.1/debian/rules python-cyclone-1.1/debian/rules
--- python-cyclone-1.1/debian/rules	2013-08-14 22:24:22.000000000 +0000
+++ python-cyclone-1.1/debian/rules	2015-08-08 21:30:31.000000000 +0000
@@ -1,19 +1,20 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --buildsystem=python_distutils --with=python2
+	dh $@ --with=python2 --buildsystem=pybuild
 
 override_dh_install:
-	dh_install -O--buildsystem=python_distutils
+	dh_install -O--buildsystem=pybuild
 	rm -f debian/python-cyclone/usr/bin/cyclone
 
+override_dh_fixperms:
+	dh_fixperms -O--buildsystem=pybuild
+	chmod 644 debian/python-cyclone/usr/share/doc/python-cyclone/examples/helloworld/helloworld_simple.py
+	chmod 644 debian/python-cyclone/usr/share/doc/python-cyclone/examples/ssl/helloworld_simple.py
+
 override_dh_clean:
-	dh_clean -O--buildsystem=python_distutils
+	dh_clean -O--buildsystem=pybuild
 	rm -f twisted/plugins/dropin.cache
 
-override_dh_fixperms:
-	dh_fixperms -O--buildsystem=python_distutils -Xexamples/
-	find debian/python-cyclone/usr/share/doc/python-cyclone/examples -type f -name '*.py' -print0 | xargs -0 chmod 644
-
 override_dh_compress:
-	dh_compress -O--buildsystem=python_distutils -Xexamples/
+	dh_compress -O--buildsystem=pybuild -Xexamples/
diff -Nru python-cyclone-1.1/debian/watch python-cyclone-1.1/debian/watch
--- python-cyclone-1.1/debian/watch	2013-08-14 22:24:22.000000000 +0000
+++ python-cyclone-1.1/debian/watch	2015-08-08 21:30:31.000000000 +0000
@@ -1,3 +1,3 @@
 version=3
-https://pypi.python.org/pypi/cyclone \
-        https://pypi.python.org/packages/source/c/cyclone/cyclone-(.+)\.tar\.gz
+https://pypi.python.org/simple/cyclone \
+        .*/cyclone-(.+)\.tar\.gz#.*