Merge from BRANCH_1_0

3 files changed, 2 insertions, 12 deletions

diff --git a/noncore/net/opieirc/config.in b/noncore/net/opieirc/config.in
index 7c6949d..30184a9 100644
--- a/noncore/net/opieirc/config.in
+++ b/noncore/net/opieirc/config.in
@@ -1,4 +1,4 @@
   config OPIEIRC
-    boolean "opie-irc (chat via your favorite IRC server)"
+    boolean "opieirc"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/ubrowser/opie-ubrowser.control b/noncore/net/ubrowser/opie-ubrowser.control
deleted file mode 100644
index 61a6cde..0000000
--- a/noncore/net/ubrowser/opie-ubrowser.control
+++ b/dev/null
@@ -1,10 +0,0 @@
-Package: opie-ubrowser
-Files: bin/ubrowser apps/Applications/ubrowser.desktop pics/ubrowser/*.png
-Priority: optional
-Section: opie/applications
-Maintainer: Thomas Stephens <spiralman@softhome.net>
-Architecture: arm
-Version: 0.1-$SUB_VERSION
-Depends: task-opie-minimal
-License: GPL
-Description: a very small web browser
diff --git a/noncore/unsupported/mailit/config.in b/noncore/unsupported/mailit/config.in
index 142b840..2b56b5f 100644
--- a/noncore/unsupported/mailit/config.in
+++ b/noncore/unsupported/mailit/config.in
@@ -1,4 +1,4 @@
   config MAILIT
-    boolean "opie-mailit (a simple POP3 email client)"
+    boolean "mailit"
     default "n"
     depends ( LIBQPE || LIBQPE-X11 )