6 files changed, 6 insertions, 13 deletions
diff --git a/debian/paramiko-doc.doc-base b/debian/paramiko-doc.doc-base
index 8dfa767..e5336d1 100644
--- a/debian/paramiko-doc.doc-base
+++ b/debian/paramiko-doc.doc-base
@@ -1,9 +1,9 @@
 Document: python-paramiko
 Title: Paramiko
-Author: Robey Pointer <robeypointer@gmail.com>
+Author: Jeff Forcier <jeff@bitprophet.org>
 Abstract: A Python interface to the paramiko SSH2 protocol library
 Section: Programming/Python
 
 Format: html
-Index: /usr/share/doc/paramiko-doc/docs/index.html
-Files: /usr/share/doc/paramiko-doc/docs/*.html
+Index: /usr/share/doc/paramiko-doc/html/index.html
+Files: /usr/share/doc/paramiko-doc/html/*.html
diff --git a/debian/paramiko-doc.docs b/debian/paramiko-doc.docs
index d60fe81..e46fb13 100644
--- a/debian/paramiko-doc.docs
+++ b/debian/paramiko-doc.docs
@@ -1,2 +1,2 @@
 README
-docs
+html
diff --git a/debian/python-paramiko.examples b/debian/paramiko-doc.examples
index dde105a..dde105a 100644
--- a/debian/python-paramiko.examples
+++ b/debian/paramiko-doc.examples
diff --git a/debian/rules b/debian/rules
index 16a5683..ff9e733 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,14 +30,14 @@ override_dh_install:
 
 override_dh_installdocs:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-	epydoc --no-private -o docs/ paramiko
+	epydoc --no-private -o html/ paramiko
 endif
 	dh_installdocs
 
 override_dh_clean:
 	dh_clean
 	rm -rf build
-	rm -rf docs/a*.* docs/b* docs/c* docs/e* docs/f* docs/h* docs/id* docs/l* docs/m* docs/pa* docs/r* docs/st* docs/t* docs/u*
+	rm -rf html
 
 # Commands not to run
 override_dh_installcatalogs override_dh_installcron:
diff --git a/debian/tests/control b/debian/tests/control
deleted file mode 100644
index 799e33c..0000000
--- a/debian/tests/control
+++ /dev/null
@@ -1,3 +0,0 @@
-Tests: upstream
-Depends: @
-Restrictions: allow-stderr
diff --git a/debian/tests/upstream b/debian/tests/upstream
deleted file mode 100644
index 6ede8fe..0000000
--- a/debian/tests/upstream
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -e
-
-python ./test.py --verbose