scmpc: merge r28968, r29199

SVN-Revision: 30285

diff --git a/sound/scmpc/Makefile b/sound/scmpc/Makefile
index de36e41561b848cc37af9d4f212cf6768ac35f88..a067f82a3b4c868e1800c66c1ff447add8045bd8 100644 (file)
--- a/sound/scmpc/Makefile
+++ b/sound/scmpc/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=scmpc
 PKG_VERSION:=0.2.2
-PKG_RELEASE:=2
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.berlios.de/scmpc
@@ -49,7 +49,11 @@ define Package/scmpc/install
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/scmpc.init $(1)/etc/init.d/scmpc
        $(INSTALL_DIR) $(1)/etc
-       $(CP) $(PKG_BUILD_DIR)/examples/scmpc.conf $(1)/etc
+       $(CP) $(PKG_BUILD_DIR)/examples/scmpc.conf $(1)/etc/
+endef
+
+define Package/scmpc/conffiles
+/etc/scmpc.conf
 endef
 
 $(eval $(call BuildPackage,scmpc))

diff --git a/sound/scmpc/files/scmpc.init b/sound/scmpc/files/scmpc.init
index 5b12d3512a2f30c7b1e81afc75e1b8f1a2a6bf8c..5327b6b11fe41de3e48278d3787febbb41ff63f7 100644 (file)
--- a/sound/scmpc/files/scmpc.init
+++ b/sound/scmpc/files/scmpc.init
@@ -1,12 +1,15 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=94
 
+SERVICE_USE_PID=1
+
 start() {
-       mkdir -p /var/lib/scmpc
-       /usr/bin/scmpc
+       mkdir -m 0755 -p /var/lib/scmpc
+       service_start /usr/bin/scmpc
 }
 
 stop() {
-       killall scmpc
+       service_stop /usr/bin/scmpc
 }