From 95953ee70a91ba4f768bec5ad2a1241d3c3be7de Mon Sep 17 00:00:00 2001 From: "Jeremy T. Bouse" Date: Tue, 27 May 2014 19:57:20 -0400 Subject: Clean up build environment Remove extraneous files from debian/tests as I'm noot sure when these were introduced exactly or why but they don't appear to be used in anyway during the build. Clean up doc to use html/ rather than docs/ directory Include examples/ in doc package rather than python-paramiko now that we have python3-paramiko as well. --- debian/paramiko-doc.doc-base | 6 +++--- debian/paramiko-doc.docs | 2 +- debian/paramiko-doc.examples | 1 + debian/python-paramiko.examples | 1 - debian/rules | 4 ++-- debian/tests/control | 3 --- debian/tests/upstream | 4 ---- 7 files changed, 7 insertions(+), 14 deletions(-) create mode 100644 debian/paramiko-doc.examples delete mode 100644 debian/python-paramiko.examples delete mode 100644 debian/tests/control delete mode 100644 debian/tests/upstream 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 +Author: Jeff Forcier 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/paramiko-doc.examples b/debian/paramiko-doc.examples new file mode 100644 index 0000000..dde105a --- /dev/null +++ b/debian/paramiko-doc.examples @@ -0,0 +1 @@ +demos/* diff --git a/debian/python-paramiko.examples b/debian/python-paramiko.examples deleted file mode 100644 index dde105a..0000000 --- a/debian/python-paramiko.examples +++ /dev/null @@ -1 +0,0 @@ -demos/* 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 -- cgit v1.2.3