From 40e2d7b8e24419d3860740ea5173d42750c78c17 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 20 Sep 2009 12:43:43 +0000
Subject: [PATCH] [package] update shell-fm to 0.7 (#5820)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@17638 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 sound/shell-fm/Makefile                       |  8 ++++----
 sound/shell-fm/files/shell-fm.rc              |  1 -
 sound/shell-fm/patches/002-wifcontinued.patch | 13 -------------
 3 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 sound/shell-fm/patches/002-wifcontinued.patch

diff --git a/sound/shell-fm/Makefile b/sound/shell-fm/Makefile
index 3c472535b..e1c74840b 100644
--- a/sound/shell-fm/Makefile
+++ b/sound/shell-fm/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shell-fm
-PKG_VERSION:=0.6
+PKG_VERSION:=0.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/jkramer/shell-fm.git
-PKG_SOURCE_VERSION:=df8bd30d280502c9ce62669e001d7de94d0dd5fe
+PKG_SOURCE_VERSION:=c274aa51b52185b289ac22f0cb95420a1c19868b
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -50,9 +50,9 @@ endef
 
 define Package/shell-fm/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/shell-fm $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/shell-fm $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./files/shell-fm.rc $(1)/etc/shell-fm.rc
+	$(INSTALL_CONF) ./files/shell-fm.rc $(1)/etc/shell-fm.rc
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/shell-fm.init $(1)/etc/init.d/shell-fm
 endef
diff --git a/sound/shell-fm/files/shell-fm.rc b/sound/shell-fm/files/shell-fm.rc
index e1f708c47..43ec7d2a1 100644
--- a/sound/shell-fm/files/shell-fm.rc
+++ b/sound/shell-fm/files/shell-fm.rc
@@ -7,4 +7,3 @@ a-color = 0;32          # dark green track artist names
 s-color = 1;37          # white station names
 bind = 0.0.0.0
 extern = madplay -q -
-extern-restart = 1
diff --git a/sound/shell-fm/patches/002-wifcontinued.patch b/sound/shell-fm/patches/002-wifcontinued.patch
deleted file mode 100644
index 5c76fced3..000000000
--- a/sound/shell-fm/patches/002-wifcontinued.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/source/main.c
-+++ b/source/main.c
-@@ -44,6 +44,10 @@
- #  endif
- #endif
- 
-+#ifndef WIFCONTINUED 
-+#define WIFCONTINUED(wstat)   (0) 
-+#endif 
-+
- unsigned flags = RTP;
- time_t changeTime = 0, pausetime = 0;
- char * nextstation = NULL;
-- 
2.11.0