Initial update for 1.2.0

This fails to build properly because of new dependencies. Working with
wikimedia to get them added into Debian.

Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
This commit is contained in:
Paul Belanger 2013-03-27 15:07:48 -04:00
parent 764374927f
commit 39bf65974f
5 changed files with 43 additions and 6 deletions

4
debian/changelog vendored
View File

@ -1,5 +1,5 @@
zuul (1.0-1) UNRELEASED; urgency=low
zuul (1.2.0-1) UNRELEASED; urgency=low
* Initial release
-- Paul Belanger <paul.belanger@polybeacon.com> Fri, 12 Oct 2012 19:55:53 -0400
-- Paul Belanger <paul.belanger@polybeacon.com> Wed, 27 Mar 2013 10:41:16 -0400

4
debian/control vendored
View File

@ -5,6 +5,7 @@ Priority: optional
Build-Depends: debhelper (>= 8.0.0),
python (>= 2.6)
Build-Depends-Indep:
python-extras,
python-git (>= 0.3.2~RC1),
python-jenkins,
python-lockfile,
@ -13,6 +14,7 @@ Build-Depends-Indep:
python-paste,
python-setuptools,
python-sphinx,
python-voluptuous,
python-webob,
python-yaml
Standards-Version: 3.9.3
@ -21,11 +23,13 @@ Package: zuul
Architecture: all
Depends: jenkins (>= 1.426),
python-daemon,
python-extras,
python-git (>= 0.3.2~RC1),
python-jenkins,
python-lockfile,
python-paramiko,
python-paste,
python-voluptuous,
python-webob,
python-yaml,
${misc:Depends},

View File

@ -0,0 +1,29 @@
From 46b55c5a7461936fe332a016f45217b8ea134341 Mon Sep 17 00:00:00 2001
From: Paul Belanger <paul.belanger@polybeacon.com>
Date: Wed, 27 Mar 2013 10:52:29 -0400
Subject: [PATCH] Fix import error for zuul version with docs
When using sphinx-build to generate documentation, it would fail to
properly find our version information.
Change-Id: Iee14aa76b69ca9398688345cb2dcd0db9ecdaedc
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
---
doc/source/conf.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
index f357e29..2e05cc2 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -16,7 +16,7 @@ import sys, os
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+sys.path.insert(0, os.path.abspath('../..'))
# -- General configuration -----------------------------------------------------
--
1.7.9.5

1
debian/patches/series vendored Normal file
View File

@ -0,0 +1 @@
0001-Fix-import-error-for-zuul-version-with-docs.patch

11
debian/rules vendored
View File

@ -4,11 +4,15 @@
#export DH_VERBOSE=1
%:
dh $@ --with-python2
dh $@ --with python2,sphinxdoc
override_dh_auto_build:
dh_auto_build
python setup.py build_sphinx
$(MAKE) -C doc html man BUILDDIR=$(CURDIR)/build/docs
override_dh_auto_clean:
dh_auto_clean
rm -rf *.egg*
override_dh_auto_test:
nosetests
@ -20,5 +24,4 @@ override_dh_install:
install -D -m 0644 $(CURDIR)/etc/zuul.conf-sample $(CURDIR)/debian/etc/zuul/zuul.conf
get-orig-source:
@@[ -d ../tarballs/. ] || mkdir -p ../tarballs
uscan --verbose --force-download --rename --destdir=../tarballs
uscan --noconf --force-download --rename --repack --destdir=.