From de5d84c3f8c0b1a4b4e60fe277ce984ceb7c46b2 Mon Sep 17 00:00:00 2001
From: Clint Adams <clint@gcfm.net>
Date: Tue, 26 May 2015 17:44:06 -0400
Subject: [PATCH] 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
---
 debian/changelog          |  6 ++++++
 debian/control            | 27 +++++++++++++++++++--------
 debian/manpages           |  2 +-
 debian/patches/no--W.diff | 13 +++++++++++++
 debian/patches/series     |  1 +
 5 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 debian/patches/no--W.diff

diff --git a/debian/changelog b/debian/changelog
index b586d61..6fcaa9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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)
diff --git a/debian/control b/debian/control
index d6dd685..c289d69 100644
--- a/debian/control
+++ b/debian/control
@@ -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},
diff --git a/debian/manpages b/debian/manpages
index 0d670ea..fefa96b 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1 +1 @@
-build/docs/man/*
+build/docs/man/*.[1-8]
diff --git a/debian/patches/no--W.diff b/debian/patches/no--W.diff
new file mode 100644
index 0000000..d93c372
--- /dev/null
+++ b/debian/patches/no--W.diff
@@ -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
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..52c36e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no--W.diff