[packages_10.03.2] cmdpad: merge r28930, r29199

SVN-Revision: 30291

diff --git a/utils/cmdpad/Makefile b/utils/cmdpad/Makefile
index 18bdb8b9d6a162cd637877d258c8dd018ba438ee..6b33e8b517fd523379820a1de1aa958d7cb3f353 100644 (file)
--- a/utils/cmdpad/Makefile
+++ b/utils/cmdpad/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:=cmdpad
 PKG_VERSION:=0.0.3
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/cmdpad
@@ -45,9 +45,13 @@ define Package/cmdpad/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_DIR) $(1)/etc/init.d 
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/cmdpad $(1)/usr/sbin
-       $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/cmdpad.conf $(1)/etc
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/cmdpad $(1)/usr/sbin/
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/cmdpad.conf $(1)/etc/
        $(INSTALL_BIN) ./files/cmdpad.init $(1)/etc/init.d/cmdpad
 endef
 
+define Package/cmdpad/conffiles
+/etc/cmdpad.conf
+endef
+
 $(eval $(call BuildPackage,cmdpad))

diff --git a/utils/cmdpad/files/cmdpad.init b/utils/cmdpad/files/cmdpad.init
index c6f357746d662568aae0b0079319543395f196c0..f6120335de4a67f95af09737d02ed169912c4fee 100644 (file)
--- a/utils/cmdpad/files/cmdpad.init
+++ b/utils/cmdpad/files/cmdpad.init
@@ -1,12 +1,14 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2011 OpenWrt.org
+
 START=93
 
+SSD_DAEMONIZE=1
+
 start() {
-    /usr/sbin/cmdpad --quiet > /dev/null &
+       service_start /usr/sbin/cmdpad --quiet
 }
-                                                       
+
 stop() {
-    killall cmdpad
+       service_stop /usr/sbin/cmdpad
 }
-                                                                                       
\ No newline at end of file