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, 0 insertions, 23 deletions

diff --git a/package/avahi/ipkg/avahi-daemon.conffiles b/package/avahi/ipkg/avahi-daemon.conffiles
deleted file mode 100644
index 46379ed96..000000000
--- a/package/avahi/ipkg/avahi-daemon.conffiles
+++ /dev/null
@@ -1,3 +0,0 @@
-/etc/avahi/avahi-daemon.conf
-/etc/avahi/services/http.service
-/etc/avahi/services/ssh.service
diff --git a/package/avahi/ipkg/avahi-daemon.control b/package/avahi/ipkg/avahi-daemon.control
deleted file mode 100644
index f68a690fe..000000000
--- a/package/avahi/ipkg/avahi-daemon.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: avahi-daemon
-Priority: optional
-Section: net
-Depends: libavahi, libdaemon, libexpat
-Description: an mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (daemon)
diff --git a/package/avahi/ipkg/avahi-daemon.postinst b/package/avahi/ipkg/avahi-daemon.postinst
deleted file mode 100644
index 0e3e13912..000000000
--- a/package/avahi/ipkg/avahi-daemon.postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-gid=$(get_next_gid)
-add_group avahi $gid
-add_user avahi $(get_next_uid) $gid /tmp
-add_rcconf avahi avahi NO
diff --git a/package/avahi/ipkg/avahi-dnsconfd.control b/package/avahi/ipkg/avahi-dnsconfd.control
deleted file mode 100644
index 1213a0e7b..000000000
--- a/package/avahi/ipkg/avahi-dnsconfd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: avahi-dnsconfd
-Priority: optional
-Section: net
-Depends: libavahi, libdaemon, avahi-daemon
-Description: an Unicast DNS server from mDNS/DNS-SD configuration daemon
diff --git a/package/avahi/ipkg/libavahi.control b/package/avahi/ipkg/libavahi.control
deleted file mode 100644
index 4912296bc..000000000
--- a/package/avahi/ipkg/libavahi.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: libavahi
-Priority: optional
-Section: libs
-Description: an DNS-SD over mDNS (aka RendezVous/Bonjour/ZeroConf) implementation (library)