- added weatherplugin, opiemail and odict to the build process

- adjusted batteryapplet/config.in as it was not reflected when building
- embeddedconsole now builds with the right options
- opie-console dto.

5 files changed, 12 insertions, 9 deletions

diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro
index 8c58efb..55d0b93 100755
--- a/core/apps/embeddedkonsole/embeddedkonsole.pro
+++ b/core/apps/embeddedkonsole/embeddedkonsole.pro
@@ -1,59 +1,60 @@
 QMAKE_CFLAGS = -DHAVE_OPENPTY
+TMAKE_FLAGS += -DHAVE_OPENPTY
 QMAKE_LIBS = -lutil
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = TEWidget.h \
       TEScreen.h \
       TECommon.h \
       TEHistory.h \
       TEmulation.h \
       TEmuVt102.h \
       session.h \
       keytrans.h \
       konsole.h \
       commandeditdialog.h \
       commandeditwidget.h \
       playlistselection.h \
       MyPty.h
 SOURCES   = TEScreen.cpp \
       TEWidget.cpp \
       TEHistory.cpp \
       TEmulation.cpp \
       TEmuVt102.cpp \
       session.cpp \
       keytrans.cpp \
       konsole.cpp \
       commandeditdialog.cpp \
       commandeditwidget.cpp \
       playlistselection.cpp \
       MyPty.cpp \
       main.cpp 
 INTERFACES =  commandeditdialogbase.ui smallcommandeditdialogbase.ui
 TARGET    = embeddedkonsole
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TMAKE_CXXFLAGS += -DQT_QWS_OPIE -DHAVE_OPENPTY
 
 TRANSLATIONS = ../../../i18n/de/embeddedkonsole.ts \
         ../../../i18n/xx/embeddedkonsole.ts \
         ../../../i18n/en/embeddedkonsole.ts \
         ../../../i18n/es/embeddedkonsole.ts \
         ../../../i18n/fr/embeddedkonsole.ts \
         ../../../i18n/hu/embeddedkonsole.ts \
         ../../../i18n/ja/embeddedkonsole.ts \
         ../../../i18n/ko/embeddedkonsole.ts \
         ../../../i18n/no/embeddedkonsole.ts \
         ../../../i18n/pl/embeddedkonsole.ts \
         ../../../i18n/pt/embeddedkonsole.ts \
         ../../../i18n/pt_BR/embeddedkonsole.ts \
         ../../../i18n/sl/embeddedkonsole.ts \
         ../../../i18n/zh_CN/embeddedkonsole.ts \
         ../../../i18n/zh_TW/embeddedkonsole.ts \
         ../../../i18n/it/embeddedkonsole.ts \
         ../../../i18n/da/embeddedkonsole.ts
 
 
 
 include ( ../../../include.pro )
