WIP - update zuul packaging for zuul 2.0.0

This updates build dependencies so that a zuul 2.0.0 package can be
built.

At this time it is necessary to invoke sphinx without -W because
the two program-output directives in doc/source/client.rst cannot
succeed.

Change-Id: I7b3cbf1fdfdad051633b4c32c86bfa5c8ab9b5df
This commit is contained in:
Clint Adams 2015-05-26 17:44:06 -04:00
parent f4ceb7eba4
commit de5d84c3f8
5 changed files with 40 additions and 9 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
zuul (2.0.0-1) UNRELEASED; urgency=medium
* New upstream version.
-- Clint Adams <clint@debian.org> Tue, 26 May 2015 17:41:14 -0400
zuul (1.3.0-1) UNRELEASED; urgency=low
* Initial release (Closes: #705844)

27
debian/control vendored
View File

@ -9,17 +9,28 @@ Build-Depends-Indep:
python-extras,
python-git (>= 0.3.2~RC1),
python-jenkins,
python-lockfile,
python-lockfile (>= 0.8),
python-nose,
python-paramiko,
python-paramiko (>= 1.8.0),
python-paste,
python-pbr (>= 0.5.21),
python-pbr (<< 1.0),
python-setuptools,
python-sphinx (>= 1.0.7+dfsg),
python-sphinx (>= 1.1.2),
python-statsd,
python-voluptuous (<< 0.7),
python-voluptuous (>= 0.7),
python-webob,
python-yaml
Standards-Version: 3.9.3
python-yaml,
python-coverage (>= 3.6),
python-fixtures (>= 0.3.14),
python-daemon,
python-gear,
python-sphinxcontrib.blockdiag (>= 0.5.5),
python-sphinxcontrib.programoutput,
python-subunit,
python-testrepository (>= 0.0.17),
python-testtools (>= 0.9.32),
Standards-Version: 3.9.6
X-Python-Version: >= 2.6
Homepage: https://launchpad.net/zuul
Vcs-Git: git://github.com/pabelanger/zuul-deb.git
@ -35,9 +46,9 @@ Depends: adduser,
python-git (>= 0.3.2~RC1),
python-jenkins,
python-lockfile,
python-paramiko,
python-paramiko (>= 1.8.0),
python-paste,
python-voluptuous (<< 0.7),
python-voluptuous (>= 0.7),
python-webob,
python-yaml,
${misc:Depends},

2
debian/manpages vendored
View File

@ -1 +1 @@
build/docs/man/*
build/docs/man/*.[1-8]

13
debian/patches/no--W.diff vendored Normal file
View File

@ -0,0 +1,13 @@
Index: zuul-2.0.0/doc/Makefile
===================================================================
--- zuul-2.0.0.orig/doc/Makefile
+++ zuul-2.0.0/doc/Makefile
@@ -2,7 +2,7 @@
#
# You can set these variables from the command line.
-SPHINXOPTS = -W
+SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR = build

View File

@ -0,0 +1 @@
no--W.diff