Add Package: field to control files. This will facilitate ditching mkipks in favor of something with some sanity.

208 files changed, 208 insertions, 0 deletions

diff --git a/core/applets/batteryapplet/opie-batteryapplet.control b/core/applets/batteryapplet/opie-batteryapplet.control
index 10009c3..94dc464 100644
--- a/core/applets/batteryapplet/opie-batteryapplet.control
+++ b/core/applets/batteryapplet/opie-batteryapplet.control
@@ -1,2 +1,3 @@
+Package: opie-batteryapplet
 Files: plugins/applets/libbatteryapplet.so*
 Priority: optional
diff --git a/core/applets/cardmon/opie-cardmon.control b/core/applets/cardmon/opie-cardmon.control
index 59f8bc6..02e1f2f 100644
--- a/core/applets/cardmon/opie-cardmon.control
+++ b/core/applets/cardmon/opie-cardmon.control
@@ -1,2 +1,3 @@
+Package: opie-cardmon
 Files: plugins/applets/libcardmonapplet.so* pics/cardmon/*.png sounds/cardmon/*.wav
 Priority: optional
diff --git a/core/applets/clipboardapplet/opie-clipboardapplet.control b/core/applets/clipboardapplet/opie-clipboardapplet.control
index ca90bfa..63a7709 100644
--- a/core/applets/clipboardapplet/opie-clipboardapplet.control
+++ b/core/applets/clipboardapplet/opie-clipboardapplet.control
@@ -1,2 +1,3 @@
+Package: opie-clipboardapplet
 Files: plugins/applets/libclipboardapplet.so*
 Priority: optional
diff --git a/core/applets/clockapplet/opie-clockapplet.control b/core/applets/clockapplet/opie-clockapplet.control
index fb9a034..93841f7 100644
--- a/core/applets/clockapplet/opie-clockapplet.control
+++ b/core/applets/clockapplet/opie-clockapplet.control
@@ -1,2 +1,3 @@
+Package: opie-clockapplet
 Files: plugins/applets/libclockapplet.so*
 Priority: optional
diff --git a/core/applets/irdaapplet/opie-irdaapplet.control b/core/applets/irdaapplet/opie-irdaapplet.control
index c655f6d..41ae925 100644
--- a/core/applets/irdaapplet/opie-irdaapplet.control
+++ b/core/applets/irdaapplet/opie-irdaapplet.control
@@ -1,2 +1,3 @@
+Package: opie-irdaapplet
 Files: plugins/applets/libirdaapplet.so* pics/irdaapplet/* sounds/irdaapplet/*.wav
 Priority: optional
diff --git a/core/applets/restartapplet/opie-restartapplet.control b/core/applets/restartapplet/opie-restartapplet.control
index a046b69..7abb86f 100644
--- a/core/applets/restartapplet/opie-restartapplet.control
+++ b/core/applets/restartapplet/opie-restartapplet.control
@@ -1,2 +1,3 @@
+Package: opie-restartapplet
 Files: plugins/applets/librestartapplet.so* 
 Priority: optional
diff --git a/core/applets/restartapplet2/opie-restartapplet2.control b/core/applets/restartapplet2/opie-restartapplet2.control
index c471a66..2928846 100644
--- a/core/applets/restartapplet2/opie-restartapplet2.control
+++ b/core/applets/restartapplet2/opie-restartapplet2.control
@@ -1,2 +1,3 @@
+Package: opie-restartapplet2
 Files: plugins/applets/librestartapplet.so* 
 Priority: optional
diff --git a/core/applets/screenshotapplet/opie-screenshotapplet.control b/core/applets/screenshotapplet/opie-screenshotapplet.control
index 12df532..50f6046 100644
--- a/core/applets/screenshotapplet/opie-screenshotapplet.control
+++ b/core/applets/screenshotapplet/opie-screenshotapplet.control
@@ -1,2 +1,3 @@
+Package: opie-screenshotapplet
 Files: plugins/applets/libscreenshotapplet.so* 
 Priority: optional
diff --git a/core/applets/vmemo/opie-vmemo.control b/core/applets/vmemo/opie-vmemo.control
index 1e7e2eb..58f8798 100644
--- a/core/applets/vmemo/opie-vmemo.control
+++ b/core/applets/vmemo/opie-vmemo.control
@@ -1,2 +1,3 @@
+Package: opie-vmemo
 Files: plugins/applets/libvmemoapplet.so*
 Priority: optional
diff --git a/core/applets/volumeapplet/opie-volumeapplet.control b/core/applets/volumeapplet/opie-volumeapplet.control
index caed211..78ae4c6 100644
--- a/core/applets/volumeapplet/opie-volumeapplet.control
+++ b/core/applets/volumeapplet/opie-volumeapplet.control
@@ -1,2 +1,3 @@
+Package: opie-volumeapplet
 Files: plugins/applets/libvolumeapplet.so*
 Priority: optional
diff --git a/core/apps/embeddedkonsole/opie-embeddedkonsole.control b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
index aefa8f2..1999e81 100644
--- a/core/apps/embeddedkonsole/opie-embeddedkonsole.control
+++ b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
@@ -1,2 +1,3 @@
+Package: opie-embeddedkonsole
 Files: bin/embeddedkonsole apps/Applications/embeddedkonsole.desktop pics/konsole
 Priority: optional
diff --git a/core/apps/helpbrowser/opie-helpbrowser.control b/core/apps/helpbrowser/opie-helpbrowser.control
index ed5b16f..15eff8a 100644
--- a/core/apps/helpbrowser/opie-helpbrowser.control
+++ b/core/apps/helpbrowser/opie-helpbrowser.control
@@ -1,2 +1,3 @@
+Package: opie-helpbrowser
 Files: bin/helpbrowser apps/Applications/helpbrowser.desktop docs pics/helpbrowser
 Priority: optional
diff --git a/core/apps/qcop/opie-qcop.control b/core/apps/qcop/opie-qcop.control
index bd8dbcc..43779da 100644
--- a/core/apps/qcop/opie-qcop.control
+++ b/core/apps/qcop/opie-qcop.control
@@ -1,2 +1,3 @@
+Package: opie-qcop
 Files: bin/qcop
 Priority: required
diff --git a/core/apps/textedit/opie-textedit.control b/core/apps/textedit/opie-textedit.control
index 9535a75..0d86274 100644
--- a/core/apps/textedit/opie-textedit.control
+++ b/core/apps/textedit/opie-textedit.control
@@ -1,2 +1,3 @@
+Package: opie-textedit
 Files: bin/textedit apps/1Pim/textedit.desktop pics/textedit
 Priority: optional
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control
index 17767c3..fe5f4e0 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -1,2 +1,3 @@
+Package: opie-taskbar
 Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher pics/devicebuttons/*.png plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so* plugins/applets/librotateapplet.so* root/etc/init.d/opie
 Priority: required
diff --git a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
index 7bcc241..ebfb73d 100644
--- a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
+++ b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
@@ -1,2 +1,3 @@
+Package: opie-libmadplugin
 Files: plugins/codecs/libmadplugin.so.1.0.0 plugins/codecs/libmadplugin.so.1.0 plugins/codecs/libmadplugin.so.1 plugins/codecs/libmadplugin.so
 Priority: optional
diff --git a/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control b/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control
index 6b5ccff..517e52b 100644
--- a/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control
+++ b/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control
@@ -1,2 +1,3 @@
+Package: opie-libmpeg3plugin
 Files: plugins/codecs/libmpeg3plugin.so.1.0.0 plugins/codecs/libmpeg3plugin.so.1.0 plugins/codecs/libmpeg3plugin.so.1 plugins/codecs/libmpeg3plugin.so
 Priority: optional
diff --git a/core/multimedia/opieplayer/modplug/opie-modplugin.control b/core/multimedia/opieplayer/modplug/opie-modplugin.control
index ae3c3b3..dba0d7b 100644
--- a/core/multimedia/opieplayer/modplug/opie-modplugin.control
+++ b/core/multimedia/opieplayer/modplug/opie-modplugin.control
@@ -1,2 +1,3 @@
+Package: opie-modplugin
 Files: plugins/codecs/libmodplugin.so*
 Priority: optional
diff --git a/core/multimedia/opieplayer/opie-mediaplayer.control b/core/multimedia/opieplayer/opie-mediaplayer.control
index 7c1f348..f8a278d 100644
--- a/core/multimedia/opieplayer/opie-mediaplayer.control
+++ b/core/multimedia/opieplayer/opie-mediaplayer.control
@@ -1,2 +1,3 @@
+Package: opie-mediaplayer
 Files: bin/opieplayer pics/opieplayer apps/Applications/opieplayer.desktop pics/opieplayer2/skins/default
 Priority: optional
diff --git a/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control b/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control
index 60311cc..ec0bc24 100644
--- a/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control
+++ b/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control
@@ -1,2 +1,3 @@
+Package: opie-libtremorplugin
 Files: plugins/codecs/libtremorplugin.so.1.0.0 plugins/codecs/libtremorplugin.so.1.0 plugins/codecs/libtremorplugin.so.1 plugins/codecs/libtremorplugin.so
 Priority: optional
diff --git a/core/multimedia/opieplayer/vorbis/tremor/libtremor.control b/core/multimedia/opieplayer/vorbis/tremor/libtremor.control
index c8e7ac0..9defddc 100644
--- a/core/multimedia/opieplayer/vorbis/tremor/libtremor.control
+++ b/core/multimedia/opieplayer/vorbis/tremor/libtremor.control
@@ -1,2 +1,3 @@
+Package: libtremor
 Files: root/usr/lib/libtremor.so root/usr/lib/libtremor.so.1 root/usr/lib/libtremor.so.1.0 root/usr/lib/libtremor.so.1.0.0
 Priority: optional
diff --git a/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control b/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
index 5f4ca71..d8ef87c 100644
--- a/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
+++ b/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control
@@ -1,2 +1,3 @@
+Package: opie-wavplugin
 Files: plugins/codecs/libwavplugin*
 Priority: optional
diff --git a/core/obex/libopieobex0.control b/core/obex/libopieobex0.control
index 9f4ccb2..778c411 100644
--- a/core/obex/libopieobex0.control
+++ b/core/obex/libopieobex0.control
@@ -1,2 +1,3 @@
+Package: libopieobex0
 Files: plugins/obex/libopieobex.so* pics/obex/*
 Priority: optional
diff --git a/core/opie-login/opie-login.control b/core/opie-login/opie-login.control
index ba9bad1..270075e 100644
--- a/core/opie-login/opie-login.control
+++ b/core/opie-login/opie-login.control
@@ -1,2 +1,3 @@
+Package: opie-login
 Files: bin/opie-login share/opie-login/opie-session share/opie-login/pre-session share/opie-login/post-session
 Priority: optional
diff --git a/core/opiealarm/opie-opiealarm.control b/core/opiealarm/opie-opiealarm.control
index 34d1d47..e2e90a8 100644
--- a/core/opiealarm/opie-opiealarm.control
+++ b/core/opiealarm/opie-opiealarm.control
@@ -1,2 +1,3 @@
+Package: opie-opiealarm
 Files: bin/opiealarm root/etc/suspend-scripts/S46opiealarm root/etc/resume-scripts/R46opiealarm
 Priority: required
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index e881c55..f06fa91 100644
--- a/core/pim/addressbook/opie-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -1,2 +1,3 @@
+Package: opie-addressbook
 Files: bin/addressbook apps/1Pim/addressbook.desktop pics/addressbook/*.png
 Priority: optional
diff --git a/core/pim/datebook/opie-datebook.control b/core/pim/datebook/opie-datebook.control
index b43786b..1a28448 100644
--- a/core/pim/datebook/opie-datebook.control
+++ b/core/pim/datebook/opie-datebook.control
@@ -1,2 +1,3 @@
+Package: opie-datebook
 Files: bin/datebook apps/1Pim/datebook.desktop pics/datebook
 Priority: optional
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index 81659c0..a057faa 100644
--- a/core/pim/today/opie-today.control
+++ b/core/pim/today/opie-today.control
@@ -1,2 +1,3 @@
+Package: opie-today
 Files: bin/today apps/1Pim/today.desktop pics/today/*
 Priority: optional
diff --git a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
index 939a37a..9fe23b6 100644
--- a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
+++ b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
@@ -1,2 +1,3 @@
+Package: opie-today-addressbookplugin
 Files: plugins/today/libtodayaddressbookplugin.so*
 Priority: optional
diff --git a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
index 161ab16..231f4d0 100644
--- a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
+++ b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control
@@ -1,2 +1,3 @@
+Package: opie-today-datebookplugin
 Files: plugins/today/libtodaydatebookplugin.so*
 Priority: optional
diff --git a/core/pim/today/plugins/mail/opie-today-mailplugin.control b/core/pim/today/plugins/mail/opie-today-mailplugin.control
index d69a2f4..1419557 100644
--- a/core/pim/today/plugins/mail/opie-today-mailplugin.control
+++ b/core/pim/today/plugins/mail/opie-today-mailplugin.control
@@ -1,2 +1,3 @@
+Package: opie-today-mailplugin
 Files: plugins/today/libtodaymailplugin.so*
 Priority: optional
diff --git a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
index 8d21859..e6944b5 100644
--- a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
+++ b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
@@ -1,2 +1,3 @@
+Package: opie-today-todolistplugin
 Files: plugins/today/libtodaytodolistplugin.so*
 Priority: optional
diff --git a/core/pim/today/task-opie-today.control b/core/pim/today/task-opie-today.control
index 2e07fee..c8ae6e8 100644
--- a/core/pim/today/task-opie-today.control
+++ b/core/pim/today/task-opie-today.control
@@ -1,2 +1,3 @@
+Package: task-opie-today
 Priority: optional
 Section: opie/applications
diff --git a/core/pim/todo/opie-todo.control b/core/pim/todo/opie-todo.control
index 6f73925..b579306 100644
--- a/core/pim/todo/opie-todo.control
+++ b/core/pim/todo/opie-todo.control
@@ -1,2 +1,3 @@
+Package: opie-todo
 Files: bin/todolist apps/1Pim/todo.desktop pics/todo
 Priority: optional
diff --git a/core/settings/button/opie-button-settings.control b/core/settings/button/opie-button-settings.control
index 7857d9c..fcc10e7 100644
--- a/core/settings/button/opie-button-settings.control
+++ b/core/settings/button/opie-button-settings.control
@@ -1,2 +1,3 @@
+Package: opie-button-settings
 Files: bin/buttonsettings apps/Settings/Button.desktop pics/buttonsettings/*.png
 Priority: optional
diff --git a/core/settings/citytime/opie-citytime.control b/core/settings/citytime/opie-citytime.control
index 564e394..ce26e34 100644
--- a/core/settings/citytime/opie-citytime.control
+++ b/core/settings/citytime/opie-citytime.control
@@ -1,2 +1,3 @@
+Package: opie-citytime
 Files: bin/citytime apps/Settings/citytime.desktop pics/citytime
 Priority: optional
diff --git a/core/settings/launcher/opie-launcher-settings.control b/core/settings/launcher/opie-launcher-settings.control
index e930146..21a5559 100644
--- a/core/settings/launcher/opie-launcher-settings.control
+++ b/core/settings/launcher/opie-launcher-settings.control
@@ -1,2 +1,3 @@
+Package: opie-launcher-settings
 Files: bin/launchersettings apps/Settings/Launcher.desktop pics/launchersettings
 Priority: optional
diff --git a/core/settings/light-and-power/opie-light-and-power.control b/core/settings/light-and-power/opie-light-and-power.control
index fe73271..89a5b2f 100644
--- a/core/settings/light-and-power/opie-light-and-power.control
+++ b/core/settings/light-and-power/opie-light-and-power.control
@@ -1,2 +1,3 @@
+Package: opie-light-and-power
 Files: bin/light-and-power apps/Settings/Light.desktop pics/lightandpower
 Priority: optional
diff --git a/core/settings/security/opie-security.control b/core/settings/security/opie-security.control
index db98119..84b001d 100644
--- a/core/settings/security/opie-security.control
+++ b/core/settings/security/opie-security.control
@@ -1,2 +1,3 @@
+Package: opie-security
 Files: bin/security apps/Settings/Security.desktop pics/security
 Priority: optional
diff --git a/etc/opie-keytabs.control b/etc/opie-keytabs.control
index 410f74f..29a0337 100644
--- a/etc/opie-keytabs.control
+++ b/etc/opie-keytabs.control
@@ -1,2 +1,3 @@
+Package: opie-keytabs
 Files: etc/keytabs/*
 Priority: optional
diff --git a/example/example.control b/example/example.control
index 4dd49a9..08c5a5d 100644
--- a/example/example.control
+++ b/example/example.control
@@ -1,2 +1,3 @@
+Package: example
 Files: bin/example apps/Applications/example.desktop pics/example.png
 Priority: optional
diff --git a/freetype/opie-freetype.control b/freetype/opie-freetype.control
index 7447acb..5514c60 100644
--- a/freetype/opie-freetype.control
+++ b/freetype/opie-freetype.control
@@ -1,2 +1,3 @@
+Package: opie-freetype
 Files: plugins/fontfactories/libfreetypefactory*
 Priority: optional
diff --git a/help/en/html/opie-advancedfm-help-en.control b/help/en/html/opie-advancedfm-help-en.control
index 6c1e0a4..b3b7f5e 100644
--- a/help/en/html/opie-advancedfm-help-en.control
+++ b/help/en/html/opie-advancedfm-help-en.control
@@ -1,2 +1,3 @@
+Package: opie-advancedfm-help-en
 Files: help/en/html/opie-advancedfm.html 
 Priority: optional
diff --git a/help/en/html/opie-appskey-help-en.control b/help/en/html/opie-appskey-help-en.control
index bccef64..257e64d 100644
--- a/help/en/html/opie-appskey-help-en.control
+++ b/help/en/html/opie-appskey-help-en.control
@@ -1,2 +1,3 @@
+Package: opie-appskey-help-en
 Files: help/en/html/opie-appskey.html
 Priority: optional
diff --git a/help/en/html/opie-aqpkg-help-en.control b/help/en/html/opie-aqpkg-help-en.control
index 3619bc6..011191f 100644
--- a/help/en/html/opie-aqpkg-help-en.control
+++ b/help/en/html/opie-aqpkg-help-en.control
@@ -1,2 +1,3 @@
+Package: opie-aqpkg-help-en
 Files: help/en/html/aqpkg.html
 Priority: optional
diff --git a/help/en/html/opie-console-help-en.control b/help/en/html/opie-console-help-en.control
index ad94c32..3ac3954 100644
--- a/help/en/html/opie-console-help-en.control
+++ b/help/en/html/opie-console-help-en.control
@@ -1,2 +1,3 @@
+Package: opie-console-help-en
 Files: help/en/html/opie-console.html help/en/html/opie-console/*
 Priority: optional
diff --git a/help/en/html/opie-embeddedkonsole-help-en.control b/help/en/html/opie-embeddedkonsole-help-en.control
index b366ddd..560505e 100644
--- a/help/en/html/opie-embeddedkonsole-help-en.control
+++ b/help/en/html/opie-embeddedkonsole-help-en.control
@@ -1,2 +1,3 @@
+Package: opie-embeddedkonsole-help-en
 Files: help/en/html/opie-embeddedkonsole.html
 Priority: optional
diff --git a/help/en/html/opie-formatter-help-en.control b/help/en/html/opie-formatter-help-en.control
index 417f38d..f2fd4f7 100644
--- a/help/en/html/opie-formatter-help-en.control
+++ b/help/en/html/opie-formatter-help-en.control
@@ -1,2 +1,3 @@
+Package: opie-formatter-help-en
 Files: help/en/html/opie-formatter.html
 Priority: optional
diff --git a/help/en/html/opie-keypebble-help-en.control b/help/en/html/opie-keypebble-help-en.control
index c1702a8..9285cd0 100644
--- a/help/en/html/opie-keypebble-help-en.control
+++ b/help/en/html/opie-keypebble-help-en.control
@@ -1,2 +1,3 @@
+Package: opie-keypebble-help-en
 Files: help/en/html/opie-keypebble.html 
 Priority: optional
diff --git a/help/en/html/opie-vmemo-help-en.control b/help/en/html/opie-vmemo-help-en.control
index aaef4a2..726308c 100644
--- a/help/en/html/opie-vmemo-help-en.control
+++ b/help/en/html/opie-vmemo-help-en.control
@@ -1,2 +1,3 @@
+Package: opie-vmemo-help-en
 Files: help/en/html/opie-vmemo.html
 Priority: optional
diff --git a/help/en/html/opie-wellenreiter-help-en.control b/help/en/html/opie-wellenreiter-help-en.control
index 9fca8ad..597b9ac 100644
--- a/help/en/html/opie-wellenreiter-help-en.control
+++ b/help/en/html/opie-wellenreiter-help-en.control
@@ -1,2 +1,3 @@
+Package: opie-wellenreiter-help-en
 Files: help/en/html/wellenreiter.html
 Priority: optional
diff --git a/help/en/html/vmemo-help-en.control b/help/en/html/vmemo-help-en.control
index 79e71b3..8753aec 100644
--- a/help/en/html/vmemo-help-en.control
+++ b/help/en/html/vmemo-help-en.control
@@ -1,2 +1,3 @@
+Package: vmemo-help-en
 Files: help/en/html/vmemo.html
 Priority: optional
diff --git a/i18n/opie-i18n-da.control b/i18n/opie-i18n-da.control
index 6059aa9..2bd15f9 100644
--- a/i18n/opie-i18n-da.control
+++ b/i18n/opie-i18n-da.control
@@ -1,2 +1,3 @@
+Package: opie-i18n-da
 Files: i18n/da/.directory i18n/da/*.qm
 Priority: optional
diff --git a/i18n/opie-i18n-de.control b/i18n/opie-i18n-de.control
index cf651d9..c19c4ad 100644
--- a/i18n/opie-i18n-de.control
+++ b/i18n/opie-i18n-de.control
@@ -1,2 +1,3 @@
+Package: opie-i18n-de
 Files: i18n/de/.directory i18n/de/*.qm etc/dict/dawg.de
 Priority: optional
diff --git a/i18n/opie-i18n-en.control b/i18n/opie-i18n-en.control
index 52ac3f3..5725116 100644
--- a/i18n/opie-i18n-en.control
+++ b/i18n/opie-i18n-en.control
@@ -1,2 +1,3 @@
+Package: opie-i18n-en
 Files: i18n/en/.directory etc/dict/dawg
 Priority: optional
diff --git a/i18n/opie-i18n-es.control b/i18n/opie-i18n-es.control
index 22ad60d..c3994fb 100644
--- a/i18n/opie-i18n-es.control
+++ b/i18n/opie-i18n-es.control
@@ -1,2 +1,3 @@
+Package: opie-i18n-es
 Files: i18n/es/.directory i18n/es/*.qm etc/dict/dawg.es
 Priority: optional
diff --git a/i18n/opie-i18n-fr.control b/i18n/opie-i18n-fr.control
index c86e84a..748b900 100644
--- a/i18n/opie-i18n-fr.control
+++ b/i18n/opie-i18n-fr.control
@@ -1,2 +1,3 @@
+Package: opie-i18n-fr
 Files: i18n/fr/.directory i18n/fr/*.qm etc/dict/dawg.fr
 Priority: optional
diff --git a/i18n/opie-i18n-hu.control b/i18n/opie-i18n-hu.control
index 68a9b56..4bc10a3 100644
--- a/i18n/opie-i18n-hu.control
+++ b/i18n/opie-i18n-hu.control
@@ -1,2 +1,3 @@
+Package: opie-i18n-hu
 Files: i18n/hu/.directory i18n/hu/*.qm
 Priority: optional
diff --git a/i18n/opie-i18n-it.control b/i18n/opie-i18n-it.control
index 905d689..81a2030 100644
--- a/i18n/opie-i18n-it.control
+++ b/i18n/opie-i18n-it.control
@@ -1,2 +1,3 @@
+Package: opie-i18n-it
 Files: i18n/it/.directory i18n/it/*.qm
 Priority: optional
diff --git a/i18n/opie-i18n-nl.control b/i18n/opie-i18n-nl.control
index 6d4382a..b8f08c3 100644
--- a/i18n/opie-i18n-nl.control
+++ b/i18n/opie-i18n-nl.control
@@ -1,2 +1,3 @@
+Package: opie-i18n-nl
 Files: i18n/nl/.directory i18n/nl/*.qm
 Priority: optional
diff --git a/i18n/opie-i18n-pl.control b/i18n/opie-i18n-pl.control
index f031a1f..b0fbb7e 100644
--- a/i18n/opie-i18n-pl.control
+++ b/i18n/opie-i18n-pl.control
@@ -1,2 +1,3 @@
+Package: opie-i18n-pl
 Files: i18n/pl/.directory i18n/pl/*.qm
 Priority: optional
diff --git a/i18n/opie-i18n-pt.control b/i18n/opie-i18n-pt.control
index e584570..5976eba 100644
--- a/i18n/opie-i18n-pt.control
+++ b/i18n/opie-i18n-pt.control
@@ -1,2 +1,3 @@
+Package: opie-i18n-pt
 Files: i18n/pt/.directory i18n/pt/*.qm
 Priority: optional
diff --git a/i18n/opie-i18n-sl.control b/i18n/opie-i18n-sl.control
index 49ec541..98f2074 100644
--- a/i18n/opie-i18n-sl.control
+++ b/i18n/opie-i18n-sl.control
@@ -1,2 +1,3 @@
+Package: opie-i18n-sl
 Files: i18n/sl/.directory i18n/sl/*.qm
 Priority: optional
diff --git a/i18n/opie-i18n-zh-tw.control b/i18n/opie-i18n-zh-tw.control
index fc7fa02..be06adc 100644
--- a/i18n/opie-i18n-zh-tw.control
+++ b/i18n/opie-i18n-zh-tw.control
@@ -1,2 +1,3 @@
+Package: opie-i18n-zh-tw
 Files: i18n/zh_TW/.directory i18n/zh_TW/*.qm
 Priority: optional
diff --git a/i18n/unmaintained/opie-i18n-ja.control b/i18n/unmaintained/opie-i18n-ja.control
index ee44674..fed2631 100644
--- a/i18n/unmaintained/opie-i18n-ja.control
+++ b/i18n/unmaintained/opie-i18n-ja.control
@@ -1,2 +1,3 @@
+Package: opie-i18n-ja
 Files: i18n/ja/.directory i18n/ja/*.qm
 Priority: optional
diff --git a/i18n/unmaintained/opie-i18n-ko.control b/i18n/unmaintained/opie-i18n-ko.control
index 257593b..1ee5b72 100644
--- a/i18n/unmaintained/opie-i18n-ko.control
+++ b/i18n/unmaintained/opie-i18n-ko.control
@@ -1,2 +1,3 @@
+Package: opie-i18n-ko
 Files: i18n/ko/.directory i18n/ko/*.qm
 Priority: optional
diff --git a/i18n/unmaintained/opie-i18n-no.control b/i18n/unmaintained/opie-i18n-no.control
index 410531a..f8324b4 100644
--- a/i18n/unmaintained/opie-i18n-no.control
+++ b/i18n/unmaintained/opie-i18n-no.control
@@ -1,2 +1,3 @@
+Package: opie-i18n-no
 Files: i18n/no/.directory i18n/no/*.qm etc/dict/dawg.no
 Priority: optional
diff --git a/i18n/unmaintained/opie-i18n-zh-cn.control b/i18n/unmaintained/opie-i18n-zh-cn.control
index 74c7cbe..0614feb 100644
--- a/i18n/unmaintained/opie-i18n-zh-cn.control
+++ b/i18n/unmaintained/opie-i18n-zh-cn.control
@@ -1,2 +1,3 @@
+Package: opie-i18n-zh-cn
 Files: i18n/zh_CN/.directory i18n/zh_CN/*.qm
 Priority: optional
diff --git a/inputmethods/dvorak/opie-dvorak.control b/inputmethods/dvorak/opie-dvorak.control
index 8ecc1e7..4fa9847 100644
--- a/inputmethods/dvorak/opie-dvorak.control
+++ b/inputmethods/dvorak/opie-dvorak.control
@@ -1,2 +1,3 @@
+Package: opie-dvorak
 Files: plugins/inputmethods/libqdvorak.so*
 Priority: optional
diff --git a/inputmethods/handwriting/opie-handwriting-classicset.control b/inputmethods/handwriting/opie-handwriting-classicset.control
index 59f52cd..666e144 100644
--- a/inputmethods/handwriting/opie-handwriting-classicset.control
+++ b/inputmethods/handwriting/opie-handwriting-classicset.control
@@ -1,2 +1,3 @@
+Package: opie-handwriting-classicset
 Files: etc/qimpen/default.conf etc/qimpen/combining.qpt etc/qimpen/asciilower.qpt etc/qimpen/asciiupper.qpt etc/qimpen/numeric.qpt
 Priority: optional
diff --git a/inputmethods/handwriting/opie-handwriting-graffitiset.control b/inputmethods/handwriting/opie-handwriting-graffitiset.control
index 2424db8..080c993 100644
--- a/inputmethods/handwriting/opie-handwriting-graffitiset.control
+++ b/inputmethods/handwriting/opie-handwriting-graffitiset.control
@@ -1,2 +1,3 @@
+Package: opie-handwriting-graffitiset
 Files: etc/qimpen/graffiti*
 Priority: optional
diff --git a/inputmethods/handwriting/opie-handwriting.control b/inputmethods/handwriting/opie-handwriting.control
index ecf4249..470c81b 100644
--- a/inputmethods/handwriting/opie-handwriting.control
+++ b/inputmethods/handwriting/opie-handwriting.control
@@ -1,2 +1,3 @@
+Package: opie-handwriting
 Files: plugins/inputmethods/libqhandwriting.so*
 Priority: optional
diff --git a/inputmethods/jumpx/opie-jumpx.control b/inputmethods/jumpx/opie-jumpx.control
index 75e715f..270a428 100644
--- a/inputmethods/jumpx/opie-jumpx.control
+++ b/inputmethods/jumpx/opie-jumpx.control
@@ -1,2 +1,3 @@
+Package: opie-jumpx
 Files: plugins/inputmethods/libqjumpx.so* pics/jumpx
 Priority: optional
diff --git a/inputmethods/keyboard/opie-keyboard.control b/inputmethods/keyboard/opie-keyboard.control
index 685a005..701026b 100644
--- a/inputmethods/keyboard/opie-keyboard.control
+++ b/inputmethods/keyboard/opie-keyboard.control
@@ -1,2 +1,3 @@
+Package: opie-keyboard
 Files: plugins/inputmethods/libqkeyboard.so*
 Priority: optional
diff --git a/inputmethods/kjumpx/opie-kjumpx.control b/inputmethods/kjumpx/opie-kjumpx.control
index da3d8ad..06759a6 100644
--- a/inputmethods/kjumpx/opie-kjumpx.control
+++ b/inputmethods/kjumpx/opie-kjumpx.control
@@ -1,2 +1,3 @@
+Package: opie-kjumpx
 Files: plugins/inputmethods/libqkjumpx.so* pics/kjumpx/*
 Priority: optional
diff --git a/inputmethods/multikey/opie-multikey.control b/inputmethods/multikey/opie-multikey.control
index 21a1e26..bb4fd97 100644
--- a/inputmethods/multikey/opie-multikey.control
+++ b/inputmethods/multikey/opie-multikey.control
@@ -1,2 +1,3 @@
+Package: opie-multikey
 Files: plugins/inputmethods/libqmultikey.so* share/multikey/*
 Priority: optional
diff --git a/inputmethods/pickboard/opie-pickboard.control b/inputmethods/pickboard/opie-pickboard.control
index 8c88fe6..d722721 100644
--- a/inputmethods/pickboard/opie-pickboard.control
+++ b/inputmethods/pickboard/opie-pickboard.control
@@ -1,2 +1,3 @@
+Package: opie-pickboard
 Files: plugins/inputmethods/libqpickboard.so*
 Priority: optional
diff --git a/inputmethods/unikeyboard/opie-unikeyboard.control b/inputmethods/unikeyboard/opie-unikeyboard.control
index 92e6362..cd06721 100644
--- a/inputmethods/unikeyboard/opie-unikeyboard.control
+++ b/inputmethods/unikeyboard/opie-unikeyboard.control
@@ -1,2 +1,3 @@
+Package: opie-unikeyboard
 Files: plugins/inputmethods/libqunikeyboard.so*
 Priority: optional
diff --git a/libopie/libopie1.control b/libopie/libopie1.control
index 741e1f9..1e75df3 100644
--- a/libopie/libopie1.control
+++ b/libopie/libopie1.control
@@ -1,2 +1,3 @@
+Package: libopie1
 Files: $OPIEDIR/lib/libopie.so.1.0.0 $OPIEDIR/lib/libopie.so.1.0 $OPIEDIR/lib/libopie.so.1
 Priority: optional
diff --git a/libopie2/libopie2.control b/libopie2/libopie2.control
index 866d106..0733bf4 100644
--- a/libopie2/libopie2.control
+++ b/libopie2/libopie2.control
@@ -1,2 +1,3 @@
+Package: libopie2
 Files: $OPIEDIR/lib/libopiecore2.so.1.8.1 $OPIEDIR/lib/libopiecore2.so.1.8 $OPIEDIR/lib/libopiecore2.so.1 $OPIEDIR/lib/libopienet2.so.1.8.1 $OPIEDIR/lib/libopienet2.so.1.8 $OPIEDIR/lib/libopienet2.so.1 $OPIEDIR/lib/libopieui2.so.1.8.1 $OPIEDIR/lib/libopieui2.so.1.8 $OPIEDIR/lib/libopieui2.so.1 $OPIEDIR/etc/manufacturers
 Priority: optional
diff --git a/library/libqpe1.control b/library/libqpe1.control
index 455d8e0..8aab9be 100644
--- a/library/libqpe1.control
+++ b/library/libqpe1.control
@@ -1,2 +1,3 @@
+Package: libqpe1
 Files: $OPIEDIR/lib/libqpe.so.1 $OPIEDIR/lib/libqpe.so.1.5 $OPIEDIR/lib/libqpe.so.1.5.0
 Priority: required
diff --git a/library/opie-bootsplash.control b/library/opie-bootsplash.control
index aad3a84..838224d 100644
--- a/library/opie-bootsplash.control
+++ b/library/opie-bootsplash.control
@@ -1,2 +1,3 @@
+Package: opie-bootsplash
 Files: etc/init.d/bootsplash etc/rcS.d/S01bootsplash pics/bootsplash/bootlogo
 Priority: optinal
diff --git a/library/opie-common.control b/library/opie-common.control
index c2534c4..91dec72 100644
--- a/library/opie-common.control
+++ b/library/opie-common.control
@@ -1,2 +1,3 @@
+Package: opie-common
 Files: etc/colors bin/opie-reorgfiles apps/*/.directory etc/mime.types apps/Settings/quit.desktop pics/logo/*
 Priority: required
diff --git a/library/task-opie-applets.control b/library/task-opie-applets.control
index 7608f9b..6ab1bb0 100644
--- a/library/task-opie-applets.control
+++ b/library/task-opie-applets.control
@@ -1,2 +1,3 @@
+Package: task-opie-applets
 Files: 
 Priority: optional
diff --git a/library/task-opie-apps.control b/library/task-opie-apps.control
index 242a8cc..567b50a 100644
--- a/library/task-opie-apps.control
+++ b/library/task-opie-apps.control
@@ -1,2 +1,3 @@
+Package: task-opie-apps
 Files: 
 Priority: optional
diff --git a/library/task-opie-complete.control b/library/task-opie-complete.control
index 55b54fc..74ed446 100644
--- a/library/task-opie-complete.control
+++ b/library/task-opie-complete.control
@@ -1,2 +1,3 @@
+Package: task-opie-complete
 Files: 
 Priority: optional
diff --git a/library/task-opie-games.control b/library/task-opie-games.control
index 8079ea0..4e40b8e 100644
--- a/library/task-opie-games.control
+++ b/library/task-opie-games.control
@@ -1,2 +1,3 @@
+Package: task-opie-games
 Files: 
 Priority: optional
diff --git a/library/task-opie-minimal.control b/library/task-opie-minimal.control
index cac81b1..a11b50e 100644
--- a/library/task-opie-minimal.control
+++ b/library/task-opie-minimal.control
@@ -1,2 +1,3 @@
+Package: task-opie-minimal
 Files: 
 Priority: required
diff --git a/library/task-opie-pim.control b/library/task-opie-pim.control
index 53bef8c..addbab5 100644
--- a/library/task-opie-pim.control
+++ b/library/task-opie-pim.control
@@ -1,2 +1,3 @@
+Package: task-opie-pim
 Files: 
 Priority: optional
diff --git a/library/task-opie-settings.control b/library/task-opie-settings.control
index 4bd9d4e..945911a 100644
--- a/library/task-opie-settings.control
+++ b/library/task-opie-settings.control
@@ -1,2 +1,3 @@
+Package: task-opie-settings
 Files: 
 Priority: optional
diff --git a/library/task-opie.control b/library/task-opie.control
index 6ee0714..00841d3 100644
--- a/library/task-opie.control
+++ b/library/task-opie.control
@@ -1,2 +1,3 @@
+Package: task-opie
 Files: 
 Priority: required
diff --git a/noncore/applets/networkapplet/opie-networkapplet.control b/noncore/applets/networkapplet/opie-networkapplet.control
index 1032064..ae07eb3 100644
--- a/noncore/applets/networkapplet/opie-networkapplet.control
+++ b/noncore/applets/networkapplet/opie-networkapplet.control
@@ -1,2 +1,3 @@
+Package: opie-networkapplet
 Files: plugins/applets/libnetworkapplet.so* pics/networkapplet
 Priority: optional
diff --git a/noncore/applets/notesapplet/opie-notesapplet.control b/noncore/applets/notesapplet/opie-notesapplet.control
index ff05e89..da02b44 100644
--- a/noncore/applets/notesapplet/opie-notesapplet.control
+++ b/noncore/applets/notesapplet/opie-notesapplet.control
@@ -1,2 +1,3 @@
+Package: opie-notesapplet
 Files: plugins/applets/libnotesapplet.so* 
 Priority: optional
diff --git a/noncore/applets/wirelessapplet/opie-wirelessapplet.control b/noncore/applets/wirelessapplet/opie-wirelessapplet.control
index f5daeb9..ac7fad2 100644
--- a/noncore/applets/wirelessapplet/opie-wirelessapplet.control
+++ b/noncore/applets/wirelessapplet/opie-wirelessapplet.control
@@ -1,2 +1,3 @@
+Package: opie-wirelessapplet
 Files: plugins/applets/libwirelessapplet.so* 
 Priority: optional
diff --git a/noncore/apps/advancedfm/opie-advancedfm.control b/noncore/apps/advancedfm/opie-advancedfm.control
index 8c2eba4..f17c590 100644
--- a/noncore/apps/advancedfm/opie-advancedfm.control
+++ b/noncore/apps/advancedfm/opie-advancedfm.control
@@ -1,2 +1,3 @@
+Package: opie-advancedfm
 Files: bin/advancedfm apps/Applications/advancedfm.desktop pics/advancedfm
 Priority: optional
diff --git a/noncore/apps/checkbook/opie-checkbook.control b/noncore/apps/checkbook/opie-checkbook.control
index fe140b9..c0061e5 100644
--- a/noncore/apps/checkbook/opie-checkbook.control
+++ b/noncore/apps/checkbook/opie-checkbook.control
@@ -1,2 +1,3 @@
+Package: opie-checkbook
 Files: bin/checkbook apps/Applications/checkbook.desktop pics/checkbook
 Priority: optional
diff --git a/noncore/apps/odict/opie-odict.control b/noncore/apps/odict/opie-odict.control
index a6fa675..2fa731f 100644
--- a/noncore/apps/odict/opie-odict.control
+++ b/noncore/apps/odict/opie-odict.control
@@ -1,2 +1,3 @@
+Package: opie-odict
 Files: bin/odict apps/Applications/odict.desktop pics/odict/odict.png
 Priority: optional
diff --git a/noncore/apps/opie-console/opie-console.control b/noncore/apps/opie-console/opie-console.control
index b35324b..852451d 100644
--- a/noncore/apps/opie-console/opie-console.control
+++ b/noncore/apps/opie-console/opie-console.control
@@ -1,2 +1,3 @@
+Package: opie-console
 Files: bin/opie-console apps/Applications/opie-console.desktop pics/console/* 
 Priority: optional
diff --git a/noncore/apps/opie-reader/opie-reader.control b/noncore/apps/opie-reader/opie-reader.control
index 1ede9e9..9996297 100644
--- a/noncore/apps/opie-reader/opie-reader.control
+++ b/noncore/apps/opie-reader/opie-reader.control
@@ -1,2 +1,3 @@
+Package: opie-reader
 Files: bin/reader apps/Applications/opie-reader.desktop pics/opie-reader/*
 Priority: optional
diff --git a/noncore/apps/opie-sheet/opie-sheet.control b/noncore/apps/opie-sheet/opie-sheet.control
index f0daa33..795ee70 100644
--- a/noncore/apps/opie-sheet/opie-sheet.control
+++ b/noncore/apps/opie-sheet/opie-sheet.control
@@ -1,2 +1,3 @@
+Package: opie-sheet
 Files: bin/sheetqt apps/Applications/opie-sheet.desktop help/en/html/sheetqt.html pics/opie-sheet/sheetqt.png
 Priority: optional
diff --git a/noncore/apps/opie-write/opie-write.control b/noncore/apps/opie-write/opie-write.control
index c9177a6..52b518a 100644
--- a/noncore/apps/opie-write/opie-write.control
+++ b/noncore/apps/opie-write/opie-write.control
@@ -1,2 +1,3 @@
+Package: opie-write
 Files: bin/opie-write apps/Applications/opie-write.desktop pics/opie-write
 Priority: optional
diff --git a/noncore/apps/oxygen/opie-oxygen.control b/noncore/apps/oxygen/opie-oxygen.control
index db82d88..1eff80b 100644
--- a/noncore/apps/oxygen/opie-oxygen.control
+++ b/noncore/apps/oxygen/opie-oxygen.control
@@ -1,2 +1,3 @@
+Package: opie-oxygen
 Files: bin/oxygen apps/Applications/oxygen.desktop pics/oxygen/oxygen.png share/oxygen/*
 Priority: optional
diff --git a/noncore/apps/tableviewer/opie-tableviewer.control b/noncore/apps/tableviewer/opie-tableviewer.control
index 0e1db16..b5495e1 100644
--- a/noncore/apps/tableviewer/opie-tableviewer.control
+++ b/noncore/apps/tableviewer/opie-tableviewer.control
@@ -1,2 +1,3 @@
+Package: opie-tableviewer
 Files: bin/tableviewer apps/Applications/tableviewer.desktop
 Priority: optional
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control b/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control
index 3f6feab..76704c1 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-commondev.control
@@ -1,2 +1,3 @@
+Package: opie-tinykate-syntax-commondev
 Files: share/tinykate/syntax/c.xml share/tinykate/syntax/cpp.xml share/tinykate/syntax/gnuassembler.xml share/tinykate/syntax/kbasic.xml share/tinykate/syntax/pascal.xml share/tinykate/syntax/perl.xml share/tinykate/syntax/php.xml share/tinykate/syntax/python.xml share/tinykate/syntax/ruby.xml share/tinykate/syntax/sql.xml share/tinykate/syntax/tcl.xml share/tinykate/syntax/xml.xml share/tinykate/syntax/xmldebug.xml share/tinykate/syntax/java.xml
 Priority: optional
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control b/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control
index 6acf895..9f60156 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-documentation.control
@@ -1,2 +1,3 @@
+Package: opie-tinykate-syntax-documentation
 Files: share/tinykate/syntax/latex.xml share/tinykate/syntax/postscript.xml share/tinykate/syntax/sgml.xml
 Priority: optional
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-misc.control b/noncore/apps/tinykate/opie-tinykate-syntax-misc.control
index e6802d0..4e0f529 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-misc.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-misc.control
@@ -1,2 +1,3 @@
+Package: opie-tinykate-syntax-misc
 Files: share/tinykate/syntax/idconsole.xml share/tinykate/syntax/matlab.xml share/tinykate/syntax/verilog.xml share/tinykate/syntax/vhdl.xml
 Priority: optional
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control b/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control
index e91d7df..3c8f61a 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-miscdev.control
@@ -1,2 +1,3 @@
+Package: opie-tinykate-syntax-miscdev
 Files: share/tinykate/syntax/ada.xml share/tinykate/syntax/eiffel.xml share/tinykate/syntax/ferite.xml share/tinykate/syntax/fortran.xml share/tinykate/syntax/haskell.xml share/tinykate/syntax/literate-haskell.xml share/tinykate/syntax/objectivec.xml share/tinykate/syntax/sather.xml share/tinykate/syntax/scheme.xml
 Priority: optional
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-unix.control b/noncore/apps/tinykate/opie-tinykate-syntax-unix.control
index 923c0d5..36e88b5 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-unix.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-unix.control
@@ -1,2 +1,3 @@
+Package: opie-tinykate-syntax-unix
 Files: share/tinykate/syntax/cs.xml share/tinykate/syntax/bash.xml share/tinykate/syntax/changelog.xml share/tinykate/syntax/desktop.xml share/tinykate/syntax/diff.xml share/tinykate/syntax/mab.xml share/tinykate/syntax/makefile.xml share/tinykate/syntax/rpmspec.xml share/tinykate/syntax/sml.xml share/tinykate/syntax/winehq.xml 
 Priority: optional
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax-web.control b/noncore/apps/tinykate/opie-tinykate-syntax-web.control
index bf931c5..46fe64a 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax-web.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax-web.control
@@ -1,2 +1,3 @@
+Package: opie-tinykate-syntax-web
 Files: share/tinykate/syntax/css.xml share/tinykate/syntax/html.xml share/tinykate/syntax/javascript.xml
 Priority: optional
diff --git a/noncore/apps/tinykate/opie-tinykate-syntax.control b/noncore/apps/tinykate/opie-tinykate-syntax.control
index c5257ea..9d39fc6 100644
--- a/noncore/apps/tinykate/opie-tinykate-syntax.control
+++ b/noncore/apps/tinykate/opie-tinykate-syntax.control
@@ -1,2 +1,3 @@
+Package: opie-tinykate-syntax
 Priority: optional
 Section: opie/applications
diff --git a/noncore/apps/tinykate/opie-tinykate.control b/noncore/apps/tinykate/opie-tinykate.control
index 504289a..95dd7e0 100644
--- a/noncore/apps/tinykate/opie-tinykate.control
+++ b/noncore/apps/tinykate/opie-tinykate.control
@@ -1,2 +1,3 @@
+Package: opie-tinykate
 Files: bin/tinykate apps/Applications/tinykate.desktop pics/tinykate $OPIEDIR/lib/libtinykate.so.1.0.0 $OPIEDIR/lib/libtinykate.so.1.0 $OPIEDIR/lib/libtinykate.so.1
 Priority: optional
diff --git a/noncore/comm/keypebble/opie-keypebble.control b/noncore/comm/keypebble/opie-keypebble.control
index 2701a1c..123f307 100644
--- a/noncore/comm/keypebble/opie-keypebble.control
+++ b/noncore/comm/keypebble/opie-keypebble.control
@@ -1,2 +1,3 @@
+Package: opie-keypebble
 Files: bin/keypebble apps/Applications/keypebble.desktop pics/vnc
 Priority: optional
diff --git a/noncore/comm/mobilemsg/opie-mobilemsg.control b/noncore/comm/mobilemsg/opie-mobilemsg.control
index e1c79a5..6eababa 100644
--- a/noncore/comm/mobilemsg/opie-mobilemsg.control
+++ b/noncore/comm/mobilemsg/opie-mobilemsg.control
@@ -1,2 +1,3 @@
+Package: opie-mobilemsg
 Files: bin/mobilemsg apps/Applications/mobilemsg.desktop pics/mobilemsg 
 Priority: optional
diff --git a/noncore/decorations/flat/opie-deco-flat.control b/noncore/decorations/flat/opie-deco-flat.control
index a678366..ae64aae 100644
--- a/noncore/decorations/flat/opie-deco-flat.control
+++ b/noncore/decorations/flat/opie-deco-flat.control
@@ -1,2 +1,3 @@
+Package: opie-deco-flat
 Files: plugins/decorations/libflat.so*
 Priority: optional
diff --git a/noncore/decorations/liquid/opie-deco-liquid.control b/noncore/decorations/liquid/opie-deco-liquid.control
index 74dfcc5..2f91612 100644
--- a/noncore/decorations/liquid/opie-deco-liquid.control
+++ b/noncore/decorations/liquid/opie-deco-liquid.control
@@ -1,2 +1,3 @@
+Package: opie-deco-liquid
 Files: plugins/decorations/libliquid.so*
 Priority: optional
diff --git a/noncore/decorations/polished/opie-deco-polished.control b/noncore/decorations/polished/opie-deco-polished.control
index 13d04ad..4d4b4e3 100644
--- a/noncore/decorations/polished/opie-deco-polished.control
+++ b/noncore/decorations/polished/opie-deco-polished.control
@@ -1,2 +1,3 @@
+Package: opie-deco-polished
 Files: plugins/decorations/libpolished.so*
 Priority: optional
diff --git a/noncore/games/backgammon/backgammon.control b/noncore/games/backgammon/backgammon.control
index 32a53f0..b75bc60 100644
--- a/noncore/games/backgammon/backgammon.control
+++ b/noncore/games/backgammon/backgammon.control
@@ -1,2 +1,3 @@
+Package: backgammon
 Files: bin/backgammon apps/Games/backgammon.desktop pics/backgammon help/en/html/backgammon.html
 Priority: optional
diff --git a/noncore/games/bounce/opie-bounce.control b/noncore/games/bounce/opie-bounce.control
index 2ff4472..8b3fdb9 100644
--- a/noncore/games/bounce/opie-bounce.control
+++ b/noncore/games/bounce/opie-bounce.control
@@ -1,2 +1,3 @@
+Package: opie-bounce
 Files: bin/bounce apps/Games/bounce.desktop pics/bounce/*.png
 Version: 0.6-$SUB_VERSION 
diff --git a/noncore/games/buzzword/opie-buzzword.control b/noncore/games/buzzword/opie-buzzword.control
index fd33336..08b442b 100644
--- a/noncore/games/buzzword/opie-buzzword.control
+++ b/noncore/games/buzzword/opie-buzzword.control
@@ -1,2 +1,3 @@
+Package: opie-buzzword
 Files: bin/buzzword apps/Games/buzzword.desktop pics/buzzword/buzzword.png share/buzzword/buzzwords
 Version: 1.1-$SUB_VERSION 
diff --git a/noncore/games/fifteen/opie-fifteen.control b/noncore/games/fifteen/opie-fifteen.control
index c540cd5..662fd03 100644
--- a/noncore/games/fifteen/opie-fifteen.control
+++ b/noncore/games/fifteen/opie-fifteen.control
@@ -1,2 +1,3 @@
+Package: opie-fifteen
 Files: bin/fifteen apps/Games/fifteen.desktop pics/fifteen
 Priority: optional
diff --git a/noncore/games/go/opie-go.control b/noncore/games/go/opie-go.control
index cdd4779..061c02c 100644
--- a/noncore/games/go/opie-go.control
+++ b/noncore/games/go/opie-go.control
@@ -1,2 +1,3 @@
+Package: opie-go
 Files: bin/go apps/Games/go.desktop pics/go
 Priority: optional
diff --git a/noncore/games/kbill/opie-kbill.control b/noncore/games/kbill/opie-kbill.control
index 0fe6f4e..b1422d4 100644
--- a/noncore/games/kbill/opie-kbill.control
+++ b/noncore/games/kbill/opie-kbill.control
@@ -1,2 +1,3 @@
+Package: opie-kbill
 Files: bin/kbill apps/Games/kbill.desktop pics/kbill/*
 Priority: optional
diff --git a/noncore/games/kcheckers/opie-kcheckers.control b/noncore/games/kcheckers/opie-kcheckers.control
index 3821e07..e228209 100644
--- a/noncore/games/kcheckers/opie-kcheckers.control
+++ b/noncore/games/kcheckers/opie-kcheckers.control
@@ -1,2 +1,3 @@
+Package: opie-kcheckers
 Files: bin/kcheckers apps/Games/kcheckers.desktop pics/kcheckers
 Priority: optional
diff --git a/noncore/games/kpacman/opie-kpacman.control b/noncore/games/kpacman/opie-kpacman.control
index 417d0e9..15e3056 100644
--- a/noncore/games/kpacman/opie-kpacman.control
+++ b/noncore/games/kpacman/opie-kpacman.control
@@ -1,2 +1,3 @@
+Package: opie-kpacman
 Files: bin/kpacman apps/Games/kpacman.desktop pics/kpacman/kpacman.png share/kpacman
 Version: 0.3.1-$SUB_VERSION
diff --git a/noncore/games/mindbreaker/opie-mindbreaker.control b/noncore/games/mindbreaker/opie-mindbreaker.control
index 445a2c2..7623d6a 100644
--- a/noncore/games/mindbreaker/opie-mindbreaker.control
+++ b/noncore/games/mindbreaker/opie-mindbreaker.control
@@ -1,2 +1,3 @@
+Package: opie-mindbreaker
 Files: bin/mindbreaker apps/Games/mindbreaker.desktop pics/mindbreaker
 Priority: optional
diff --git a/noncore/games/minesweep/opie-minesweep.control b/noncore/games/minesweep/opie-minesweep.control
index 9f22469..7236cf8 100644
--- a/noncore/games/minesweep/opie-minesweep.control
+++ b/noncore/games/minesweep/opie-minesweep.control
@@ -1,2 +1,3 @@
+Package: opie-minesweep
 Files: bin/minesweep apps/Games/minesweep.desktop pics/minesweep
 Priority: optional
diff --git a/noncore/games/parashoot/opie-parashoot.control b/noncore/games/parashoot/opie-parashoot.control
index 997ad99..ad955f5 100644
--- a/noncore/games/parashoot/opie-parashoot.control
+++ b/noncore/games/parashoot/opie-parashoot.control
@@ -1,2 +1,3 @@
+Package: opie-parashoot
 Files: bin/parashoot apps/Games/parashoot.desktop pics/parashoot
 Priority: optional
diff --git a/noncore/games/qasteroids/opie-qasteroids.control b/noncore/games/qasteroids/opie-qasteroids.control
index 6269e78..49cc6b2 100644
--- a/noncore/games/qasteroids/opie-qasteroids.control
+++ b/noncore/games/qasteroids/opie-qasteroids.control
@@ -1,2 +1,3 @@
+Package: opie-qasteroids
 Files: bin/qasteroids apps/Games/qasteroids.desktop pics/qasteroids/*
 Priority: optional
diff --git a/noncore/games/sfcave/opie-sfcave.control b/noncore/games/sfcave/opie-sfcave.control
index d4a891c..1566959 100644
--- a/noncore/games/sfcave/opie-sfcave.control
+++ b/noncore/games/sfcave/opie-sfcave.control
@@ -1,2 +1,3 @@
+Package: opie-sfcave
 Files: bin/sfcave apps/Games/sfcave.desktop pics/sfcave
 Priority: optional
diff --git a/noncore/games/snake/opie-snake.control b/noncore/games/snake/opie-snake.control
index 17e535a..3ab6640 100644
--- a/noncore/games/snake/opie-snake.control
+++ b/noncore/games/snake/opie-snake.control
@@ -1,2 +1,3 @@
+Package: opie-snake
 Files: bin/snake apps/Games/snake.desktop pics/snake
 Priority: optional
diff --git a/noncore/games/solitaire/opie-solitaire.control b/noncore/games/solitaire/opie-solitaire.control
index d530c53..76e7208 100644
--- a/noncore/games/solitaire/opie-solitaire.control
+++ b/noncore/games/solitaire/opie-solitaire.control
@@ -1,2 +1,3 @@
+Package: opie-solitaire
 Files: bin/patience apps/Games/patience.desktop pics/cards
 Priority: optional
diff --git a/noncore/games/tetrix/opie-tetrix.control b/noncore/games/tetrix/opie-tetrix.control
index 2432b96..e335507 100644
--- a/noncore/games/tetrix/opie-tetrix.control
+++ b/noncore/games/tetrix/opie-tetrix.control
@@ -1,2 +1,3 @@
+Package: opie-tetrix
 Files: bin/tetrix apps/Games/tetrix.desktop pics/tetrix/*
 Priority: optional
diff --git a/noncore/games/tictac/opie-tictac.control b/noncore/games/tictac/opie-tictac.control
index e8af22b..c4ee36c 100644
--- a/noncore/games/tictac/opie-tictac.control
+++ b/noncore/games/tictac/opie-tictac.control
@@ -1,2 +1,3 @@
+Package: opie-tictac
 Files: bin/tictac apps/Games/tictac.desktop pics/tictac
 Priority: optional
diff --git a/noncore/games/wordgame/opie-wordgame.control b/noncore/games/wordgame/opie-wordgame.control
index 2c8a3f9..3be8e8f 100644
--- a/noncore/games/wordgame/opie-wordgame.control
+++ b/noncore/games/wordgame/opie-wordgame.control
@@ -1,2 +1,3 @@
+Package: opie-wordgame
 Files: bin/wordgame apps/Games/wordgame.desktop pics/wordgame
 Priority: optional
diff --git a/noncore/graphics/drawpad/opie-drawpad.control b/noncore/graphics/drawpad/opie-drawpad.control
index 7b7b346..cee1313 100644
--- a/noncore/graphics/drawpad/opie-drawpad.control
+++ b/noncore/graphics/drawpad/opie-drawpad.control
@@ -1,2 +1,3 @@
+Package: opie-drawpad
 Files: bin/drawpad apps/1Pim/drawpad.desktop pics/drawpad
 Priority: optional
diff --git a/noncore/multimedia/camera/opie-camera.control b/noncore/multimedia/camera/opie-camera.control
index 49f0bc9..a33de38 100644
--- a/noncore/multimedia/camera/opie-camera.control
+++ b/noncore/multimedia/camera/opie-camera.control
@@ -1,2 +1,3 @@
+Package: opie-camera
 Files: bin/opiecam pics/camera apps/Applications/camera.desktop
 Priority: optional
diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2-skin-default-landscape.control b/noncore/multimedia/opieplayer2/opie-mediaplayer2-skin-default-landscape.control
index 6185fb0..a0db0ae 100644
--- a/noncore/multimedia/opieplayer2/opie-mediaplayer2-skin-default-landscape.control
+++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2-skin-default-landscape.control
@@ -1,2 +1,3 @@
+Package: opie-mediaplayer2-skin-default-landscape
 Files: pics/opieplayer2/skins/default_landscape
 Priority: optional
diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
index 29c798d..9ee624d 100644
--- a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
+++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
@@ -1,2 +1,3 @@
+Package: opie-mediaplayer2
 Files: bin/opieplayer2  apps/Applications/mediaplayer.desktop pics/opieplayer2/add_to_playlist.png pics/opieplayer2/cut.png pics/opieplayer2/delete.png  pics/opieplayer2/down.png  pics/opieplayer2/loop.png pics/opieplayer2/MPEGPlayer.png pics/opieplayer2/musicfile.png pics/opieplayer2/playlist2.png pics/opieplayer2/play.png pics/opieplayer2/remove_from_playlist.png pics/opieplayer2/shuffle.png  pics/opieplayer2/up.png pics/opieplayer2/videofile.png pics/opieplayer2/skins/default
 Priority: optional
diff --git a/noncore/multimedia/showimg/opie-showimg.control b/noncore/multimedia/showimg/opie-showimg.control
index 669d92e..9dacd94 100644
--- a/noncore/multimedia/showimg/opie-showimg.control
+++ b/noncore/multimedia/showimg/opie-showimg.control
@@ -1,2 +1,3 @@
+Package: opie-showimg
 Files: bin/showimg apps/Applications/showimg.desktop pics/imageviewer
 Priority: optional
diff --git a/noncore/net/ftplib/ftplib.control b/noncore/net/ftplib/ftplib.control
index be3aa95..3dcb02a 100644
--- a/noncore/net/ftplib/ftplib.control
+++ b/noncore/net/ftplib/ftplib.control
@@ -1,2 +1,3 @@
+Package: ftplib
 Files: $OPIEDIR/lib/libftplib.*
 Priority: optional
diff --git a/noncore/net/mailit/opie-mailit.control b/noncore/net/mailit/opie-mailit.control
index de3f873..65b5b36 100644
--- a/noncore/net/mailit/opie-mailit.control
+++ b/noncore/net/mailit/opie-mailit.control
@@ -1,2 +1,3 @@
+Package: opie-mailit
 Files: bin/mailit apps/1Pim/mailit.desktop pics/mailit
 Priority: optional
diff --git a/noncore/net/opieftp/opie-ftp.control b/noncore/net/opieftp/opie-ftp.control
index 61eafcc..090e9a8 100644
--- a/noncore/net/opieftp/opie-ftp.control
+++ b/noncore/net/opieftp/opie-ftp.control
@@ -1,2 +1,3 @@
+Package: opie-ftp
 Files: bin/opieftp pics/opieftp apps/Applications/opieftp.desktop
 Priority: optional
diff --git a/noncore/net/opieirc/opie-irc.control b/noncore/net/opieirc/opie-irc.control
index 07ceab8..f1e6ff8 100644
--- a/noncore/net/opieirc/opie-irc.control
+++ b/noncore/net/opieirc/opie-irc.control
@@ -1,2 +1,3 @@
+Package: opie-irc
 Files: bin/opieirc pics/opieirc apps/Applications/opieirc.desktop help/en/html/opieirc.html help/en/html/opieirc
 Priority: optional
diff --git a/noncore/net/opietooth/applet/opie-bluetoothapplet.control b/noncore/net/opietooth/applet/opie-bluetoothapplet.control
index aff84a9..b9bd63c 100644
--- a/noncore/net/opietooth/applet/opie-bluetoothapplet.control
+++ b/noncore/net/opietooth/applet/opie-bluetoothapplet.control
@@ -1,2 +1,3 @@
+Package: opie-bluetoothapplet
 Files: plugins/applets/libbluetoothapplet.so* pics/bluetoothapplet/*
 Priority: optional
diff --git a/noncore/net/opietooth/blue-pin/opie-bluepin.control b/noncore/net/opietooth/blue-pin/opie-bluepin.control
index 6674171..297fdfe 100644
--- a/noncore/net/opietooth/blue-pin/opie-bluepin.control
+++ b/noncore/net/opietooth/blue-pin/opie-bluepin.control
@@ -1,2 +1,3 @@
+Package: opie-bluepin
 Files: bin/bluepin
 Priority: optional
diff --git a/noncore/net/opietooth/lib/libopietooth1.control b/noncore/net/opietooth/lib/libopietooth1.control
index a04dda8..62c2963 100644
--- a/noncore/net/opietooth/lib/libopietooth1.control
+++ b/noncore/net/opietooth/lib/libopietooth1.control
@@ -1,2 +1,3 @@
+Package: libopietooth1
 Files: $OPIEDIR/lib/libopietooth.so.1.0.0 $OPIEDIR/lib/libopietooth.so.1.0 $OPIEDIR/lib/libopietooth.so.1 
 Priority: optional
diff --git a/noncore/net/opietooth/manager/opie-bluetoothmanager.control b/noncore/net/opietooth/manager/opie-bluetoothmanager.control
index f48a1e5..4e0a5fa 100644
--- a/noncore/net/opietooth/manager/opie-bluetoothmanager.control
+++ b/noncore/net/opietooth/manager/opie-bluetoothmanager.control
@@ -1,2 +1,3 @@
+Package: opie-bluetoothmanager
 Files: bin/bluetooth-manager apps/Settings/bluetooth-manager.desktop pics/opietooth/*
 Priority: optional
diff --git a/noncore/net/ubrowser/opie-ubrowser.control b/noncore/net/ubrowser/opie-ubrowser.control
index bf66ca5..61a6cde 100644
--- a/noncore/net/ubrowser/opie-ubrowser.control
+++ b/noncore/net/ubrowser/opie-ubrowser.control
@@ -1,2 +1,3 @@
+Package: opie-ubrowser
 Files: bin/ubrowser apps/Applications/ubrowser.desktop pics/ubrowser/*.png
 Priority: optional
diff --git a/noncore/net/wellenreiter/opie-wellenreiter.control b/noncore/net/wellenreiter/opie-wellenreiter.control
index c635ace..f7267b4 100644
--- a/noncore/net/wellenreiter/opie-wellenreiter.control
+++ b/noncore/net/wellenreiter/opie-wellenreiter.control
@@ -1,2 +1,3 @@
+Package: opie-wellenreiter
 Files: bin/wellenreiter share/wellenreiter pics/wellenreiter apps/Applications/wellenreiter.desktop
 Priority: optional
diff --git a/noncore/settings/appearance2/opie-appearance.control b/noncore/settings/appearance2/opie-appearance.control
index cc3082d..43705e1 100644
--- a/noncore/settings/appearance2/opie-appearance.control
+++ b/noncore/settings/appearance2/opie-appearance.control
@@ -1,2 +1,3 @@
+Package: opie-appearance
 Files: bin/appearance apps/Settings/Appearance.desktop pics/appearance
 Priority: optional
diff --git a/noncore/settings/aqpkg/opie-aqpkg.control b/noncore/settings/aqpkg/opie-aqpkg.control
index accc497..b8ad1e8 100644
--- a/noncore/settings/aqpkg/opie-aqpkg.control
+++ b/noncore/settings/aqpkg/opie-aqpkg.control
@@ -1,2 +1,3 @@
+Package: opie-aqpkg
 Files: bin/aqpkg pics/aqpkg apps/Settings/aqpkg.desktop 
 Priority: optional
diff --git a/noncore/settings/backup/opie-backup.control b/noncore/settings/backup/opie-backup.control
index 385ccbc..3f2be85 100644
--- a/noncore/settings/backup/opie-backup.control
+++ b/noncore/settings/backup/opie-backup.control
@@ -1,2 +1,3 @@
+Package: opie-backup
 Files: bin/backup pics/backup apps/Settings/backup.desktop
 Priority: optional
diff --git a/noncore/settings/language/opie-language.control b/noncore/settings/language/opie-language.control
index 06542a9..2f166b9 100644
--- a/noncore/settings/language/opie-language.control
+++ b/noncore/settings/language/opie-language.control
@@ -1,2 +1,3 @@
+Package: opie-language
 Files: bin/language apps/Settings/Language.desktop
 Priority: optional
diff --git a/noncore/settings/mediummount/opie-mediummount.control b/noncore/settings/mediummount/opie-mediummount.control
index 8a7cc46..295fba4 100644
--- a/noncore/settings/mediummount/opie-mediummount.control
+++ b/noncore/settings/mediummount/opie-mediummount.control
@@ -1,2 +1,3 @@
+Package: opie-mediummount
 Files: bin/mediummount apps/Settings/medium.desktop pics/mediummount/*
 Priority: optional
diff --git a/noncore/settings/networksettings/opie-networksettings.control b/noncore/settings/networksettings/opie-networksettings.control
index 5bb1dce..e2db92f 100644
--- a/noncore/settings/networksettings/opie-networksettings.control
+++ b/noncore/settings/networksettings/opie-networksettings.control
@@ -1,2 +1,3 @@
+Package: opie-networksettings
 Files: bin/networksettings apps/Settings/networksettings.desktop plugins/networksettings/* pics/networksettings/* pics/Network/PPPConnect.png $OPIEDIR/lib/libinterfaces.so.1.0.0 $OPIEDIR/lib/libinterfaces.so.1.0 $OPIEDIR/lib/libinterfaces.so.1 root/usr/bin/changedns bin/getprofile
 Priority: optional
diff --git a/noncore/settings/sound/opie-vmemo-settings.control b/noncore/settings/sound/opie-vmemo-settings.control
index 8ceccde..574c91d 100644
--- a/noncore/settings/sound/opie-vmemo-settings.control
+++ b/noncore/settings/sound/opie-vmemo-settings.control
@@ -1,2 +1,3 @@
+Package: opie-vmemo-settings
 Files: bin/sound apps/Settings/Sound.desktop
 Priority: optional
diff --git a/noncore/settings/sshkeys/opie-sshkeys.control b/noncore/settings/sshkeys/opie-sshkeys.control
index 952d632..ec7afbc 100644
--- a/noncore/settings/sshkeys/opie-sshkeys.control
+++ b/noncore/settings/sshkeys/opie-sshkeys.control
@@ -1,2 +1,3 @@
+Package: opie-sshkeys
 Files: bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png
 Priority: optional
diff --git a/noncore/settings/sysinfo/opie-sysinfo.control b/noncore/settings/sysinfo/opie-sysinfo.control
index e0b9257..acb51e5 100644
--- a/noncore/settings/sysinfo/opie-sysinfo.control
+++ b/noncore/settings/sysinfo/opie-sysinfo.control
@@ -1,2 +1,3 @@
+Package: opie-sysinfo
 Files: bin/sysinfo apps/Settings/sysinfo.desktop pics/sysinfo
 Priority: optional
diff --git a/noncore/settings/tabmanager/opie-tabmanager.control b/noncore/settings/tabmanager/opie-tabmanager.control
index af12539..65b4702 100644
--- a/noncore/settings/tabmanager/opie-tabmanager.control
+++ b/noncore/settings/tabmanager/opie-tabmanager.control
@@ -1,2 +1,3 @@
+Package: opie-tabmanager
 Files: bin/tabmanager apps/Settings/tabmanager.desktop pics/tabmanager/tabmanager.png
 Priority: optional
diff --git a/noncore/settings/usermanager/opie-usermanager.control b/noncore/settings/usermanager/opie-usermanager.control
index 93ed9c3..9948dab 100644
--- a/noncore/settings/usermanager/opie-usermanager.control
+++ b/noncore/settings/usermanager/opie-usermanager.control
@@ -1,2 +1,3 @@
+Package: opie-usermanager
 Files: bin/usermanager apps/Settings/usermanager.desktop pics/usermanager/*
 Priority: optional
diff --git a/noncore/styles/flat/opie-style-flat.control b/noncore/styles/flat/opie-style-flat.control
index ef13d9c..97953d9 100644
--- a/noncore/styles/flat/opie-style-flat.control
+++ b/noncore/styles/flat/opie-style-flat.control
@@ -1,2 +1,3 @@
+Package: opie-style-flat
 Files: plugins/styles/libflatstyle.so*
 Priority: optional
diff --git a/noncore/styles/fresh/opie-style-fresh.control b/noncore/styles/fresh/opie-style-fresh.control
index c6f9bde..edcce64 100644
--- a/noncore/styles/fresh/opie-style-fresh.control
+++ b/noncore/styles/fresh/opie-style-fresh.control
@@ -1,2 +1,3 @@
+Package: opie-style-fresh
 Files: plugins/styles/libfreshstyle.so*
 Priority: optional
diff --git a/noncore/styles/liquid/opie-liquid.control b/noncore/styles/liquid/opie-liquid.control
index 89885d2..2701013 100644
--- a/noncore/styles/liquid/opie-liquid.control
+++ b/noncore/styles/liquid/opie-liquid.control
@@ -1,2 +1,3 @@
+Package: opie-liquid
 Files: plugins/styles/libliquid.so*
 Priority: optional
diff --git a/noncore/styles/metal/opie-metal.control b/noncore/styles/metal/opie-metal.control
index 640e5ac..5afb8b6 100644
--- a/noncore/styles/metal/opie-metal.control
+++ b/noncore/styles/metal/opie-metal.control
@@ -1,2 +1,3 @@
+Package: opie-metal
 Files: plugins/styles/libmetal.so* 
 Priority: optional
diff --git a/noncore/styles/theme/opie-theme-luna.control b/noncore/styles/theme/opie-theme-luna.control
index e094fb3..2b1f873 100644
--- a/noncore/styles/theme/opie-theme-luna.control
+++ b/noncore/styles/theme/opie-theme-luna.control
@@ -1,2 +1,3 @@
+Package: opie-theme-luna
 Files: plugins/styles/themes/luna.themerc plugins/styles/pixmaps/luna/*.png
 Priority: optional
diff --git a/noncore/styles/theme/opie-theme.control b/noncore/styles/theme/opie-theme.control
index 0f8f234..c658aad 100644
--- a/noncore/styles/theme/opie-theme.control
+++ b/noncore/styles/theme/opie-theme.control
@@ -1,2 +1,3 @@
+Package: opie-theme
 Files: plugins/styles/libtheme.so*
 Priority: optional
diff --git a/noncore/todayplugins/fortune/opie-today-fortuneplugin.control b/noncore/todayplugins/fortune/opie-today-fortuneplugin.control
index 0e10044..6737c35 100644
--- a/noncore/todayplugins/fortune/opie-today-fortuneplugin.control
+++ b/noncore/todayplugins/fortune/opie-today-fortuneplugin.control
@@ -1,2 +1,3 @@
+Package: opie-today-fortuneplugin
 Files: plugins/today/libtodayfortuneplugin.so*
 Priority: optional
diff --git a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
index 8ecd98b..a67949a 100644
--- a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
+++ b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
@@ -1,2 +1,3 @@
+Package: opie-today-stocktickerplugin
 Files: plugins/today/libtodaystocktickerplugin.so* bin/stockticker pics/stockticker/stockticker.png
 Priority: optional
diff --git a/noncore/todayplugins/weather/opie-today-weatherplugin.control b/noncore/todayplugins/weather/opie-today-weatherplugin.control
index 6e6a828..5b8937f 100644
--- a/noncore/todayplugins/weather/opie-today-weatherplugin.control
+++ b/noncore/todayplugins/weather/opie-today-weatherplugin.control
@@ -1,2 +1,3 @@
+Package: opie-today-weatherplugin
 Files: plugins/today/libtodayweatherplugin.so* pics/todayweatherplugin
 Priority: optional
diff --git a/noncore/tools/calculator/opie-calculator.control b/noncore/tools/calculator/opie-calculator.control
index 8add9a9..fbbe246 100644
--- a/noncore/tools/calculator/opie-calculator.control
+++ b/noncore/tools/calculator/opie-calculator.control
@@ -1,2 +1,3 @@
+Package: opie-calculator
 Files: bin/calculator apps/Applications/calculator.desktop etc/unit_conversion.dat pics/calc
 Priority: optional
diff --git a/noncore/tools/clock/opie-clock.control b/noncore/tools/clock/opie-clock.control
index e534fa8..09841ae 100644
--- a/noncore/tools/clock/opie-clock.control
+++ b/noncore/tools/clock/opie-clock.control
@@ -1,2 +1,3 @@
+Package: opie-clock
 Files: bin/clock apps/Applications/clock.desktop
 Priority: optional
diff --git a/noncore/tools/euroconv/opie-euroconv.control b/noncore/tools/euroconv/opie-euroconv.control
index 4ceb89a..44d6024 100644
--- a/noncore/tools/euroconv/opie-euroconv.control
+++ b/noncore/tools/euroconv/opie-euroconv.control
@@ -1,2 +1,3 @@
+Package: opie-euroconv
 Files: bin/euroconv pics/euroconv/* apps/Applications/euroconv.desktop
 Priority: optional
diff --git a/noncore/tools/formatter/opie-formatter.control b/noncore/tools/formatter/opie-formatter.control
index 7ee146c..6dfe318 100644
--- a/noncore/tools/formatter/opie-formatter.control
+++ b/noncore/tools/formatter/opie-formatter.control
@@ -1,2 +1,3 @@
+Package: opie-formatter
 Files: bin/formatter pics/formatter/devices.png apps/Settings/formatter.desktop
 Priority: optional
diff --git a/noncore/tools/opie-sh/opie-sh.control b/noncore/tools/opie-sh/opie-sh.control
index cb0b948..dc55b18 100644
--- a/noncore/tools/opie-sh/opie-sh.control
+++ b/noncore/tools/opie-sh/opie-sh.control
@@ -1,2 +1,3 @@
+Package: opie-sh
 Files: bin/opie-sh bin/opie-sh-howto.sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html
 Priority: optional
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control b/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control
index 9c3480f..ca424f6 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-diskfree.control
@@ -1,2 +1,3 @@
+Package: opie-sh-diskfree
 Files: bin/diskfree.sh apps/Opie-SH/diskfree.desktop pics/opie-sh-scripts/diskfree.png
 Installed-Size:  0
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control b/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control
index dd5a07a..26a2a44 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-fsmounter.control
@@ -1,2 +1,3 @@
+Package: opie-sh-fsmounter
 Files: bin/filesystem_mounter.sh pics/opie-sh-scripts/fsmounter.png apps/Opie-SH/filesystem_mounter.desktop
 Installed-Size:  0 
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control b/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control
index 67a4784..d529bb4 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-hostlist.control
@@ -1,2 +1,3 @@
+Package: opie-sh-hostlist
 Files: bin/hostlist.sh pics/opie-sh-scripts/hostlist.png apps/Opie-SH/hostlist.desktop share/config/hostlist.cfg
 Installed-Size:  0 
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-killproc.control b/noncore/tools/opie-sh/scripts/opie-sh-killproc.control
index 836d7c7..d63a135 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-killproc.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-killproc.control
@@ -1,2 +1,3 @@
+Package: opie-sh-killproc
 Files: bin/killproc.sh apps/Opie-SH/killproc.desktop pics/opie-sh-scripts/killproc.png
 Installed-Size:  0 
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control b/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control
index 51d1618..8b9dfb2 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-launcher-refresh.control
@@ -1,2 +1,3 @@
+Package: opie-sh-launcher-refresh
 Files: bin/launcher_refresh.sh pics/opie-sh-scripts/launcher_refresh.png apps/Opie-SH/launcher_refresh.desktop
 Installed-Size:  0
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control b/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control
index ea14c5a..3cb5172 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-logviewer.control
@@ -1,2 +1,3 @@
+Package: opie-sh-logviewer
 Files: bin/logviewer.sh apps/Opie-SH/logviewer.desktop pics/opie-sh-scripts/logviewer.png
 Installed-Size:  0 
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control b/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control
index dd5c394..f9f03cd 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-rsynchelper.control
@@ -1,2 +1,3 @@
+Package: opie-sh-rsynchelper
 Files: bin/rsyncme.sh apps/Opie-SH/rsyncme.desktop pics/opie-sh-scripts/rsyncme.png share/config/rsyncme.cfg
 Installed-Size:  0 
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control b/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control
index 952cbb2..639511d 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-servicemanager.control
@@ -1,2 +1,3 @@
+Package: opie-sh-servicemanager
 Files: bin/service_manager.sh apps/Opie-SH/service_manager.desktop pics/opie-sh-scripts/service_manager.png
 Installed-Size:  0
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control b/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control
index 755d46c..c89a9a7 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.control
@@ -1,2 +1,3 @@
+Package: opie-sh-ssh-askpass
 Files: bin/opie-sh-ssh-askpass.sh
 Installed-Size:  0 
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control b/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control
index 95fb17a..ce158e1 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-stowawayctrl.control
@@ -1,2 +1,3 @@
+Package: opie-sh-stowawayctrl
 Files: bin/stowctrl.sh apps/Opie-SH/stowctrl.desktop pics/opie-sh-scripts/stowctrl.png
 Installed-Size:  0 
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control b/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control
index eb7cd6f..0e7315f 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-usbnetctrl.control
@@ -1,2 +1,3 @@
+Package: opie-sh-usbnetctrl
 Files: bin/usbnetctrl.sh apps/Opie-SH/usbnetctrl.desktop pics/opie-sh-scripts/usbnetctrl.png
 Installed-Size:  0 
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control b/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control
index 0597253..5f19a16 100644
--- a/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control
+++ b/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control
@@ -1,2 +1,3 @@
+Package: opie-sh-wavelanchooser
 Files: bin/opie-sh-wavelanchooser.sh apps/Opie-SH/opie-sh-wavelanchooser.desktop pics/opie-sh-scripts/qtwavelan.png
 Installed-Size:  0 
diff --git a/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control b/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control
index 5a4a471..d687a1f 100644
--- a/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control
+++ b/noncore/tools/opie-sh/scripts/task-opie-sh-apps.control
@@ -1,2 +1,3 @@
+Package: task-opie-sh-apps
 Files:
 Installed-Size:  0 
diff --git a/noncore/tools/remote/opie-remote.control b/noncore/tools/remote/opie-remote.control
index 07614a5..4685c71 100644
--- a/noncore/tools/remote/opie-remote.control
+++ b/noncore/tools/remote/opie-remote.control
@@ -1,2 +1,3 @@
+Package: opie-remote
 Files: bin/remote apps/Applications/remote.desktop pics/remote/*.png
 Priority: optional
diff --git a/noncore/unsupported/filebrowser/opie-filebrowser.control b/noncore/unsupported/filebrowser/opie-filebrowser.control
index 37a98c1..3d35620 100644
--- a/noncore/unsupported/filebrowser/opie-filebrowser.control
+++ b/noncore/unsupported/filebrowser/opie-filebrowser.control
@@ -1,2 +1,3 @@
+Package: opie-filebrowser
 Files: bin/filebrowser apps/Applications/filebrowser.desktop pics/filebrowser/
 Priority: optional
diff --git a/noncore/unsupported/gsmtool/opie-gsmtool.control b/noncore/unsupported/gsmtool/opie-gsmtool.control
index e2008a9..6d00720 100644
--- a/noncore/unsupported/gsmtool/opie-gsmtool.control
+++ b/noncore/unsupported/gsmtool/opie-gsmtool.control
@@ -1,2 +1,3 @@
+Package: opie-gsmtool
 Files: bin/gsmtool apps/Applications/gsmtool.desktop pics/gsmtool
 Priority: optional
diff --git a/noncore/unsupported/mail2/bend/opie-mailapplet.control b/noncore/unsupported/mail2/bend/opie-mailapplet.control
index 974ea80..e5d3c6e 100644
--- a/noncore/unsupported/mail2/bend/opie-mailapplet.control
+++ b/noncore/unsupported/mail2/bend/opie-mailapplet.control
@@ -1,2 +1,3 @@
+Package: opie-mailapplet
 Files: plugins/applets/libbend.so*
 Priority: optional
diff --git a/noncore/unsupported/mail2/opie-mail2.control b/noncore/unsupported/mail2/opie-mail2.control
index db3a082..7f8aeb6 100644
--- a/noncore/unsupported/mail2/opie-mail2.control
+++ b/noncore/unsupported/mail2/opie-mail2.control
@@ -1,2 +1,3 @@
+Package: opie-mail2
 Files: bin/mail $OPIEDIR/lib/libmail.so* apps/1Pim/mail.desktop pics/mail/*.png sounds/mail/*.wav
 Priority: optional
diff --git a/noncore/unsupported/mailit/opie-mailit.control b/noncore/unsupported/mailit/opie-mailit.control
index de3f873..65b5b36 100644
--- a/noncore/unsupported/mailit/opie-mailit.control
+++ b/noncore/unsupported/mailit/opie-mailit.control
@@ -1,2 +1,3 @@
+Package: opie-mailit
 Files: bin/mailit apps/1Pim/mailit.desktop pics/mailit
 Priority: optional
diff --git a/noncore/unsupported/oipkg/opie-oipkg.control b/noncore/unsupported/oipkg/opie-oipkg.control
index 7616754..17e7049 100644
--- a/noncore/unsupported/oipkg/opie-oipkg.control
+++ b/noncore/unsupported/oipkg/opie-oipkg.control
@@ -1,2 +1,3 @@
+Package: opie-oipkg
 Files: bin/oipkg apps/Settings/oipkg.desktop pics/oipkg/*
 Priority: optional
diff --git a/noncore/unsupported/qpdf/opie-qpdf.control b/noncore/unsupported/qpdf/opie-qpdf.control
index 83a677b..33df3e1 100644
--- a/noncore/unsupported/qpdf/opie-qpdf.control
+++ b/noncore/unsupported/qpdf/opie-qpdf.control
@@ -1,2 +1,3 @@
+Package: opie-qpdf
 Files: bin/qpdf apps/Applications/qpdf.desktop pics/qpdf/qpdf_icon.png
 Priority: optional
diff --git a/pics/opie-pics.control b/pics/opie-pics.control
index 178b5ce..bb9e7b9 100644
--- a/pics/opie-pics.control
+++ b/pics/opie-pics.control
@@ -1,2 +1,3 @@
+Package: opie-pics
 Files: pics/??*.* pics/opie/*
 Priority: required
diff --git a/qt/control/libqte2.control b/qt/control/libqte2.control
index 30c79c9..0925d5f 100644
--- a/qt/control/libqte2.control
+++ b/qt/control/libqte2.control
@@ -1,2 +1,3 @@
+Package: libqte2
 Files: $QTDIR/lib/libqte.so.$QTE_BASEVERSION $QTDIR/lib/libqte.so.2.3 $QTDIR/lib/libqte.so.2
 Priority: required
diff --git a/qt/control/qpf-cyberbit-120-50-t10.control b/qt/control/qpf-cyberbit-120-50-t10.control
index 9ed33cf..47cb213 100644
--- a/qt/control/qpf-cyberbit-120-50-t10.control
+++ b/qt/control/qpf-cyberbit-120-50-t10.control
@@ -1,2 +1,3 @@
+Package: qpf-cyberbit-120-50-t10
 Files: $QTDIR/lib/fonts/cyberbit_120_50_t10.qpf
 Priority: required
diff --git a/qt/control/qte-fonts.control b/qt/control/qte-fonts.control
index 2786a2d..332dbfa 100644
--- a/qt/control/qte-fonts.control
+++ b/qt/control/qte-fonts.control
@@ -1,2 +1,3 @@
+Package: qte-fonts
 Files: $QTDIR/lib/fonts/helvetica_*_{50,50i,75,75i}.* $QTDIR/lib/fonts/helvetica_*_t*5* $QTDIR/lib/fonts/fixed_*_50.* $QTDIR/lib/fonts/fixed_*_t*5* $QTDIR/lib/fonts/micro_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smallsmooth_*{50,50_t15,50_t5}.* $QTDIR/lib/fonts/smoothtimes_{170,100}_{50,50_t15,50_t5}.* $QTDIR/lib/fonts/fontdir $QTDIR/lib/fonts/helvetica_*t10* $QTDIR/lib/fonts/fixed_*t10* $QTDIR/lib/fonts/micro_*t10* $QTDIR/lib/fonts/smallsmooth_*t10* $QTDIR/lib/fonts/smoothtimes_{170,100}_50*t10* $QTDIR/bin/update-qtfontdir
 Priority: required
diff --git a/quickexec/opie-quickexec.control b/quickexec/opie-quickexec.control
index 13f185d..118a4da 100644
--- a/quickexec/opie-quickexec.control
+++ b/quickexec/opie-quickexec.control
@@ -1,2 +1,3 @@
+Package: opie-quickexec
 Files: bin/quickexec
 Priority: required
diff --git a/root/opie-windows2000-ppp-scripts.control b/root/opie-windows2000-ppp-scripts.control
index cdd671c..b77367a 100644
--- a/root/opie-windows2000-ppp-scripts.control
+++ b/root/opie-windows2000-ppp-scripts.control
@@ -1,2 +1,3 @@
+Package: opie-windows2000-ppp-scripts
 Files: root/etc/hosts ipaq/etc/inittab ipaq/etc/ppp
 Priority: optional
diff --git a/root/ptydevs.control b/root/ptydevs.control
index 45b3b6d..6cfad72 100644
--- a/root/ptydevs.control
+++ b/root/ptydevs.control
@@ -1,2 +1,3 @@
+Package: ptydevs
 Files: root/dev
 Priority: optional
diff --git a/root/timezones.control b/root/timezones.control
index 43a1579..8002370 100644
--- a/root/timezones.control
+++ b/root/timezones.control
@@ -1,2 +1,3 @@
+Package: timezones
 Files: root/usr/share/zoneinfo
 Priority: optional
diff --git a/scripts/remove/opie-remove.control b/scripts/remove/opie-remove.control
index cb4a406..162b2c0 100644
--- a/scripts/remove/opie-remove.control
+++ b/scripts/remove/opie-remove.control
@@ -1,2 +1,3 @@
+Package: opie-remove
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Section: opie/system
diff --git a/scripts/remove/qpe-remove.control b/scripts/remove/qpe-remove.control
index b1f002d..f38ee28 100644
--- a/scripts/remove/qpe-remove.control
+++ b/scripts/remove/qpe-remove.control
@@ -1,2 +1,3 @@
+Package: qpe-remove
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Section: opie/system
diff --git a/scripts/update/opie-update.control b/scripts/update/opie-update.control
index a2f5e97..6a9e697 100644
--- a/scripts/update/opie-update.control
+++ b/scripts/update/opie-update.control
@@ -1,2 +1,3 @@
+Package: opie-update
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Section: opie/system
diff --git a/scripts/update/qpe-opie-update.control b/scripts/update/qpe-opie-update.control
index 81a5370..f58bab9 100644
--- a/scripts/update/qpe-opie-update.control
+++ b/scripts/update/qpe-opie-update.control
@@ -1,2 +1,3 @@
+Package: qpe-opie-update
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Section: opie/system
diff --git a/sounds/opie-sounds.control b/sounds/opie-sounds.control
index 63728f1..cb4d84e 100644
--- a/sounds/opie-sounds.control
+++ b/sounds/opie-sounds.control
@@ -1,2 +1,3 @@
+Package: opie-sounds
 Files: sounds/*.wav
 Priority: required