diff --git a/noncore/apps/opie-console/opie-console.control b/noncore/apps/opie-console/opie-console.control
index 34bf681..61ce421 100644
--- a/noncore/apps/opie-console/opie-console.control
+++ b/noncore/apps/opie-console/opie-console.control
@@ -1,10 +1,10 @@
-Files: bin/opie-console apps/Applications/opie-console.desktop pics/console/* etc/keytabs/default.Keytab bin/sz bin/rz
+Files: bin/opie-console apps/Applications/opie-console.desktop pics/console/* etc/keytabs/default.Keytab 
 Priority: optional
 Section: opie/applications
 Maintainer: Opie team <opie@handhelds.org>
 Architecture: arm
 Version: 0.6-$SUB_VERSION
-Depends: qpe-base ($QPE_VERSION), libopie1 ($QPE_VERSION), opie-console-help-en
+Depends: qpe-base ($QPE_VERSION), libopie1 ($QPE_VERSION), opie-console-help-en, lrzsz
 License: GPL
 Description: Opie terminal app
  
diff --git a/noncore/unsupported/mail2/bend/config.in b/noncore/unsupported/mail2/bend/config.in
index dfff29e..097a965 100644
--- a/noncore/unsupported/mail2/bend/config.in
+++ b/noncore/unsupported/mail2/bend/config.in
@@ -1,4 +1,4 @@
   config BEND
-    boolean
-    default "y" if MAIL
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBMAIL
+    boolean "bend"
+    default "y" if OPIEMAIL2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEMAIL2
diff --git a/noncore/unsupported/mail2/libmail/config.in b/noncore/unsupported/mail2/libmail/config.in
index 344b19d..dd7b2dc 100644
--- a/noncore/unsupported/mail2/libmail/config.in
+++ b/noncore/unsupported/mail2/libmail/config.in
@@ -1,4 +1,4 @@
   config LIBMAIL
-    boolean
-    default "y" if MAIL
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    boolean "libmail"
+    default "y" if OPIEMAIL2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEMAIL2
diff --git a/packages b/packages
index b0d4eff..c237bf4 100644
--- a/packages
+++ b/packages
@@ -1,166 +1,168 @@
 CONFIG_APPSKEY	noncore/settings/appskey	appskey.pro
 CONFIG_BINARY	noncore/tools/calc2/binary	binary.pro
 CONFIG_CALC2	noncore/tools/calc2	calc2.pro
 CONFIG_CALIBRATE	core/apps/calibrate	calibrate.pro
 CONFIG_CHESS	noncore/games/chess	chess.pro
 CONFIG_CONVERTER	noncore/unsupported/opiemail/converter	converter.pro
 CONFIG_DIALUP	noncore/unsupported/netsetup/dialup	dialup.pro
 CONFIG_DICTIONARY	noncore/apps/dictionary	dictionary.pro
 CONFIG_GSMTOOL	noncore/comm/gsmtool	gsmtool.pro
 CONFIG_KEYVIEW	development/keyview	keyview.pro
 CONFIG_LAN	noncore/unsupported/netsetup/lan	lan.pro
 CONFIG_LIB	noncore/unsupported/opiemail/lib	lib.pro
 CONFIG_LIBFFMPEG	core/multimedia/opieplayer/libffmpeg	libffmpeg.pro
 CONFIG_LIBFLASH	core/multimedia/opieplayer/libflash	libflash.pro
 CONFIG_LIBOPIE_PIM	libopie/pim	pim.pro
 CONFIG_LIBSQL	libsql	libsql.pro
 CONFIG_MOBILEMSG	noncore/comm/mobilemsg	mobilemsg.pro
 CONFIG_NETMONAPPLET	noncore/unsupported/netmonapplet	netmonapplet.pro
 CONFIG_NETSETUP	noncore/unsupported/netsetup	netsetup.pro
 CONFIG_OFILESELECTOR	libopie/ofileselector	ofileselector.pro
 CONFIG_OPIE-WRITE	noncore/apps/opie-write	opie-write.pro
 CONFIG_OPIEMAIL	noncore/unsupported/opiemail	opiemail.pro
 CONFIG_POP3	noncore/unsupported/opiemail/ifaces/pop3	pop3.pro
 CONFIG_QUICKEXEC	quickexec	quickexec.pro
 CONFIG_RESTARTAPPLET	core/applets/restartapplet	restartapplet.pro
 CONFIG_RESTARTAPPLET2	core/applets/restartapplet2	restartapplet2.pro
 CONFIG_SDMON	noncore/unsupported/sdmon	sdmon.pro
 CONFIG_SIMPLE	noncore/tools/calc2/simple	simple.pro
 CONFIG_SMTP	noncore/unsupported/opiemail/ifaces/smtp	smtp.pro
 CONFIG_SPREADSHEET	noncore/unsupported/spreadsheet	spreadsheet.pro
 CONFIG_SYSTEMTIME	noncore/unsupported/systemtime	systemtime.pro
 CONFIG_TEST	libsql/test	test.pro
 CONFIG_TEST	noncore/apps/opie-console/test	test.pro
 CONFIG_UBROWSER	noncore/net/ubrowser	ubrowser.pro
 CONFIG_WELLENREITER	noncore/net/wellenreiter	wellenreiter.pro
 CONFIG_WLANSETUP	noncore/unsupported/wlansetup	wlansetup.pro
 CONFIG_ADDRESSBOOK	core/pim/addressbook	addressbook.pro
 CONFIG_ADVANCEDFM	noncore/apps/advancedfm	advancedfm.pro
 CONFIG_APPEARANCE2	noncore/settings/appearance2	appearance2.pro
 CONFIG_APPLET	noncore/net/opietooth/applet	applet.pro
 CONFIG_AQPKG	noncore/apps/aqpkg	aqpkg.pro
 CONFIG_BACKUP	noncore/settings/backup	backup.pro
 CONFIG_BATTERYAPPLET	core/applets/batteryapplet	batteryapplet.pro
 CONFIG_BEND	noncore/mail/bend	bend.pro
 CONFIG_BLUE-PIN	noncore/net/opietooth/blue-pin	blue-pin.pro
 CONFIG_BOUNCE	noncore/games/bounce	bounce.pro
 CONFIG_BUTTON-SETTINGS	core/settings/button	button.pro
 CONFIG_BUZZWORD	noncore/games/buzzword	buzzword.pro
 CONFIG_CALCULATOR	noncore/tools/calculator	calculator.pro
 CONFIG_CARDMON	core/applets/cardmon	cardmon.pro
 CONFIG_CHECKBOOK	noncore/apps/checkbook	checkbook.pro
 CONFIG_CITYTIME	core/settings/citytime	citytime.pro
 CONFIG_CLIPBOARDAPPLET	core/applets/clipboardapplet	clipboardapplet.pro
 CONFIG_CLOCK	noncore/tools/clock	clock.pro
 CONFIG_CLOCKAPPLET	core/applets/clockapplet	clockapplet.pro
 CONFIG_CONFEDIT	noncore/apps/confedit	confedit.pro
 CONFIG_DATEBOOK	core/pim/datebook	datebook.pro
 CONFIG_DECO_FLAT	noncore/decorations/flat	flat.pro
 CONFIG_DECO_LIQUID	noncore/decorations/liquid	liquid.pro
 CONFIG_DECO_POLISHED	noncore/decorations/polished	polished.pro
 CONFIG_DRAWPAD	noncore/graphics/drawpad	drawpad.pro
 CONFIG_DVORAK	inputmethods/dvorak	dvorak.pro
 CONFIG_EMBEDDEDKONSOLE	core/apps/embeddedkonsole	embeddedkonsole.pro
 CONFIG_FIFTEEN	noncore/games/fifteen	fifteen.pro
 CONFIG_FILEBROWSER	core/apps/filebrowser	filebrowser.pro
 CONFIG_FLAT	noncore/styles/flat	flat.pro
 CONFIG_FORMATTER	noncore/tools/formatter	formatter.pro
 CONFIG_FREETYPE	freetype	freetype.pro
 CONFIG_FRESH	noncore/styles/fresh	fresh.pro
 CONFIG_FTPLIB	noncore/net/ftplib	ftplib.pro
 CONFIG_GO	noncore/games/go	go.pro
 CONFIG_HANDWRITING	inputmethods/handwriting	handwriting.pro
 CONFIG_HELPBROWSER	core/apps/helpbrowser	helpbrowser.pro
 CONFIG_HOMEAPPLET	core/applets/homeapplet	homeapplet.pro
 CONFIG_INTERFACES	noncore/net/networksettings/interfaces	interfaces.pro
 CONFIG_IRDAAPPLET	core/applets/irdaapplet	irdaapplet.pro
 CONFIG_JUMPX	inputmethods/jumpx	jumpx.pro
 CONFIG_KBILL	noncore/games/kbill	kbill.pro
 CONFIG_KCHECKERS	noncore/games/kcheckers	kcheckers.pro
 CONFIG_KEYBOARD	inputmethods/keyboard	keyboard.pro
 CONFIG_KEYPEBBLE	noncore/comm/keypebble	keypebble.pro
 CONFIG_KJUMPX	inputmethods/kjumpx	kjumpx.pro
 CONFIG_KPACMAN	noncore/games/kpacman	kpacman.pro
 CONFIG_LANGUAGE	noncore/settings/language	language.pro
 CONFIG_LAUNCHER-SETTINGS	core/settings/launcher	launcher.pro
 CONFIG_LAUNCHER_CORE	core/launcher	launcher.pro
 CONFIG_LIB	noncore/net/opietooth/lib	lib.pro
 CONFIG_LIBKATE  noncore/apps/tinykate/libkate libkate.pro
 CONFIG_LIBMAD	core/multimedia/opieplayer/libmad	libmad.pro
 CONFIG_LIBMAIL	noncore/mail/libmail	libmail.pro
 CONFIG_LIBMPEG3	core/multimedia/opieplayer/libmpeg3	libmpeg3.pro
 CONFIG_LIBOPIE	libopie	libopie.pro
 CONFIG_LIBQPE	library	library.pro
 CONFIG_LIBQPE-X11	x11/libqpe-x11	libqpe-x11.pro
 CONFIG_LIGHT-AND-POWER	core/settings/light-and-power	light-and-power.pro
 CONFIG_LIQUID	noncore/styles/liquid	liquid.pro
 CONFIG_LOGOUTAPPLET	core/applets/logoutapplet	logoutapplet.pro
-CONFIG_MAIL	noncore/mail	mail.pro
 CONFIG_MANAGER	noncore/net/opietooth/manager	manager.pro
 CONFIG_MEDIUMMOUNT	noncore/settings/mediummount	mediummount.pro
 CONFIG_METAL	noncore/styles/metal	metal.pro
 CONFIG_MINDBREAKER	noncore/games/mindbreaker	mindbreaker.pro
 CONFIG_MINESWEEP	noncore/games/minesweep	minesweep.pro
 CONFIG_MODPLUG	core/multimedia/opieplayer/modplug	modplug.pro
 CONFIG_MULTIKEY	inputmethods/multikey	multikey.pro
 CONFIG_NETSYSTEMTIME	noncore/settings/netsystemtime	netsystemtime.pro
 CONFIG_NETWORKSETUP	noncore/net/networksettings	networksettings.pro
 CONFIG_NOTESAPPLET	noncore/applets/notesapplet	notesapplet.pro
 CONFIG_OBEX	core/applets/obex	obex.pro
 CONFIG_OCOPSERVER	x11/ipc/server	ocopserver.pro
 CONFIG_OIPKG	core/apps/oipkg	oipkg.pro
 CONFIG_OPIE-CONSOLE	noncore/apps/opie-console	opie-console.pro
 CONFIG_OPIE-LOGIN	core/opie-login	opie-login.pro
+CONFIG_OPIEMAIL2	noncore/mail mail.pro
 CONFIG_OPIE-READER	noncore/apps/opie-reader	opie-reader.pro
 CONFIG_OPIE-SH	noncore/tools/opie-sh	opie-sh.pro
 CONFIG_OPIE-SHEET	noncore/apps/opie-sheet	opie-sheet.pro
 CONFIG_OPIEALARM	core/opiealarm
 CONFIG_OPIEFTP	noncore/net/opieftp	opieftp.pro
 CONFIG_OPIEIRC	noncore/net/opieirc	opieirc.pro
 CONFIG_OPIEPLAYER	core/multimedia/opieplayer	opieplayer.pro
 CONFIG_OPIEPLAYER2	noncore/multimedia/opieplayer2	opieplayer2.pro
 CONFIG_OXYGEN	noncore/apps/oxygen	oxygen.pro
 CONFIG_PARASHOOT	noncore/games/parashoot	parashoot.pro
 CONFIG_PICKBOARD	inputmethods/pickboard	pickboard.pro
 CONFIG_QASTEROIDS	noncore/games/qasteroids	qasteroids.pro
 CONFIG_QCOP	core/apps/qcop	qcop.pro
+CONFIG_ODICT	noncore/apps/odict	odict.pro
 CONFIG_QPDF	noncore/graphics/qpdf	qpdf.pro
 CONFIG_REMOTE	noncore/tools/remote	remote.pro
 CONFIG_ROTATION	noncore/settings/rotation	rotation.pro
 CONFIG_RUNAPPLET	core/applets/runapplet	runapplet.pro
 CONFIG_SCREENSHOTAPPLET	core/applets/screenshotapplet	screenshotapplet.pro
 CONFIG_SECURITY	core/settings/security	security.pro
 CONFIG_SFCAVE	noncore/games/sfcave	sfcave.pro
 CONFIG_SFCAVE-SDL	noncore/games/sfcave-sdl	sfcave-sdl.pro
 CONFIG_SHOWIMG	noncore/multimedia/showimg	showimg.pro
 CONFIG_SINGLE	single	single.pro
 CONFIG_SNAKE	noncore/games/snake	snake.pro
 CONFIG_SOLITAIRE	noncore/games/solitaire	solitaire.pro
 CONFIG_SOUND	noncore/settings/sound	sound.pro
 CONFIG_SSHKEYS	noncore/settings/sshkeys	sshkeys.pro
 CONFIG_SUSPENDAPPLET	core/applets/suspendapplet	suspendapplet.pro
 CONFIG_SYSINFO	noncore/apps/sysinfo	sysinfo.pro
 CONFIG_TABLEVIEWER	noncore/apps/tableviewer	tableviewer.pro
 CONFIG_TABMANAGER	noncore/settings/tabmanager	tabmanager.pro
 CONFIG_TETRIX	noncore/games/tetrix	tetrix.pro
 CONFIG_TEXTEDIT	core/apps/textedit	textedit.pro
 CONFIG_THEME	noncore/styles/theme	theme.pro
 CONFIG_TICTAC	noncore/games/tictac	tictac.pro
 CONFIG_TINYKATE noncore/apps/tinykate	tinykate.pro
 CONFIG_TODAY	core/pim/today	today.pro
 CONFIG_TODAY_ADDRESSBOOK core/pim/today/plugins/addressbook addressbook.pro
 CONFIG_TODAY_DATEBOOK	core/pim/today/plugins/datebook	datebook.pro
 CONFIG_TODAY_FORTUNE	noncore/todayplugins/fortune	fortune.pro
 CONFIG_TODAY_MAIL	core/pim/today/plugins/mail	mail.pro
 CONFIG_TODAY_STOCKTICKER	noncore/todayplugins/stockticker/stockticker	stockticker.pro
 CONFIG_TODAY_STOCKTICKERLIB	noncore/todayplugins/stockticker/stocktickerlib	stocktickerlib.pro
+CONFIG_TODAY_WEATHER	noncore/todayplugins/weather weather.pro
 CONFIG_TODAY_TODOLIST	core/pim/today/plugins/todolist	todolist.pro
 CONFIG_TODO	core/pim/todo	todo.pro
 CONFIG_UNIKEYBOARD	inputmethods/unikeyboard	unikeyboard.pro
 CONFIG_USERMANAGER	noncore/settings/usermanager	usermanager.pro
 CONFIG_VMEMO	core/applets/vmemo	vmemo.pro
 CONFIG_VOLUMEAPPLET	core/applets/volumeapplet	volumeapplet.pro
 CONFIG_WAVPLUGIN	core/multimedia/opieplayer/wavplugin	wavplugin.pro
 CONFIG_WIRELESSAPPLET	noncore/applets/wirelessapplet	wirelessapplet.pro
 CONFIG_WLAN	noncore/net/networksettings/wlan	wlan.pro
 CONFIG_WORDGAME	noncore/games/wordgame	wordgame.pro