1 files changed, 16 insertions, 15 deletions

diff --git a/packages b/packages
index 4c4f492..64a4cd6 100644
--- a/packages
+++ b/packages
@@ -1,7 +1,5 @@
-        CONFIG_APPLET   noncore/net/opietooth/appletapplet.pro
         #CONFIG_APPSKEY         noncore/settings/appskeyappskey.pro
         #CONFIG_BINARY  noncore/tools/calc2/binarybinary.pro
-        CONFIG_BLUE-PIN         noncore/net/opietooth/blue-pinblue-pin.pro
         #CONFIG_CALC2   noncore/tools/calc2calc2.pro
         #CONFIG_CALIBRATE       core/apps/calibratecalibrate.pro
         #CONFIG_CHESS   noncore/games/chesschess.pro
@@ -11,27 +9,22 @@ CONFIG_BLUE-PIN	noncore/net/opietooth/blue-pin	blue-pin.pro
         #CONFIG_GSMTOOL         noncore/comm/gsmtoolgsmtool.pro
         #CONFIG_KEYVIEW         development/keyviewkeyview.pro
         #CONFIG_LAN     noncore/unsupported/netsetup/lanlan.pro
-        CONFIG_LIB      noncore/net/opietooth/liblib.pro
         #CONFIG_LIB     noncore/unsupported/opiemail/liblib.pro
         #CONFIG_LIBFFMPEG       core/multimedia/opieplayer/libffmpeglibffmpeg.pro
         #CONFIG_LIBFLASH        core/multimedia/opieplayer/libflashlibflash.pro
         #CONFIG_LIBOPIE_PIM     libopie/pimpim.pro
-        CONFIG_LIBQPE-X11       x11/libqpe-x11libqpe-x11.pro
         #CONFIG_LIBSQL  libsqllibsql.pro
-        CONFIG_MANAGER  noncore/net/opietooth/managermanager.pro
         #CONFIG_MOBILEMSG       noncore/comm/mobilemsgmobilemsg.pro
-        #CONFIG_NETSETUP        noncore/unsupported/netsetupnetsetup.pro
         #CONFIG_NETMONAPPLET    noncore/unsupported/netmonappletnetmonapplet.pro
+        #CONFIG_NETSETUP        noncore/unsupported/netsetupnetsetup.pro
         #CONFIG_OFILESELECTOR   libopie/ofileselectorofileselector.pro
         #CONFIG_OPIE-WRITE      noncore/apps/opie-writeopie-write.pro
         #CONFIG_OPIEMAIL        noncore/unsupported/opiemailopiemail.pro
-        CONFIG_OPIEPLAYER2      noncore/multimedia/opieplayer2opieplayer2.pro
         #CONFIG_POP3    noncore/unsupported/opiemail/ifaces/pop3pop3.pro
         #CONFIG_QUICKEXEC       quickexecquickexec.pro
         #CONFIG_RESTARTAPPLET   core/applets/restartappletrestartapplet.pro
         #CONFIG_RESTARTAPPLET2  core/applets/restartapplet2restartapplet2.pro
         #CONFIG_SDMON   noncore/unsupported/sdmonsdmon.pro
-        CONFIG_OCOPSERVER       x11/ipc/serverocopserver.pro
         #CONFIG_SIMPLE  noncore/tools/calc2/simplesimple.pro
         #CONFIG_SMTP    noncore/unsupported/opiemail/ifaces/smtpsmtp.pro
         #CONFIG_SPREADSHEET     noncore/unsupported/spreadsheetspreadsheet.pro
@@ -44,10 +37,12 @@ CONFIG_OCOPSERVER	x11/ipc/server	ocopserver.pro
         CONFIG_ADDRESSBOOK      core/pim/addressbookaddressbook.pro
         CONFIG_ADVANCEDFM       noncore/apps/advancedfmadvancedfm.pro
         CONFIG_APPEARANCE2      noncore/settings/appearance2appearance2.pro
+        CONFIG_APPLET   noncore/net/opietooth/appletapplet.pro
         CONFIG_AQPKG    noncore/apps/aqpkgaqpkg.pro
         CONFIG_BACKUP   noncore/settings/backupbackup.pro
         CONFIG_BATTERYAPPLET    core/applets/batteryappletbatteryapplet.pro
         CONFIG_BEND     noncore/mail/bendbend.pro
