diff -Nru buildbot-0.8.5/debian/buildbot.postinst buildbot-0.8.5/debian/buildbot.postinst --- buildbot-0.8.5/debian/buildbot.postinst 2011-06-29 15:47:06.000000000 +0000 +++ buildbot-0.8.5/debian/buildbot.postinst 2012-02-25 20:19:11.000000000 +0000 @@ -6,9 +6,6 @@ USER_NAME=buildbot USER_DESCR="Buildbot system user" -#PID_DIR=/var/run/buildbot -#LOG_DIR=/var/log/buildbot - case "$1" in configure) # Create builbot user account if not exist @@ -27,11 +24,6 @@ # Fix permissions on $HOME_DIR recursively chown -R $USER_NAME: $HOME_DIR - - ## Fix permissions on created directories - #mkdir -p $PID_DIR $LOG_DIR - #chown $USER_NAME: $PID_DIR $LOG_DIR - #chmod 775 $PID_DIR $LOG_DIR ;; abort-upgrade|abort-remove|abort-deconfigure) diff -Nru buildbot-0.8.5/debian/buildbot.postrm buildbot-0.8.5/debian/buildbot.postrm --- buildbot-0.8.5/debian/buildbot.postrm 2011-06-29 15:47:06.000000000 +0000 +++ buildbot-0.8.5/debian/buildbot.postrm 2012-02-25 20:16:08.000000000 +0000 @@ -4,8 +4,6 @@ USER_DESCR="Buildbot system user" MASTERS_DIR=~buildbot/masters -#PID_DIR=/var/run/buildbot -#LOG_DIR=/var/log/buildbot PACKAGE= STATE= @@ -13,16 +11,15 @@ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear|remove) ;; purge) + # Do not remove system user until bug #621833 is resolved + # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621833 # Remove the user and its home dir if no buildbot packages left - if ! (dpkg --get-selections 'buildbot*' | egrep -q '(install|hold|deinstall)') ; then - if getent passwd buildbot >/dev/null ; then - echo "Removing $USER_DESCR ..." - deluser --quiet --system --remove-home buildbot - fi - else - rm -rf $MASTERS_DIR - #rm -rf $PID_DIR $LOG_DIR - fi + #if ! (dpkg --get-selections 'buildbot*' | egrep -q '(install|hold|deinstall)') ; then + # if getent passwd buildbot >/dev/null ; then + # echo "Removing $USER_DESCR ..." + # deluser --quiet --system --remove-home buildbot + # fi + #fi ;; *) echo "postrm called with unknown argument \`$1'" >&2 diff -Nru buildbot-0.8.5/debian/changelog buildbot-0.8.5/debian/changelog --- buildbot-0.8.5/debian/changelog 2011-11-10 22:22:57.000000000 +0000 +++ buildbot-0.8.5/debian/changelog 2012-02-25 23:47:48.000000000 +0000 @@ -1,11 +1,24 @@ -buildbot (0.8.5-1ubuntu1) precise; urgency=low +buildbot (0.8.5-2) unstable; urgency=low - * Add missing build-dependency on python-twisted-words, fixes FTBFS. - * Add fix-irc-support.patch fixing broken IRC support. - (Closes: #647420) - * Upload for new version closes LP: #536615, #791626. + * Remove buildmaster-use-MASTER_PREFIXCMD.patch as fixed upstream. + * Cherry-pick deb-bug-647420.patch from upstream (Closes: #647420). Thanks + to Brice Goglin. + * Add Depends: python-sqlalchemy, phyton-migrate, python-twisted-web + (Closes: #660389). Thanks to Tobias Frost. + * postrm: + - do not remove system user on purge (Refs: #621833, closes: #656536) + - do not remove user created data on purge + + -- Andriy Senkovych Sun, 26 Feb 2012 01:09:33 +0200 + +buildbot (0.8.5-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS due to missing build-dependency on python-twisted-words": + add python-twisted-words to Build-Depends (thanks to Ubuntu / Daniel T + Chen for the bug report and the fix). (Closes: #648384) - -- Daniel T Chen Thu, 10 Nov 2011 17:10:18 -0500 + -- gregor herrmann Tue, 17 Jan 2012 17:53:00 +0100 buildbot (0.8.5-1) unstable; urgency=low diff -Nru buildbot-0.8.5/debian/control buildbot-0.8.5/debian/control --- buildbot-0.8.5/debian/control 2011-11-10 22:09:15.000000000 +0000 +++ buildbot-0.8.5/debian/control 2012-02-25 14:40:30.000000000 +0000 @@ -1,8 +1,7 @@ Source: buildbot Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Matthias Klose +Maintainer: Matthias Klose Uploaders: Andriy Senkovych Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.6-3), python-twisted-core (>= 2.0), python-twisted-web, python-twisted-mail, python-jinja2 (>= 2.1), python-mock, texinfo, python-sqlalchemy, python-migrate, python-twisted-words Homepage: http://buildbot.net @@ -11,8 +10,8 @@ Package: buildbot Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python-twisted-core (>= 2.0), python-twisted-words, python-jinja2 (>= 2.1), adduser, dpkg (>= 1.15.4) | install-info -Recommends: buildbot-slave, python-twisted-mail, python-twisted-web +Depends: ${python:Depends}, ${misc:Depends}, python-sqlparse, python-migrate, python-twisted-core (>= 2.0), python-twisted-words, python-twisted-web, python-jinja2 (>= 2.1), adduser, dpkg (>= 1.15.4) | install-info +Recommends: buildbot-slave, python-twisted-mail Suggests: bzr | subversion | cvs | mercurial | darcs | git-core Description: system to automate the compile/test cycle The BuildBot is a system to automate the compile/test cycle required diff -Nru buildbot-0.8.5/debian/patches/buildmaster-use-MASTER_PREFIXCMD.patch buildbot-0.8.5/debian/patches/buildmaster-use-MASTER_PREFIXCMD.patch --- buildbot-0.8.5/debian/patches/buildmaster-use-MASTER_PREFIXCMD.patch 2011-07-01 12:16:00.000000000 +0000 +++ buildbot-0.8.5/debian/patches/buildmaster-use-MASTER_PREFIXCMD.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Description: Fix *_PREFIXCMD usage in init script - This patch fixes Debian bug #627918. -Author: Andreas Beckmann -Forwarded: https://github.com/buildbot/buildbot/pull/172 -Applied-Upstream: https://github.com/buildbot/buildbot/commit/58c4d57584 -Last-Update: 2011-06-29 - ---- a/contrib/init-scripts/buildmaster.init.sh -+++ b/contrib/init-scripts/buildmaster.init.sh -@@ -112,7 +112,7 @@ - function master_op () { - op=$1 ; mi=$2 - -- ${MASTER_PREFIXCMD[$1]} \ -+ ${MASTER_PREFIXCMD[$mi]} \ - su -s /bin/sh \ - -c "$MASTER_RUNNER $op --quiet ${MASTER_OPTIONS[$mi]} ${MASTER_BASEDIR[$mi]}" \ - - ${MASTER_USER[$mi]} diff -Nru buildbot-0.8.5/debian/patches/deb-bug-647420.patch buildbot-0.8.5/debian/patches/deb-bug-647420.patch --- buildbot-0.8.5/debian/patches/deb-bug-647420.patch 1970-01-01 00:00:00.000000000 +0000 +++ buildbot-0.8.5/debian/patches/deb-bug-647420.patch 2012-02-24 22:10:46.000000000 +0000 @@ -0,0 +1,36 @@ +From 1fed964da6b1c15e409dacb6ce0c9585e3669f3c Mon Sep 17 00:00:00 2001 +From: "Dustin J. Mitchell" +Date: Sun, 25 Sep 2011 10:23:59 -0500 +Subject: [PATCH] fix error when forcing build from IRC with no properties + defined (in tutorial) + + buildbot/status/words.py | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +Origin: upstream, https://github.com/buildbot/buildbot/commit/1fed96 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=647420 + +diff --git a/buildbot/status/words.py b/buildbot/status/words.py +index a511969..4f45041 100644 +--- a/buildbot/status/words.py ++++ b/buildbot/status/words.py +@@ -495,7 +495,7 @@ class Contact(base.StatusReceiver): + self.send("sorry, bad revision '%s'" % revision) + return + +- properties = None ++ properties = Properties() + if props: + # split props into name:value dict + pdict = {} +@@ -505,7 +505,6 @@ class Contact(base.StatusReceiver): + pdict[splitproperty[0]] = splitproperty[1] + + # set properties +- properties = Properties() + for prop in pdict: + pname = prop + pvalue = pdict[prop] +-- +1.7.9.1 + diff -Nru buildbot-0.8.5/debian/patches/fix-irc-support.patch buildbot-0.8.5/debian/patches/fix-irc-support.patch --- buildbot-0.8.5/debian/patches/fix-irc-support.patch 2011-11-10 22:21:01.000000000 +0000 +++ buildbot-0.8.5/debian/patches/fix-irc-support.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -Index: buildbot-0.8.5/buildbot/status/words.py -=================================================================== ---- buildbot-0.8.5.orig/buildbot/status/words.py 2011-11-10 17:20:59.000000000 -0500 -+++ buildbot-0.8.5/buildbot/status/words.py 2011-11-10 17:20:57.000000000 -0500 -@@ -495,7 +495,7 @@ - self.send("sorry, bad revision '%s'" % revision) - return - -- properties = None -+ properties = Properties() - if props: - # split props into name:value dict - pdict = {} -@@ -505,7 +505,6 @@ - pdict[splitproperty[0]] = splitproperty[1] - - # set properties -- properties = Properties() - for prop in pdict: - pname = prop - pvalue = pdict[prop] diff -Nru buildbot-0.8.5/debian/patches/series buildbot-0.8.5/debian/patches/series --- buildbot-0.8.5/debian/patches/series 2011-11-10 22:20:27.000000000 +0000 +++ buildbot-0.8.5/debian/patches/series 2012-02-24 22:14:40.000000000 +0000 @@ -1,3 +1,3 @@ fix-interpreters.patch fix-init-scripts.patch -fix-irc-support.patch +deb-bug-647420.patch