From 31d0703454eacf3d2a68b52b33aa75b93154b1e7 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 5 Feb 2012 16:42:07 +0000
Subject: [PATCH] [packages_10.03.2] bemused: merge r28955, r29199

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30289 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 utils/bemused/Makefile           |  9 +++++++--
 utils/bemused/files/bemused.init | 11 +++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/utils/bemused/Makefile b/utils/bemused/Makefile
index 5982416..4cd0b13 100644
--- 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 2a034a4..a4ab2c7 100644
--- 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
-- 
2.11.0