WIP - update zuul packaging for zuul 2.1.0
This updates build dependencies so that a zuul 2.1.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
parent
ab4765a06c
commit
c4cb8b7486
|
|
@ -1,3 +1,10 @@
|
|||
zuul (2.1.0-1) UNRELEASED; urgency=medium
|
||||
|
||||
* New upstream version.
|
||||
* Switch to building with dh-python/pybuild.
|
||||
|
||||
-- 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)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
8
|
||||
9
|
||||
|
|
|
|||
|
|
@ -2,49 +2,24 @@ Source: zuul
|
|||
Maintainer: Paul Belanger <paul.belanger@polybeacon.com>
|
||||
Section: python
|
||||
Priority: optional
|
||||
Build-Depends: debhelper (>= 8.0.0),
|
||||
openstack-pkg-tools,
|
||||
python (>= 2.6)
|
||||
Build-Depends-Indep:
|
||||
python-extras,
|
||||
python-git (>= 0.3.2~RC1),
|
||||
python-jenkins,
|
||||
python-lockfile,
|
||||
python-nose,
|
||||
python-paramiko,
|
||||
python-paste,
|
||||
python-setuptools,
|
||||
python-sphinx (>= 1.0.7+dfsg),
|
||||
python-statsd,
|
||||
python-voluptuous (<< 0.7),
|
||||
python-webob,
|
||||
python-yaml
|
||||
Standards-Version: 3.9.3
|
||||
X-Python-Version: >= 2.6
|
||||
Build-Depends-Indep: debhelper (>= 9),
|
||||
dh-python,
|
||||
python-all (>= 2.6.6-3),
|
||||
python-daemon,
|
||||
python-pbr (<< 1.0),
|
||||
python-pbr (>= 0.5.21),
|
||||
python-setuptools (>= 0.6b3),
|
||||
python-sphinx,
|
||||
python-sphinxcontrib.blockdiag (>= 0.5.5),
|
||||
python-sphinxcontrib.programoutput
|
||||
Standards-Version: 3.9.6
|
||||
Homepage: https://launchpad.net/zuul
|
||||
Vcs-Git: git://github.com/pabelanger/zuul-deb.git
|
||||
Vcs-Browser: https://github.com/pabelanger/zuul-deb
|
||||
|
||||
Package: zuul
|
||||
Architecture: all
|
||||
Depends: adduser,
|
||||
libjs-jquery,
|
||||
libjs-underscore,
|
||||
python-daemon,
|
||||
python-extras,
|
||||
python-git (>= 0.3.2~RC1),
|
||||
python-jenkins,
|
||||
python-lockfile,
|
||||
python-paramiko,
|
||||
python-paste,
|
||||
python-voluptuous (<< 0.7),
|
||||
python-webob,
|
||||
python-yaml,
|
||||
${misc:Depends},
|
||||
${python:Depends}
|
||||
Suggests:
|
||||
jenkins (>= 1.426),
|
||||
python-statsd
|
||||
Depends: ${misc:Depends}, ${python:Depends}, adduser
|
||||
Description: Trunk gating system
|
||||
Zuul is a program that is used to gate the source code repository of a project
|
||||
so that changes are only merged if they pass tests.
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
/etc/zuul
|
||||
/var/lib/zuul
|
||||
/var/lib/zuul/git
|
||||
/var/log/zuul
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
[git-buildpackage]
|
||||
export-dir = ../build-area/
|
||||
tarball-dir = ../tarballs/
|
||||
overlay = True
|
||||
pristine-tar = False
|
||||
compression = gzip
|
||||
|
|
@ -1 +0,0 @@
|
|||
debian/etc/zuul/* etc/zuul/
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
# Overwrite jquery.js from upstream tarball with a link to jquery.js
|
||||
# provided by jQuery Debian package
|
||||
/usr/share/javascript/jquery/jquery.js usr/share/doc/zuul/html/_static/jquery.js
|
||||
|
||||
# Overwrite underscore.js from upstream tarball with a link to underscore.min.js
|
||||
# provided by Underscore Debian package
|
||||
/usr/share/javascript/underscore/underscore.min.js usr/share/doc/zuul/html/_static/underscore.js
|
||||
|
|
@ -1 +0,0 @@
|
|||
build/docs/man/*
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1 @@
|
|||
no--W.diff
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
#!/bin/sh
|
||||
# postrm script for #PACKAGE#
|
||||
#
|
||||
# see: dh_installdeb(1)
|
||||
|
||||
set -e
|
||||
|
||||
# summary of how this script can be called:
|
||||
# * <postrm> `remove'
|
||||
# * <postrm> `purge'
|
||||
# * <old-postrm> `upgrade' <new-version>
|
||||
# * <new-postrm> `failed-upgrade' <old-version>
|
||||
# * <new-postrm> `abort-install'
|
||||
# * <new-postrm> `abort-install' <old-version>
|
||||
# * <new-postrm> `abort-upgrade' <old-version>
|
||||
# * <disappearer's-postrm> `disappear' <overwriter>
|
||||
# <overwriter-version>
|
||||
# for details, see http://www.debian.org/doc/debian-policy/ or
|
||||
# the debian-policy package
|
||||
|
||||
|
||||
case "$1" in
|
||||
purge)
|
||||
userdel -r zuul 2>/dev/null || true
|
||||
;;
|
||||
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postrm called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# dh_installdeb will replace this with shell code automatically
|
||||
# generated by other debhelper scripts.
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
python_daemon python-daemon
|
||||
statsd python-statsd
|
||||
|
|
@ -1,32 +1,18 @@
|
|||
#!/usr/bin/make -f
|
||||
|
||||
# Uncomment this to turn on verbose mode.
|
||||
#export DH_VERBOSE=1
|
||||
|
||||
UPSTREAM_GIT = git://github.com/openstack-infra/zuul.git
|
||||
|
||||
include /usr/share/openstack-pkg-tools/pkgos.make
|
||||
|
||||
export OSLO_PACKAGE_VERSION=$(VERSION)
|
||||
|
||||
# This file was automatically generated by stdeb 0.8.2 at
|
||||
# Tue, 16 Jun 2015 17:40:08 -0400
|
||||
export PYBUILD_NAME=zuul
|
||||
%:
|
||||
dh $@ --with python2,sphinxdoc
|
||||
dh $@ --with python2,sphinxdoc --buildsystem=pybuild
|
||||
|
||||
override_dh_auto_build:
|
||||
dh_auto_build
|
||||
$(MAKE) -C doc html man BUILDDIR=$(CURDIR)/build/docs
|
||||
|
||||
override_dh_auto_clean:
|
||||
dh_auto_clean
|
||||
rm -rf *.egg*
|
||||
|
||||
override_dh_auto_install:
|
||||
dh_auto_install
|
||||
install -D -m 0644 $(CURDIR)/etc/layout.yaml-sample $(CURDIR)/debian/etc/zuul/layout.yaml
|
||||
install -D -m 0644 $(CURDIR)/etc/logging.conf-sample $(CURDIR)/debian/etc/zuul/logging.conf
|
||||
install -D -m 0644 $(CURDIR)/etc/zuul.conf-sample $(CURDIR)/debian/etc/zuul/zuul.conf
|
||||
install -D -m 0644 $(CURDIR)/etc/layout.yaml-sample $(CURDIR)/debian/zuul/etc/zuul/layout.yaml
|
||||
install -D -m 0644 $(CURDIR)/etc/logging.conf-sample $(CURDIR)/debian/zuul/etc/zuul/logging.conf
|
||||
install -D -m 0644 $(CURDIR)/etc/zuul.conf-sample $(CURDIR)/debian/zuul/etc/zuul/zuul.conf
|
||||
|
||||
override_dh_auto_test:
|
||||
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
|
||||
nosetests
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
extend-diff-ignore = ".gitreview"
|
||||
|
|
@ -0,0 +1 @@
|
|||
build/docs/man/*.[1-8]
|
||||
|
|
@ -29,11 +29,6 @@ case "$1" in
|
|||
--gecos "Zuul trunk gating daemon" \
|
||||
zuul
|
||||
fi
|
||||
chown -R zuul:zuul /etc/zuul
|
||||
chown -R zuul:zuul /var/lib/zuul
|
||||
chown -R zuul:adm /var/log/zuul
|
||||
|
||||
chmod 0640 -R /etc/zuul/*
|
||||
|
||||
chmod 0750 /etc/zuul
|
||||
chmod 0750 /var/lib/zuul
|
||||
Loading…
Reference in New Issue