+        CONFIG_BLUE-PIN         noncore/net/opietooth/blue-pinblue-pin.pro
         CONFIG_BOUNCE   noncore/games/bouncebounce.pro
         CONFIG_BUTTON-SETTINGS  core/settings/buttonbutton.pro
         CONFIG_BUZZWORD         noncore/games/buzzwordbuzzword.pro
@@ -72,6 +67,7 @@ CONFIG_FLAT	noncore/styles/flat	flat.pro
         CONFIG_FORMATTER        noncore/tools/formatterformatter.pro
         CONFIG_FREETYPE         freetypefreetype.pro
         CONFIG_FRESH    noncore/styles/freshfresh.pro
+        CONFIG_FTPLIB   noncore/net/ftplibftplib.pro
         CONFIG_GO       noncore/games/gogo.pro
         CONFIG_HANDWRITING      inputmethods/handwritinghandwriting.pro
         CONFIG_HELPBROWSER      core/apps/helpbrowserhelpbrowser.pro
@@ -79,7 +75,6 @@ CONFIG_HOMEAPPLET	core/applets/homeapplet	homeapplet.pro
         CONFIG_INTERFACES       noncore/net/networksettings/interfacesinterfaces.pro
         CONFIG_IRDAAPPLET       core/applets/irdaappletirdaapplet.pro
         CONFIG_JUMPX    inputmethods/jumpxjumpx.pro
-CONFIG_LIBKATE  noncore/apps/tinykate/libkate libkate.pro
         CONFIG_KBILL    noncore/games/kbillkbill.pro
         CONFIG_KCHECKERS        noncore/games/kcheckerskcheckers.pro
         CONFIG_KEYBOARD         inputmethods/keyboardkeyboard.pro
@@ -87,18 +82,21 @@ CONFIG_KEYPEBBLE	noncore/comm/keypebble	keypebble.pro
         CONFIG_KJUMPX   inputmethods/kjumpxkjumpx.pro
         CONFIG_KPACMAN  noncore/games/kpacmankpacman.pro
         CONFIG_LANGUAGE         noncore/settings/languagelanguage.pro
-        CONFIG_LAUNCHER_CORE    core/launcherlauncher.pro
         CONFIG_LAUNCHER-SETTINGS        core/settings/launcherlauncher.pro
+        CONFIG_LAUNCHER_CORE    core/launcherlauncher.pro
+        CONFIG_LIB      noncore/net/opietooth/liblib.pro
+CONFIG_LIBKATE  noncore/apps/tinykate/libkate libkate.pro
         CONFIG_LIBMAD   core/multimedia/opieplayer/libmadlibmad.pro
         CONFIG_LIBMAIL  noncore/mail/libmaillibmail.pro
         CONFIG_LIBMPEG3         core/multimedia/opieplayer/libmpeg3libmpeg3.pro
         CONFIG_LIBOPIE  libopielibopie.pro
         CONFIG_LIBQPE   librarylibrary.pro
+        CONFIG_LIBQPE-X11       x11/libqpe-x11libqpe-x11.pro
         CONFIG_LIGHT-AND-POWER  core/settings/light-and-powerlight-and-power.pro
         CONFIG_LIQUID   noncore/styles/liquidliquid.pro
         CONFIG_LOGOUTAPPLET     core/applets/logoutappletlogoutapplet.pro
-        CONFIG_RUNAPPLET        core/applets/runappletrunapplet.pro
         CONFIG_MAIL     noncore/mailmail.pro
+        CONFIG_MANAGER  noncore/net/opietooth/managermanager.pro
         CONFIG_MEDIUMMOUNT      noncore/settings/mediummountmediummount.pro
         CONFIG_METAL    noncore/styles/metalmetal.pro
         CONFIG_MINDBREAKER      noncore/games/mindbreakermindbreaker.pro
@@ -109,16 +107,18 @@ CONFIG_NETSYSTEMTIME	noncore/settings/netsystemtime	netsystemtime.pro
         CONFIG_NETWORKSETUP     noncore/net/networksettingsnetworksettings.pro
         CONFIG_NOTESAPPLET      noncore/applets/notesappletnotesapplet.pro
         CONFIG_OBEX     core/applets/obexobex.pro
