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

11 files changed, 0 insertions, 55 deletions

diff --git a/package/bind/ipkg/bind-check.control b/package/bind/ipkg/bind-check.control
deleted file mode 100644
index ba90d8274..000000000
--- a/package/bind/ipkg/bind-check.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-check
-Priority: optional
-Section: net
-Description: named-checkconf & named-checkzone utilities
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/bind-client.control b/package/bind/ipkg/bind-client.control
deleted file mode 100644
index fa20c18a3..000000000
--- a/package/bind/ipkg/bind-client.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-client
-Priority: optional
-Section: net
-Description: dynamic dns client
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/bind-dig.control b/package/bind/ipkg/bind-dig.control
deleted file mode 100644
index e91e30066..000000000
--- a/package/bind/ipkg/bind-dig.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-dig
-Priority: optional
-Section: net
-Description: dig utility
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/bind-dnssec.control b/package/bind/ipkg/bind-dnssec.control
deleted file mode 100644
index c7c213617..000000000
--- a/package/bind/ipkg/bind-dnssec.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-dnssec
-Priority: optional
-Section: net
-Description: dnssec-keygen & dnssec-signzone utilities
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/bind-host.control b/package/bind/ipkg/bind-host.control
deleted file mode 100644
index 20440381a..000000000
--- a/package/bind/ipkg/bind-host.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: bind-host
-Priority: optional
-Section: net
-Description: host utility
-Depends: libopenssl libbind
-
diff --git a/package/bind/ipkg/bind-rndc.control b/package/bind/ipkg/bind-rndc.control
deleted file mode 100644
index a0eee7ebb..000000000
--- a/package/bind/ipkg/bind-rndc.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-rndc
-Priority: optional
-Section: net
-Description: rndc & rndc-confgen utilities
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/bind-server.conffiles b/package/bind/ipkg/bind-server.conffiles
deleted file mode 100644
index c4cfe37d5..000000000
--- a/package/bind/ipkg/bind-server.conffiles
+++ /dev/null
@@ -1,6 +0,0 @@
-/etc/bind/named.conf.example
-/etc/bind/db.0
-/etc/bind/db.127
-/etc/bind/db.255
-/etc/bind/db.local
-/etc/bind/db.root
diff --git a/package/bind/ipkg/bind-server.control b/package/bind/ipkg/bind-server.control
deleted file mode 100644
index 73b10d2f2..000000000
--- a/package/bind/ipkg/bind-server.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: bind-server
-Priority: optional
-Section: net
-Description: popular dns server
-Depends: libopenssl libbind
-Conflicts: dnsmasq
diff --git a/package/bind/ipkg/bind-server.postinst b/package/bind/ipkg/bind-server.postinst
deleted file mode 100644
index bca89fd22..000000000
--- a/package/bind/ipkg/bind-server.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf named named NO
diff --git a/package/bind/ipkg/bind-tools.control b/package/bind/ipkg/bind-tools.control
deleted file mode 100644
index 623d0a547..000000000
--- a/package/bind/ipkg/bind-tools.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-tools
-Priority: optional
-Section: net
-Description: dig, host, nslookup, nsupdate, dnssec-keygen, dnssec-signzone, named-checkconf, named-checkzone, rndc, rndc-confgen
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/libbind.control b/package/bind/ipkg/libbind.control
deleted file mode 100644
index 5b4e86674..000000000
--- a/package/bind/ipkg/libbind.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: libbind
-Priority: optional
-Section: libs
-Description: Support library for the bind tools and dns server/client.