From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 16:52:23 +0000 (+0000)
Subject: [packages_10.03.2] psplash: merge r29221
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=20cccae289f9f2121268aaca1850bc2f332b38e9;p=openwrt%2Fsvn-archive%2Farchive.git

[packages_10.03.2] psplash: merge r29221

SVN-Revision: 30299
---

diff --git a/utils/psplash/Makefile b/utils/psplash/Makefile
index 282560377d..8d2400f528 100644
--- a/utils/psplash/Makefile
+++ b/utils/psplash/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-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:=psplash
 PKG_VERSION:=0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://projects.o-hand.com/sources/psplash/
@@ -49,7 +49,7 @@ define Package/psplash/install
 		$(PKG_INSTALL_DIR)/usr/bin/psplash* \
 		$(1)/bin/
 	$(INSTALL_BIN) \
-		./files/init \
+		./files/psplash.init \
 		$(1)/etc/init.d/psplash
 endef
 
diff --git a/utils/psplash/files/init b/utils/psplash/files/init
deleted file mode 100755
index 5ccced27c6..0000000000
--- a/utils/psplash/files/init
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-START=05
-
-start() {
-    psplash &
-}
-
-stop() {
-    killall psplash
-}
diff --git a/utils/psplash/files/psplash.init b/utils/psplash/files/psplash.init
new file mode 100755
index 0000000000..5ccced27c6
--- /dev/null
+++ b/utils/psplash/files/psplash.init
@@ -0,0 +1,11 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+START=05
+
+start() {
+    psplash &
+}
+
+stop() {
+    killall psplash
+}