6 files changed, 51 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index b45bcc1..a191794 100644
--- a/Makefile
+++ b/Makefile
@@ -21,2 +21,3 @@ APPLETS= core/applets/batteryapplet core/applets/batteryapplet-ipaq \
         noncore/net/netsetup/lan  \
+        noncore/net/networksetup/wlan \
         noncore/applets/wirelessapplet noncore/applets/notesapplet
@@ -84,3 +85,4 @@ NONAPPS = noncore/apps/opie-sheet noncore/apps/tableviewer \
         
-NONNET = noncore/net/netsetup noncore/net/opieftp \
+NONNET = noncore/net/netsetup noncore/net/networksetup \
+        noncore/net/opieftp \
         noncore/mail
diff --git a/apps/Settings/networksettings.desktop b/apps/Settings/networksettings.desktop
new file mode 100644
index 0000000..a55eac8
--- a/dev/null
+++ b/apps/Settings/networksettings.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Exec=networksetup
+Icon=Network/PPPConnect
+Type=Application
+Name=Network
+Name[pt_BR]=Rede
+Name[de]=Netzwerk
+Name[it]=PPP
+Name[pt]=Rede
+Name[es]=Red
+Name[zh_TW]=網絡
+Name[ko]=네트워크 설정
diff --git a/apps/Settings/networksetup.desktop b/apps/Settings/networksetup.desktop
new file mode 100644
index 0000000..a55eac8
--- a/dev/null
+++ b/apps/Settings/networksetup.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Exec=networksetup
+Icon=Network/PPPConnect
+Type=Application
+Name=Network
+Name[pt_BR]=Rede
+Name[de]=Netzwerk
+Name[it]=PPP
+Name[pt]=Rede
+Name[es]=Red
+Name[zh_TW]=網絡
+Name[ko]=네트워크 설정
diff --git a/noncore/net/networksetup/opie-networksetup.control b/noncore/net/networksetup/opie-networksetup.control
new file mode 100644
index 0000000..96e4ee6
--- a/dev/null
+++ b/noncore/net/networksetup/opie-networksetup.control
@@ -0,0 +1,8 @@
+Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/*
+Priority: optional
+Section: opie/settings
+Maintainer: Ben Meyer <meyerb@sharpsec.com> 
+Architecture: arm
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
+Description: Opie network setup tool
diff --git a/noncore/settings/networksettings/opie-networksettings.control b/noncore/settings/networksettings/opie-networksettings.control
new file mode 100644
index 0000000..96e4ee6
--- a/dev/null
+++ b/noncore/settings/networksettings/opie-networksettings.control
@@ -0,0 +1,8 @@
+Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/*
+Priority: optional
+Section: opie/settings
+Maintainer: Ben Meyer <meyerb@sharpsec.com> 
+Architecture: arm
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
+Description: Opie network setup tool
diff --git a/noncore/settings/networksettings/opie-networksetup.control b/noncore/settings/networksettings/opie-networksetup.control
new file mode 100644
index 0000000..96e4ee6
--- a/dev/null
+++ b/noncore/settings/networksettings/opie-networksetup.control
@@ -0,0 +1,8 @@
+Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/*
+Priority: optional
+Section: opie/settings
+Maintainer: Ben Meyer <meyerb@sharpsec.com> 
+Architecture: arm
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
+Description: Opie network setup tool