Merge branch 'master' of ssh://openadk.org/git/openadk

resolve conflicts

Conflicts:

	mk/pkg-bottom.mk
	package/ctorrent/Makefile
	package/gcc/Makefile
	package/gmp/Makefile
	package/id3lib/Makefile
	package/libelf/Makefile
	package/libnl/patches/patch-include_netlink-local_h
	package/mpd/Makefile
	package/nmap/Makefile
	package/rrs/Makefile
	package/weechat/Makefile
	scripts/rstrip.sh
	target/Config.in

5 files changed, 13 insertions, 2 deletions

diff --git a/package/miredo/files/miredo-server.init b/package/miredo/files/miredo-server.init
index d8282e316..6231573a4 100644
--- a/package/miredo/files/miredo-server.init
+++ b/package/miredo/files/miredo-server.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 60
+#PKG miredo-server
+#INIT 60
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/miredo/files/miredo-server.postinst b/package/miredo/files/miredo-server.postinst
new file mode 100644
index 000000000..00c88c459
--- /dev/null
+++ b/package/miredo/files/miredo-server.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf miredo-server miredo-server NO
diff --git a/package/miredo/files/miredo.conffiles b/package/miredo/files/miredo.conffiles
new file mode 100644
index 000000000..f4d3b04af
--- /dev/null
+++ b/package/miredo/files/miredo.conffiles
@@ -0,0 +1 @@
+/etc/miredo/miredo.conf
diff --git a/package/miredo/files/miredo.init b/package/miredo/files/miredo.init
index bb4b3fdcd..d1e846ad7 100644
--- a/package/miredo/files/miredo.init
+++ b/package/miredo/files/miredo.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 60
+#PKG miredo
+#INIT 60
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/miredo/files/miredo.postinst b/package/miredo/files/miredo.postinst
new file mode 100644
index 000000000..37667f8da
--- /dev/null
+++ b/package/miredo/files/miredo.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf miredo miredo NO