[SCM] forked-daapd/master: Remove upstart support
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Thu Aug 31 07:45:45 UTC 2017
The following commit has been merged in the master branch:
commit 3ade0347b05d96440d7f480dd370e9209352a9ce
Author: Balint Reczey <balint.reczey at canonical.com>
Date: Wed Aug 30 22:43:04 2017 +0200
Remove upstart support
diff --git a/debian/forked-daapd.init b/debian/forked-daapd.init
index f165886..6847277 100755
--- a/debian/forked-daapd.init
+++ b/debian/forked-daapd.init
@@ -88,9 +88,6 @@ do_reload() {
case "$1" in
start)
- if init_is_upstart; then
- exit 1
- fi
[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
do_start
@@ -100,9 +97,6 @@ case "$1" in
esac
;;
stop)
- if init_is_upstart; then
- exit 0
- fi
[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
do_stop
@@ -128,9 +122,6 @@ case "$1" in
# If the "reload" option is implemented then remove the
# 'force-reload' alias
#
- if init_is_upstart; then
- exit 1
- fi
log_daemon_msg "Restarting $DESC" "$NAME"
do_stop
diff --git a/debian/forked-daapd.upstart b/debian/forked-daapd.upstart
deleted file mode 100644
index 569690d..0000000
--- a/debian/forked-daapd.upstart
+++ /dev/null
@@ -1,12 +0,0 @@
-description "DAAP/DACP (iTunes) server, support for AirPlay and Spotify"
-author "Espen Jürgensen <espenjurgensen at gmail.com>"
-
-start on started avahi-daemon
-stop on stopping avahi-daemon
-
-# If the server fails try to respawn it, but not more than once in a minute
-respawn
-respawn limit 1 60
-
-# Run in foreground - if not we would need to set the expect stanza
-exec forked-daapd -f
--
forked-daapd packaging
More information about the pkg-multimedia-commits
mailing list