[Python-apps-commits] r7697 - in packages/trac-bitten/trunk/debian (8 files)
debacle at users.alioth.debian.org
debacle at users.alioth.debian.org
Wed Oct 19 23:55:49 UTC 2011
Date: Wednesday, October 19, 2011 @ 23:55:48
Author: debacle
Revision: 7697
More changes to packaging.
Added:
packages/trac-bitten/trunk/debian/trac-bitten-slave.default
packages/trac-bitten/trunk/debian/trac-bitten-slave.init
packages/trac-bitten/trunk/debian/trac-bitten-slave.install
packages/trac-bitten/trunk/debian/trac-bitten.install
Modified:
packages/trac-bitten/trunk/debian/changelog
packages/trac-bitten/trunk/debian/control
packages/trac-bitten/trunk/debian/rules
packages/trac-bitten/trunk/debian/watch
Modified: packages/trac-bitten/trunk/debian/changelog
===================================================================
--- packages/trac-bitten/trunk/debian/changelog 2011-10-19 23:23:30 UTC (rev 7696)
+++ packages/trac-bitten/trunk/debian/changelog 2011-10-19 23:55:48 UTC (rev 7697)
@@ -1,9 +1,10 @@
-trac-bitten (0.6.final-1) UNRELEASED; urgency=low
+trac-bitten (0.6+final-1) UNRELEASED; urgency=low
* New upstream version (Closes: #633918).
* Bump standards to 3.9.2. No changes.
* Make separate packages for master and slave (Closes: #575127).
- * Add init script for slave (Closes: # ...). (TODO!)
+ * Add init script for slave (Closes: #595153).
+ * Get rid of python-support. Use dh instead of CDBS.
[ anatoly techtonik <techtonik at gmail.com> ]
* New upstream version.
Modified: packages/trac-bitten/trunk/debian/control
===================================================================
--- packages/trac-bitten/trunk/debian/control 2011-10-19 23:23:30 UTC (rev 7696)
+++ packages/trac-bitten/trunk/debian/control 2011-10-19 23:55:48 UTC (rev 7697)
@@ -1,7 +1,7 @@
Source: trac-bitten
Section: web
Priority: optional
-Build-Depends: python-support, python-all, python-setuptools, debhelper (>= 7), cdbs, xsltproc, docbook-xsl
+Build-Depends: python-all (>= 2.6.6-3~), python-setuptools, debhelper (>= 7.0.50~), xsltproc, docbook-xsl
Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Uploaders: W. Martin Borgert <debacle at debian.org>
Standards-Version: 3.9.2
@@ -11,7 +11,7 @@
Package: trac-bitten
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, trac, trac-bitten-slave, python-pkg-resources
+Depends: ${python:Depends}, ${misc:Depends}, trac, trac-bitten-slave, python-pkg-resources, libjs-flot, libjs-excanvas
Recommends: trac-bitten-slave
Description: continuous integration plugin for Trac
Bitten is a Trac extension for continuous integration. It uses
@@ -19,10 +19,10 @@
actual tests, and a "master" gathers the results and displays
them nicely on a web page.
.
- Bitten is similar to BuildBot, Gump (Apache), Hudson (Sun), or
- Tinderbox (Mozilla), but integrated well into Trac.
+ Bitten is similar to BuildBot, Gump, Hudson, Jenkins, or
+ Tinderbox, but integrated well into Trac.
.
- This package contains the master, which integrates into Trac.
+ This package contains the master implemented as Trac plugin.
Package: trac-bitten-slave
Architecture: all
@@ -33,7 +33,7 @@
actual tests, and a "master" gathers the results and displays
them nicely on a web page.
.
- Bitten is similar to BuildBot, Gump (Apache), Hudson (Sun), or
- Tinderbox (Mozilla), but integrated well into Trac.
+ Bitten is similar to BuildBot, Gump, Hudson, Jenkins, or
+ Tinderbox, but integrated well into Trac.
.
This package contains the slave, which performs the actual build.
Modified: packages/trac-bitten/trunk/debian/rules
===================================================================
--- packages/trac-bitten/trunk/debian/rules 2011-10-19 23:23:30 UTC (rev 7696)
+++ packages/trac-bitten/trunk/debian/rules 2011-10-19 23:55:48 UTC (rev 7697)
@@ -1,22 +1,29 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM=pysupport
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
DEB_INSTALL_MANPAGES_trac-bitten=bitten-slave.1
DB2MAN=http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
XP=xsltproc --nonet --novalid
-binary-post-install/trac-bitten::
- chmod 644 `find debian/trac-bitten/usr/share/ -name '*.html' -o -name '*.png'`
+export DH_VERBOSE=1
-common-build-indep:: $(DEB_INSTALL_MANPAGES_trac-bitten)
+%:
+ dh $@ --with python2 --buildsystem=python_distutils
+override_dh_install: $(DEB_INSTALL_MANPAGES_trac-bitten)
+ dh_install --buildsystem=python_distutils
+# don't use embedded copies, use Debian packages instead
+ rm $(CURDIR)/debian/trac-bitten/usr/share/pyshared/bitten/htdocs/jquery.flot.js
+ rm $(CURDIR)/debian/trac-bitten/usr/share/pyshared/bitten/htdocs/excanvas.js
+# we don't need unit tests at run-time
+ rm -r $(CURDIR)/debian/trac-bitten/usr/share/pyshared/bitten/*/tests/
+ rm -f $(CURDIR)/debian/trac-bitten-slave/usr/share/pyshared/bitten/*/tests/
+# no x bits for HTML and PNG
+ chmod 644 `find $(CURDIR)/debian/trac-bitten/usr/share/ -name '*.html' -o -name '*.png'`
+
%.1: debian/%.dbk
$(XP) $(DB2MAN) $<
-clean::
+override_dh_clean:
+ dh_clean
rm -f $(DEB_INSTALL_MANPAGES_trac-bitten)
Added: packages/trac-bitten/trunk/debian/trac-bitten-slave.default
===================================================================
--- packages/trac-bitten/trunk/debian/trac-bitten-slave.default (rev 0)
+++ packages/trac-bitten/trunk/debian/trac-bitten-slave.default 2011-10-19 23:55:48 UTC (rev 7697)
@@ -0,0 +1,17 @@
+# -*- sh -*-
+# Don't start the daemon by default, let the user set it.
+
+# Alternatively, one can run the bitten-slave from crond or from an
+# SVN post-commit hook
+
+# Use "yes" (without double quotes) to make /etc/init.d/trac-bitten-slave
+# start the Bitten slave daemon.
+START_DAEMON=no
+
+# Run `/usr/bin/bitten-slave --help' for further options.
+# Esp. "--user" and "--password" are relevant to most users.
+DAEMON_ARGS="--config=/etc/bitten/slave.ini --interval=15"
+
+# Set one or more space separated URLs (with double quotes), such as
+# "https://trac.myserver.com/myproject/builds https://trac.myserver.com/herproject/builds"
+URLS=""
Added: packages/trac-bitten/trunk/debian/trac-bitten-slave.init
===================================================================
--- packages/trac-bitten/trunk/debian/trac-bitten-slave.init (rev 0)
+++ packages/trac-bitten/trunk/debian/trac-bitten-slave.init 2011-10-19 23:55:48 UTC (rev 7697)
@@ -0,0 +1,100 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: bitten-slave
+# required-start: $all
+# required-stop: $all
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: starts trac's bitten-slave
+# Description: starts trac's bitten-slave using start-stop-daemon
+### END INIT INFO
+
+# this script is a modified version of
+# http://bitten.edgewall.org/wiki/BittenSlaveDaemonUbuntu
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Trac Bitten Slave"
+NAME=trac-bitten-slave
+DAEMON=/usr/bin/bitten-slave
+DAEMON_ARGS="-f /etc/bitten/slave.ini --interval=$INTERVAL"
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+[ -n "$URLS" ] || exit 0
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+ start-stop-daemon --start --quiet --background --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS $URLS
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE --oknodo --retry 5
+ RETVAL="$?"
+ rm -f $PIDFILE
+ return "$RETVAL"
+}
+
+case "$1" in
+ start)
+ log_daemon_msg "Starting $DESC" "$NAME"
+ do_start
+ case "$?" in
+ 0|1) log_end_msg 0 ;;
+ 2) log_end_msg 1 ;;
+ esac
+ ;;
+ stop)
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1) log_end_msg 0 ;;
+ 2) log_end_msg 1 ;;
+ esac
+ ;;
+ restart|force-reload)
+ #
+ # If the "reload" option is implemented then remove the
+ # 'force-reload' alias
+ #
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1)
+ do_start
+ case "$?" in
+ 0) log_end_msg 0 ;;
+ 1) log_end_msg 1 ;; # Old process is still running
+ *) log_end_msg 1 ;; # Failed to start
+ esac
+ ;;
+ *)
+ # Failed to stop
+ log_end_msg 1
+ ;;
+ esac
+ ;;
+ *)
+ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+ exit 3
+ ;;
+esac
Added: packages/trac-bitten/trunk/debian/trac-bitten-slave.install
===================================================================
--- packages/trac-bitten/trunk/debian/trac-bitten-slave.install (rev 0)
+++ packages/trac-bitten/trunk/debian/trac-bitten-slave.install 2011-10-19 23:55:48 UTC (rev 7697)
@@ -0,0 +1,6 @@
+Bitten*.egg-info/ usr/share/pyshared/
+bitten-slave.1 usr/share/man/man1/
+bitten/build/ usr/share/pyshared/bitten/
+bitten/util/ usr/share/pyshared/bitten/
+bitten/{__init__,recipe,slave}.py usr/share/pyshared/bitten/
+usr/bin/bitten-slave /usr/bin/
Added: packages/trac-bitten/trunk/debian/trac-bitten.install
===================================================================
--- packages/trac-bitten/trunk/debian/trac-bitten.install (rev 0)
+++ packages/trac-bitten/trunk/debian/trac-bitten.install 2011-10-19 23:55:48 UTC (rev 7697)
@@ -0,0 +1,4 @@
+bitten/htdocs/ usr/share/pyshared/bitten/
+bitten/report/ usr/share/pyshared/bitten/
+bitten/templates/ usr/share/pyshared/bitten/
+bitten/{admin,api,main,master,model,notify,queue,upgrades,web_ui}.py usr/share/pyshared/bitten/
Modified: packages/trac-bitten/trunk/debian/watch
===================================================================
--- packages/trac-bitten/trunk/debian/watch 2011-10-19 23:23:30 UTC (rev 7696)
+++ packages/trac-bitten/trunk/debian/watch 2011-10-19 23:55:48 UTC (rev 7697)
@@ -1,2 +1,3 @@
version=3
-http://ftp.edgewall.com/pub/bitten/Bitten-([\d\.b]+).tar.gz
+opts=uversionmangle=s/$/+final/ \
+http://ftp.edgewall.com/pub/bitten/Bitten-(.*).tar.gz
More information about the Python-apps-commits
mailing list