+        CONFIG_OCOPSERVER       x11/ipc/serverocopserver.pro
         CONFIG_OIPKG    core/apps/oipkgoipkg.pro
         CONFIG_OPIE-CONSOLE     noncore/apps/opie-consoleopie-console.pro
         CONFIG_OPIE-LOGIN       core/opie-loginopie-login.pro
         CONFIG_OPIE-READER      noncore/apps/opie-readeropie-reader.pro
         CONFIG_OPIE-SH  noncore/tools/opie-shopie-sh.pro
         CONFIG_OPIE-SHEET       noncore/apps/opie-sheetopie-sheet.pro
+        CONFIG_OPIEALARMcore/opiealarm
         CONFIG_OPIEFTP  noncore/net/opieftpopieftp.pro
-        CONFIG_FTPLIB   noncore/net/ftplibftplib.pro
         CONFIG_OPIEIRC  noncore/net/opieircopieirc.pro
         CONFIG_OPIEPLAYER       core/multimedia/opieplayeropieplayer.pro
+        CONFIG_OPIEPLAYER2      noncore/multimedia/opieplayer2opieplayer2.pro
         CONFIG_OXYGEN   noncore/apps/oxygenoxygen.pro
         CONFIG_PARASHOOT        noncore/games/parashootparashoot.pro
         CONFIG_PICKBOARD        inputmethods/pickboardpickboard.pro
@@ -127,9 +127,11 @@ CONFIG_QCOP	core/apps/qcop	qcop.pro
         CONFIG_QPDF     noncore/graphics/qpdfqpdf.pro
         CONFIG_REMOTE   noncore/tools/remoteremote.pro
         CONFIG_ROTATION         noncore/settings/rotationrotation.pro
-        CONFIG_SFCAVE   noncore/games/sfcavesfcave.pro
+        CONFIG_RUNAPPLET        core/applets/runappletrunapplet.pro
         CONFIG_SCREENSHOTAPPLET         core/applets/screenshotappletscreenshotapplet.pro
         CONFIG_SECURITY         core/settings/securitysecurity.pro
+        CONFIG_SFCAVE   noncore/games/sfcavesfcave.pro
+        CONFIG_SFCAVE-SDL       noncore/games/sfcave-sdlsfcave-sdl.pro
         CONFIG_SHOWIMG  noncore/multimedia/showimgshowimg.pro
         CONFIG_SINGLE   singlesingle.pro
         CONFIG_SNAKE    noncore/games/snakesnake.pro
@@ -146,13 +148,13 @@ CONFIG_THEME	noncore/styles/theme	theme.pro
         CONFIG_TICTAC   noncore/games/tictactictac.pro
         CONFIG_TINYKATE noncore/apps/tinykatetinykate.pro
         CONFIG_TODAY    core/pim/todaytoday.pro
+CONFIG_TODAY_ADDRESSBOOK core/pim/today/plugins/addressbook addressbook.pro
         CONFIG_TODAY_DATEBOOK   core/pim/today/plugins/datebookdatebook.pro
         CONFIG_TODAY_FORTUNE    noncore/todayplugins/fortunefortune.pro
         CONFIG_TODAY_MAIL       core/pim/today/plugins/mailmail.pro
         CONFIG_TODAY_STOCKTICKER        noncore/todayplugins/stockticker/stocktickerstockticker.pro
         CONFIG_TODAY_STOCKTICKERLIB     noncore/todayplugins/stockticker/stocktickerlibstocktickerlib.pro
         CONFIG_TODAY_TODOLIST   core/pim/today/plugins/todolisttodolist.pro
-CONFIG_TODAY_ADDRESSBOOK core/pim/today/plugins/addressbook addressbook.pro
         CONFIG_TODO     core/pim/todotodo.pro
         CONFIG_UNIKEYBOARD      inputmethods/unikeyboardunikeyboard.pro
         CONFIG_USERMANAGER      noncore/settings/usermanagerusermanager.pro
@@ -162,4 +164,3 @@ CONFIG_WAVPLUGIN	core/multimedia/opieplayer/wavplugin	wavplugin.pro
         CONFIG_WIRELESSAPPLET   noncore/applets/wirelessappletwirelessapplet.pro
         CONFIG_WLAN     noncore/net/networksettings/wlanwlan.pro
         CONFIG_WORDGAME         noncore/games/wordgamewordgame.pro
-        CONFIG_OPIEALARMcore/opiealarm