[packages_10.03.2] bemused: merge r28955, r29199

SVN-Revision: 30289

diff --git a/utils/bemused/Makefile b/utils/bemused/Makefile
index 5982416b1384b5e9bb1665981e9086cf2f83872a..4cd0b13a3733fe76c6a7ba270318a9b4db3a17ba 100644 (file)
--- a/utils/bemused/Makefile
+++ b/utils/bemused/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2010 OpenWrt.org
+# Copyright (C) 2008-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:=bemused-mpd
 PKG_VERSION:=r062
-PKG_RELEASE:=2
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.origo.ethz.ch/bemused-lnx-mpdhack/526
@@ -59,4 +59,9 @@ define Package/bemusedlinuxserver/install
        $(INSTALL_BIN) ./files/bemused.init $(1)/etc/init.d/bemused
 endef
 
+define Package/bemusedlinuxserver/conffiles
+/etc/bemused.conf
+/etc/bemused-bookmarks
+endef
+
 $(eval $(call BuildPackage,bemusedlinuxserver))

diff --git a/utils/bemused/files/bemused.init b/utils/bemused/files/bemused.init
index 2a034a46d3ab355bd86f491f0848ed217937dbe2..a4ab2c77c62f0badfae66386e7771de81dbd5a62 100644 (file)
--- a/utils/bemused/files/bemused.init
+++ b/utils/bemused/files/bemused.init
@@ -1,13 +1,12 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2011 OpenWrt.org
+
 START=95
 
 start() {
-    /usr/sbin/bemusedlinuxserver -d
+       service_start /usr/sbin/bemusedlinuxserver -d
 }
-    
+
 stop() {
-    killall bemusedlinuxserver
+       service_stop /usr/sbin/bemusedlinuxserver
 }
-       
-       
\ No newline at end of file