diff --git a/packaging/debian/python-synergy-service.lintian-overrides b/packaging/debian/python-synergy-service.lintian-overrides deleted file mode 100644 index 5deaf8c..0000000 --- a/packaging/debian/python-synergy-service.lintian-overrides +++ /dev/null @@ -1,5 +0,0 @@ -# Both systemv init and systemd scripts are provided. -# Systemd script is automatically provided with the name "synergy-service", -# whereas the init script is provided with the name "python-synergy-service". -# Lintian complains because they don't have the same name. -systemd-no-service-for-init-script diff --git a/packaging/debian/python-synergy-service.postrm b/packaging/debian/python-synergy-service.postrm index 477804e..3c16658 100755 --- a/packaging/debian/python-synergy-service.postrm +++ b/packaging/debian/python-synergy-service.postrm @@ -20,11 +20,7 @@ set -e case "$1" in - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - purge) - update-rc.d python-synergy-service remove >/dev/null + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear|purge) ;; *) diff --git a/packaging/debian/python-synergy-service.synergy.init b/packaging/debian/python-synergy-service.synergy.init deleted file mode 100644 index 8e7d8ec..0000000 --- a/packaging/debian/python-synergy-service.synergy.init +++ /dev/null @@ -1,166 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: synergy -# Required-Start: $local_fs $network $remote_fs $syslog -# Required-Stop: $local_fs $network $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: -# Description: -# <...> -# <...> -### END INIT INFO - -# Author: Vincent Llorens - -# Do NOT "set -e" - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="python-synergy-service" -NAME=synergy -DAEMON=/usr/sbin/synergy-service -DAEMON_ARGS="" -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 - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.2-14) to ensure that this file is present -# and status_of_proc is working. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - # start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - # || return 1 - # start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - # $DAEMON_ARGS \ - # || return 2 - # The above code will not work for interpreted scripts, use the next - # six lines below instead (Ref: #643337, start-stop-daemon(8) ) - start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON \ - --name $NAME --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON \ - --name $NAME -- $DAEMON_ARGS \ - || return 2 - - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - 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|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/packaging/debian/python-synergy-service.synergy.upstart b/packaging/debian/python-synergy-service.synergy.upstart deleted file mode 100644 index 200b57b..0000000 --- a/packaging/debian/python-synergy-service.synergy.upstart +++ /dev/null @@ -1,19 +0,0 @@ -description "Synergy service" -author "Lisa Zangrando " - -start on runlevel [2345] -stop on runlevel [!2345] - -pre-start script - for i in "lock run log lib"; do - mkdir -p /var/"$i"/synergy - chown synergy:synergy /var/"$i"/synergy - done -end script - -script - DAEMON_ARGS="" - exec start-stop-daemon --start --chdir /var/lib/synergy \ - --chuid synergy:synergy --make-pidfile --pidfile /var/run/synergy/synergy.pid \ - --exec /usr/bin/synergy-service -- --config-file=/etc/synergy/synergy.conf ${DAEMON_ARGS} -end script diff --git a/packaging/debian/rules b/packaging/debian/rules index 693b4ce..32f46b3 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -21,9 +21,6 @@ export PYBUILD_NAME=python-synergy-service %: dh $@ --with python2,systemd --buildsystem=pybuild -override_dh_installinit: - dh_installinit --name synergy - override_dh_auto_test: override_dh_systemd_start: