[packages_10.03.2] bitlbee: merge r29053

SVN-Revision: 30197

diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile
index 912bed69c6177db966b07b721f23fd13efd97166..87ce80a8acceff8796fe43388d4879bcc098ca1c 100644 (file)
--- a/net/bitlbee/Makefile
+++ b/net/bitlbee/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-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:=bitlbee
 PKG_VERSION:=1.0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://get.bitlbee.org/src \

diff --git a/net/bitlbee/files/bitlbee.init b/net/bitlbee/files/bitlbee.init
index d89ef3cacd5fe1f1061b09e516e1a393700bd893..b85450b8d91d816e8067250db963d8ee6a986993 100644 (file)
--- a/net/bitlbee/files/bitlbee.init
+++ b/net/bitlbee/files/bitlbee.init
@@ -1,12 +1,13 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
 start() {
-       mkdir -p /var/lib/bitlbee
-       bitlbee -D
+       mkdir -m 0755 -p /var/lib/bitlbee
+       service_start /usr/sbin/bitlbee -D
 }
 
 stop() {
-       killall bitlbee
+       service_stop /usr/sbin/bitlbee
 }