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

10 files changed, 0 insertions, 52 deletions

diff --git a/package/ppp/ipkg/ppp-mod-chat.control b/package/ppp/ipkg/ppp-mod-chat.control
deleted file mode 100644
index 43dbdb1e1..000000000
--- a/package/ppp/ipkg/ppp-mod-chat.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: chat
-Priority: optional
-Section: net
-Description: Utility for establishing a connection with the ISP's PPP server (e.g. via Modem)
-Depends: ppp
diff --git a/package/ppp/ipkg/ppp-mod-pppdump.control b/package/ppp/ipkg/ppp-mod-pppdump.control
deleted file mode 100644
index 4a89e152e..000000000
--- a/package/ppp/ipkg/ppp-mod-pppdump.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: pppdump
-Priority: optional
-Section: net
-Description: an utility to read PPP record file
-Depends: ppp
diff --git a/package/ppp/ipkg/ppp-mod-pppoa.control b/package/ppp/ipkg/ppp-mod-pppoa.control
deleted file mode 100644
index ce2d5d45f..000000000
--- a/package/ppp/ipkg/ppp-mod-pppoa.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ppp-mod-pppoa
-Priority: optional
-Section: net
-Description: a PPPoA (PPP over ATM) plugin for PPP
-Depends: ppp, kmod-pppoa
diff --git a/package/ppp/ipkg/ppp-mod-pppoe.control b/package/ppp/ipkg/ppp-mod-pppoe.control
deleted file mode 100644
index 7cf49636b..000000000
--- a/package/ppp/ipkg/ppp-mod-pppoe.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ppp-mod-pppoe
-Priority: optional
-Section: net
-Description: a PPPoE (PPP over Ethernet) plugin for PPP
-Depends: ppp, kmod-pppoe
diff --git a/package/ppp/ipkg/ppp-mod-pppstats.control b/package/ppp/ipkg/ppp-mod-pppstats.control
deleted file mode 100644
index 8780b2f87..000000000
--- a/package/ppp/ipkg/ppp-mod-pppstats.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: pppstats
-Priority: optional
-Section: net
-Description: an utility to report PPP statistics
-Depends: ppp
diff --git a/package/ppp/ipkg/ppp-mod-pppumts.control b/package/ppp/ipkg/ppp-mod-pppumts.control
deleted file mode 100644
index 178ae2413..000000000
--- a/package/ppp/ipkg/ppp-mod-pppumts.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: pppumts
-Priority: optional
-Section: net
-Depends: comgt, chat
-Description: Scripts and default configuration files to establish GPRS/UMTS connections
diff --git a/package/ppp/ipkg/ppp-mod-radius.conffiles b/package/ppp/ipkg/ppp-mod-radius.conffiles
deleted file mode 100644
index 2cfa4a146..000000000
--- a/package/ppp/ipkg/ppp-mod-radius.conffiles
+++ /dev/null
@@ -1,10 +0,0 @@
-/etc/radiusclient/dictionary
-/etc/radiusclient/dictionary.ascend
-/etc/radiusclient/dictionary.compat
-/etc/radiusclient/dictionary.merit
-/etc/radiusclient/dictionary.microsoft
-/etc/radiusclient/issue
-/etc/radiusclient/port-id-map
-/etc/radiusclient/radiusclient.conf
-/etc/radiusclient/realms
-/etc/radiusclient/servers
diff --git a/package/ppp/ipkg/ppp-mod-radius.control b/package/ppp/ipkg/ppp-mod-radius.control
deleted file mode 100644
index 0a858da30..000000000
--- a/package/ppp/ipkg/ppp-mod-radius.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ppp-mod-radius
-Priority: optional
-Section: net
-Description: a RADIUS plugin for PPP
-Depends: ppp
diff --git a/package/ppp/ipkg/ppp.conffiles b/package/ppp/ipkg/ppp.conffiles
deleted file mode 100644
index 8ad17eb43..000000000
--- a/package/ppp/ipkg/ppp.conffiles
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/ppp/chap-secrets
-/etc/ppp/options
diff --git a/package/ppp/ipkg/ppp.control b/package/ppp/ipkg/ppp.control
deleted file mode 100644
index 2ebff521c..000000000
--- a/package/ppp/ipkg/ppp.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ppp
-Priority: optional
-Section: net
-Depends: kmod-ppp
-Description: a PPP (Point-to-Point Protocol) daemon (with MPPE/MPPC support)