From d735295cdc48639907b7454f9c86e25edd0bda2d Mon Sep 17 00:00:00 2001 From: Nico Suhl Date: Fri, 10 Jan 2014 20:33:51 +0100 Subject: [PATCH 1/2] fix init script --- contrib/init.debian | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/init.debian b/contrib/init.debian index bc67978..a3e33fe 100755 --- a/contrib/init.debian +++ b/contrib/init.debian @@ -10,6 +10,8 @@ ### END INIT INFO #Author: Andrew Karpow +. /lib/lsb/init-functions + PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="ympd Daemon" NAME=ympd @@ -36,14 +38,14 @@ do_start() start-stop-daemon --start --background --quiet --pidfile $PIDFILE --make-pidfile \ --exec $DAEMON --test > /dev/null || return 1 start-stop-daemon --start --background --quiet --pidfile $PIDFILE --make-pidfile \ - --exec $DAEMON --stdout $LOG_OUT --stderr $LOG_ERR -- $DAEMON_OPT || return 2 + --exec $DAEMON -- $DAEMON_OPT || return 2 } do_stop() { start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME RETVAL="$?" - + [ "$RETVAL" = 2 ] && return 2 rm -f $PIDFILE return "$RETVAL" From 6694e752bce746686ac193a520074ce9496de192 Mon Sep 17 00:00:00 2001 From: Nico Suhl Date: Fri, 10 Jan 2014 20:50:55 +0100 Subject: [PATCH 2/2] removed newline to fix package build --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0656c2..710adec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,7 @@ set(CPACK_PACKAGE_VERSION_PATCH "4") set(CPACK_GENERATOR "DEB;RPM;TGZ") set(CPACK_SOURCE_GENERATOR "TBZ2") set(DEBIAN_PACKAGE_SECTION "web") -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MPD web client based on Websockets and -Bootstrap") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MPD web client based on Websockets and Bootstrap") set(CPACK_PACKAGE_CONTACT "Andrew Karpow ") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "andy@ndyk.de") set(CPACK_DEBIAN_PACKAGE_DEPENDS "libssl1.0.0,libmpdclient2")