diff -Nru pcs-0.9.153/debian/changelog pcs-0.9.153/debian/changelog --- pcs-0.9.153/debian/changelog 2016-07-13 09:26:34.000000000 +0000 +++ pcs-0.9.153/debian/changelog 2016-07-30 15:20:30.000000000 +0000 @@ -1,3 +1,13 @@ +pcs (0.9.153-2) unstable; urgency=medium + + * Fix package description + * Drop unused dependencies: ruby-thor, ruby-tilt + * Re-enable the upstream init script + * Fix test fail with ruby-json 2.0 (Closes: #832172) + * Avoid depending on thread finish order in tests + + -- Valentin Vidic Sat, 30 Jul 2016 11:28:50 +0200 + pcs (0.9.153-1) unstable; urgency=medium * New upstream version. diff -Nru pcs-0.9.153/debian/control pcs-0.9.153/debian/control --- pcs-0.9.153/debian/control 2016-07-13 09:26:34.000000000 +0000 +++ pcs-0.9.153/debian/control 2016-07-30 07:58:34.000000000 +0000 @@ -39,8 +39,6 @@ ruby-rpam-ruby19, ruby-sinatra, ruby-sinatra-contrib, - ruby-thor, - ruby-tilt, rubygems-integration Recommends: pacemaker (>= 1.1.12) Replaces: pacemaker (<< 1.1.12) @@ -49,7 +47,7 @@ # conflict with it so it isn't loaded accidentally Conflicts: python-pcs Description: Pacemaker Configuration System - pcs is a corosync and pacemaker configuration tool. It permits + pcs is a corosync and pacemaker configuration tool. It permits users to easily view, modify and create pacemaker based clusters. . pcs also provides pcsd, which operates as a GUI and remote server diff -Nru pcs-0.9.153/debian/patches/0009-Fix-testsuite.patch pcs-0.9.153/debian/patches/0009-Fix-testsuite.patch --- pcs-0.9.153/debian/patches/0009-Fix-testsuite.patch 2016-07-13 09:26:34.000000000 +0000 +++ pcs-0.9.153/debian/patches/0009-Fix-testsuite.patch 2016-07-30 07:58:34.000000000 +0000 @@ -303,3 +303,25 @@ assert returnVal == 0 assert output == "", [output] +--- a/pcsd/test/test_config.rb ++++ b/pcsd/test/test_config.rb +@@ -125,7 +125,7 @@ + assert_equal( + [[ + 'error', +- "Unable to parse pcs_settings file: 399: unexpected token at '\"rh71-node2\"\n ]\n }\n ]\n}'" ++ "Unable to parse pcs_settings file: 409: unexpected token at '\"rh71-node2\"\n ]\n }\n ]\n}'" + ]], + $logger.log + ) +--- a/pcs/test/test_utils.py ++++ b/pcs/test/test_utils.py +@@ -1797,7 +1797,7 @@ + wait_seconds=.1 + ) + +- self.assertEqual(log, ['first', 'second']) ++ self.assertEqual(sorted(log), ['first', 'second']) + + def test_wait_for_slower_workers(self): + log = [] diff -Nru pcs-0.9.153/debian/pcsd.init pcs-0.9.153/debian/pcsd.init --- pcs-0.9.153/debian/pcsd.init 2015-05-08 09:44:31.000000000 +0000 +++ pcs-0.9.153/debian/pcsd.init 1970-01-01 00:00:00.000000000 +0000 @@ -1,141 +0,0 @@ -#!/bin/sh -## -# pcsd Pacemaker & Corosync configuration daemon -# -# chkconfig: - 21 81 -# description: Pacemaker & Corosync configuration daemon - -### BEGIN INIT INFO -# Provides: pcsd -# Required-Start: $remote_fs $network $syslog -# Required-Stop: $remote_fs $network $syslog -# Should-Start: -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Starts and stops Pacemaker & Corosync daemon -# Description: Starts and stops Pacemaker & Corosync daemon -### END INIT INFO - -# PATH -PATH=/usr/sbin:/usr/bin:/sbin:/bin -DESC="pcs daemon" -NAME=pcsd -EXEC=ruby -SUB_EXEC=/usr/share/pcsd/ssl.rb -DAEMON_USER=root -DAEMON=/usr/bin/ruby -DAEMON_ARGS="-C/var/lib/pcsd -I/usr/share/pcsd -- /usr/share/pcsd/ssl.rb" -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME -LOGFILE=/var/log/$NAME/$NAME.log -SLEEP_DURATION=2 - -# Exit if ruby is not installed -[ -x $(which $EXEC) ] || echo "$EXEC was not found. Is it installed?" -[ -x $(which $SUB_EXEC) ] || echo "$SUB_EXEC not found. Is pcs installed?" - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Source lsb init functions -. /lib/lsb/init-functions - -is_running() -{ - # Test whether pid file exists or not - test -f $PIDFILE || return 1 - - # Test whether process is running or not - read PID < "$PIDFILE" - ps -p $PID >/dev/null 2>&1 || return 1 - - # Is running - return 0 -} - -root_only() -{ - if [ "$(id -u)" != "0" ]; then - echo "Only root should run this operation" - exit 1 - fi -} - -run() -{ - if is_running; then - PID="$(cat $PIDFILE)" - echo "Daemon is already running as PID $PID" - return 1 - fi - - nohup $DAEMON $DAEMON_ARGS > /dev/null 2>&1 - echo $! > $PIDFILE - read PID < "$PIDFILE" - - echo "PID is $PID" - - sleep $SLEEP_DURATION - if ! is_running; then - echo "Daemon died immediately after starting. Please check your logs and configurations." - return 1 - fi - - echo "Daemon is running as PID $PID" - return 0 -} - -stop() -{ - if is_running; then - read PID < "$PIDFILE" - kill -9 $PID - fi - - sleep $SLEEP_DURATION - if is_running; then - while is_running; do - echo "waiting for daemon to die (PID $PID)" - sleep $SLEEP_DURATION - done - fi - - # Be sure to remove the pid file - rm -f "$PIDFILE" - return 0 -} - -case "$1" in - start) - root_only - log_daemon_msg "Starting $DESC" "$NAME" - run - log_end_msg $? - ;; - stop) - root_only - log_daemon_msg "Stopping $DESC" "$NAME" - stop - log_end_msg $? - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - root_only - $0 stop && $0 start - ;; - status|monitor) - status_of_proc \ - -p "$PIDFILE" \ - "$SUB_EXEC" \ - "$NAME" \ - && exit 0 \ - || exit $? - ;; - *) - echo "Usage: $0 {start|stop|restart|reload|force-reload|status|monitor}" - exit 1 - ;; -esac - -: diff -Nru pcs-0.9.153/debian/pcs.install pcs-0.9.153/debian/pcs.install --- pcs-0.9.153/debian/pcs.install 2016-01-27 09:32:02.000000000 +0000 +++ pcs-0.9.153/debian/pcs.install 2016-07-30 07:58:34.000000000 +0000 @@ -1,5 +1,6 @@ etc/bash_completion.d/* usr/share/bash-completion/completions/ etc/default/* +etc/init.d/* etc/logrotate.d/* etc/pam.d/* lib/systemd/system/* diff -Nru pcs-0.9.153/debian/pcs.lintian-overrides pcs-0.9.153/debian/pcs.lintian-overrides --- pcs-0.9.153/debian/pcs.lintian-overrides 2016-01-27 09:32:02.000000000 +0000 +++ pcs-0.9.153/debian/pcs.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# PCS/PCSD ships with a service file which does not -# need the init script -script-in-etc-init.d-not-registered-via-update-rc.d diff -Nru pcs-0.9.153/debian/rules pcs-0.9.153/debian/rules --- pcs-0.9.153/debian/rules 2016-07-13 09:26:34.000000000 +0000 +++ pcs-0.9.153/debian/rules 2016-07-30 07:58:34.000000000 +0000 @@ -36,6 +36,10 @@ BUILD_GEMS=false \ systemddir=/lib/systemd \ SYSTEMCTL_OVERRIDE=true + + # Always install the init script + install -m 755 -D pcsd/pcsd.debian $(CURDIR)/debian/tmp/etc/init.d/pcsd + # remove embedded fonts set -e && cd $(CURDIR)/debian/tmp/usr/share/pcsd/public/css && \ for ttf in Liberation*.ttf; do \ @@ -47,7 +51,7 @@ dh_python2 -p pcs /usr/share/pcsd override_dh_installinit: - dh_installinit -n --name=pcsd -- + dh_installinit --onlyscripts --name=pcsd override_dh_compress: # make non-scripts non-executable