summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/gpe-bluetooth/files/.mtn2git_empty (renamed from packages/opie-packagemanager/files/.mtn2git_empty)0
-rw-r--r--packages/gpe-bluetooth/files/bluez-pin-gpe.glade182
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth_0.45.bb11
-rw-r--r--packages/libmailwrapper/libmailwrapper_1.2.1.bb (renamed from packages/libmailwrapper/libmailwrapper_1.2.0.bb)1
-rw-r--r--packages/libmailwrapper/libmailwrapper_cvs.bb3
-rw-r--r--packages/libopie/libopie2.inc6
-rw-r--r--packages/libopie/libopie2_1.2.1.bb (renamed from packages/libopie/libopie2_1.2.0.bb)1
-rw-r--r--packages/libopie/libopie2_cvs.bb7
-rw-r--r--packages/libopieobex/chdir-patch.patch23
-rw-r--r--packages/libopieobex/libopieobex0_1.2.0.bb7
-rw-r--r--packages/libopieobex/libopieobex0_1.2.1.bb5
-rw-r--r--packages/libopieobex/libopieobex0_cvs.bb3
-rw-r--r--packages/libopietooth/libopietooth1.inc22
-rw-r--r--packages/libopietooth/libopietooth1_1.2.1.bb (renamed from packages/libopietooth/libopietooth1_1.2.0.bb)0
-rw-r--r--packages/libopietooth/libopietooth1_cvs.bb2
-rw-r--r--packages/libqanava/libqanava_0.0.3.bb1
-rw-r--r--packages/libqpe/libqpe-opie/0905_datebookmonth.patch23
-rw-r--r--packages/libqpe/libqpe-opie/fix-nomax.patch16
-rw-r--r--packages/libqpe/libqpe-opie_1.2.1.bb (renamed from packages/libqpe/libqpe-opie_1.2.0.bb)3
-rw-r--r--packages/libqpe/libqpe-opie_cvs.bb3
-rw-r--r--packages/libqtaux/libqtaux2_1.2.1.bb (renamed from packages/libqtaux/libqtaux2_1.2.0.bb)1
-rw-r--r--packages/libqtaux/libqtaux2_cvs.bb3
-rw-r--r--packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-tosa612
-rw-r--r--packages/linux/linux-openzaurus_2.6.13-mm1.bb82
-rw-r--r--packages/linux/triton-kernel_2.6.11.bb6
-rw-r--r--packages/lyx/lyx_1.3.6.bb2
-rw-r--r--packages/opie-aboutapplet/opie-aboutapplet_1.2.1.bb (renamed from packages/opie-aboutapplet/opie-aboutapplet_1.2.0.bb)1
-rw-r--r--packages/opie-aboutapplet/opie-aboutapplet_cvs.bb3
-rw-r--r--packages/opie-addressbook/opie-addressbook_1.2.1.bb (renamed from packages/opie-addressbook/opie-addressbook_1.2.0.bb)1
-rw-r--r--packages/opie-addressbook/opie-addressbook_cvs.bb3
-rw-r--r--packages/opie-advancedfm/opie-advancedfm_1.2.1.bb (renamed from packages/opie-advancedfm/opie-advancedfm_1.2.0.bb)1
-rw-r--r--packages/opie-advancedfm/opie-advancedfm_cvs.bb3
-rw-r--r--packages/opie-alarm/opie-alarm_1.2.1.bb (renamed from packages/opie-alarm/opie-alarm_1.2.0.bb)1
-rw-r--r--packages/opie-alarm/opie-alarm_cvs.bb3
-rw-r--r--packages/opie-appearance/opie-appearance_1.2.1.bb (renamed from packages/opie-appearance/opie-appearance_1.2.0.bb)1
-rw-r--r--packages/opie-appearance/opie-appearance_cvs.bb3
-rw-r--r--packages/opie-aqpkg/opie-aqpkg_1.2.1.bb (renamed from packages/opie-aqpkg/opie-aqpkg_1.2.0.bb)1
-rw-r--r--packages/opie-aqpkg/opie-aqpkg_cvs.bb3
-rw-r--r--packages/opie-autorotateapplet/opie-autorotateapplet_1.2.1.bb (renamed from packages/opie-autorotateapplet/opie-autorotateapplet_1.2.0.bb)1
-rw-r--r--packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb3
-rw-r--r--packages/opie-backgammon/opie-backgammon_1.2.1.bb (renamed from packages/opie-backgammon/opie-backgammon_1.2.0.bb)1
-rw-r--r--packages/opie-backgammon/opie-backgammon_cvs.bb3
-rw-r--r--packages/opie-backup/opie-backup_1.2.1.bb (renamed from packages/opie-backup/opie-backup_1.2.0.bb)1
-rw-r--r--packages/opie-backup/opie-backup_cvs.bb3
-rw-r--r--packages/opie-bartender/opie-bartender_1.2.1.bb (renamed from packages/opie-bartender/opie-bartender_1.2.0.bb)1
-rw-r--r--packages/opie-bartender/opie-bartender_cvs.bb3
-rw-r--r--packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb (renamed from packages/opie-batteryapplet/opie-batteryapplet_1.2.0.bb)1
-rw-r--r--packages/opie-batteryapplet/opie-batteryapplet_cvs.bb3
-rw-r--r--packages/opie-bluepin/opie-bluepin_1.2.1.bb (renamed from packages/opie-bluepin/opie-bluepin_1.2.0.bb)1
-rw-r--r--packages/opie-bluepin/opie-bluepin_cvs.bb3
-rw-r--r--packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.1.bb (renamed from packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.0.bb)1
-rw-r--r--packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb3
-rw-r--r--packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb (renamed from packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.0.bb)1
-rw-r--r--packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb3
-rw-r--r--packages/opie-bounce/opie-bounce_1.2.1.bb (renamed from packages/opie-bounce/opie-bounce_1.2.0.bb)1
-rw-r--r--packages/opie-bounce/opie-bounce_cvs.bb3
-rw-r--r--packages/opie-brightnessapplet/opie-brightnessapplet_1.2.1.bb (renamed from packages/opie-brightnessapplet/opie-brightnessapplet_1.2.0.bb)1
-rw-r--r--packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb3
-rw-r--r--packages/opie-button-settings/opie-button-settings_1.2.1.bb (renamed from packages/opie-button-settings/opie-button-settings_1.2.0.bb)1
-rw-r--r--packages/opie-button-settings/opie-button-settings_cvs.bb3
-rw-r--r--packages/opie-buzzword/opie-buzzword_1.2.1.bb (renamed from packages/opie-buzzword/opie-buzzword_1.2.0.bb)1
-rw-r--r--packages/opie-buzzword/opie-buzzword_cvs.bb3
-rw-r--r--packages/opie-calculator/opie-calculator_1.2.1.bb (renamed from packages/opie-calculator/opie-calculator_1.2.0.bb)1
-rw-r--r--packages/opie-calculator/opie-calculator_cvs.bb3
-rw-r--r--packages/opie-calibrate/opie-calibrate_1.2.1.bb (renamed from packages/opie-calibrate/opie-calibrate_1.2.0.bb)1
-rw-r--r--packages/opie-calibrate/opie-calibrate_cvs.bb3
-rw-r--r--packages/opie-camera/opie-camera_1.2.1.bb (renamed from packages/opie-camera/opie-camera_1.2.0.bb)1
-rw-r--r--packages/opie-camera/opie-camera_cvs.bb3
-rw-r--r--packages/opie-cardmon/opie-cardmon_1.2.1.bb (renamed from packages/opie-cardmon/opie-cardmon_1.2.0.bb)1
-rw-r--r--packages/opie-cardmon/opie-cardmon_cvs.bb3
-rw-r--r--packages/opie-checkbook/opie-checkbook_1.2.1.bb (renamed from packages/opie-checkbook/opie-checkbook_1.2.0.bb)1
-rw-r--r--packages/opie-checkbook/opie-checkbook_cvs.bb3
-rw-r--r--packages/opie-citytime/opie-citytime_1.2.1.bb (renamed from packages/opie-citytime/opie-citytime_1.2.0.bb)1
-rw-r--r--packages/opie-citytime/opie-citytime_cvs.bb3
-rw-r--r--packages/opie-clipboardapplet/opie-clipboardapplet_1.2.1.bb (renamed from packages/opie-clipboardapplet/opie-clipboardapplet_1.2.0.bb)1
-rw-r--r--packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb3
-rw-r--r--packages/opie-clock/opie-clock_1.2.1.bb (renamed from packages/opie-clock/opie-clock_1.2.0.bb)1
-rw-r--r--packages/opie-clock/opie-clock_cvs.bb3
-rw-r--r--packages/opie-clockapplet/opie-clockapplet_1.2.1.bb (renamed from packages/opie-clockapplet/opie-clockapplet_1.2.0.bb)1
-rw-r--r--packages/opie-clockapplet/opie-clockapplet_cvs.bb3
-rw-r--r--packages/opie-confeditor/opie-confeditor_1.2.1.bb (renamed from packages/opie-confeditor/opie-confeditor_1.2.0.bb)1
-rw-r--r--packages/opie-confeditor/opie-confeditor_cvs.bb3
-rw-r--r--packages/opie-console/opie-console_1.2.1.bb (renamed from packages/opie-console/opie-console_1.2.0.bb)1
-rw-r--r--packages/opie-console/opie-console_cvs.bb3
-rw-r--r--packages/opie-dagger/opie-dagger_1.2.1.bb (renamed from packages/opie-dagger/opie-dagger_1.2.0.bb)1
-rw-r--r--packages/opie-dagger/opie-dagger_cvs.bb3
-rw-r--r--packages/opie-dasher/opie-dasher_1.2.1.bb (renamed from packages/opie-dasher/opie-dasher_1.2.0.bb)1
-rw-r--r--packages/opie-dasher/opie-dasher_cvs.bb3
-rw-r--r--packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.1.bb (renamed from packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.0.bb)1
-rw-r--r--packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb3
-rw-r--r--packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.1.bb (renamed from packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.0.bb)1
-rw-r--r--packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb3
-rw-r--r--packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.1.bb (renamed from packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.0.bb)1
-rw-r--r--packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb3
-rw-r--r--packages/opie-datebook/opie-datebook_1.2.1.bb (renamed from packages/opie-datebook/opie-datebook_1.2.0.bb)1
-rw-r--r--packages/opie-datebook/opie-datebook_cvs.bb3
-rw-r--r--packages/opie-deco-flat/opie-deco-flat_1.2.1.bb (renamed from packages/opie-deco-flat/opie-deco-flat_1.2.0.bb)1
-rw-r--r--packages/opie-deco-flat/opie-deco-flat_cvs.bb3
-rw-r--r--packages/opie-deco-liquid/opie-deco-liquid_1.2.1.bb (renamed from packages/opie-deco-liquid/opie-deco-liquid_1.2.0.bb)1
-rw-r--r--packages/opie-deco-liquid/opie-deco-liquid_cvs.bb3
-rw-r--r--packages/opie-deco-polished/opie-deco-polished_1.2.1.bb (renamed from packages/opie-deco-polished/opie-deco-polished_1.2.0.bb)1
-rw-r--r--packages/opie-deco-polished/opie-deco-polished_cvs.bb3
-rw-r--r--packages/opie-doctab/opie-doctab_1.2.1.bb (renamed from packages/opie-doctab/opie-doctab_1.2.0.bb)1
-rw-r--r--packages/opie-doctab/opie-doctab_cvs.bb3
-rw-r--r--packages/opie-drawpad/opie-drawpad_1.2.1.bb (renamed from packages/opie-drawpad/opie-drawpad_1.2.0.bb)1
-rw-r--r--packages/opie-drawpad/opie-drawpad_cvs.bb3
-rw-r--r--packages/opie-dvorak/opie-dvorak_1.2.1.bb (renamed from packages/opie-dvorak/opie-dvorak_1.2.0.bb)1
-rw-r--r--packages/opie-dvorak/opie-dvorak_cvs.bb3
-rw-r--r--packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.1.bb (renamed from packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.0.bb)1
-rw-r--r--packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb3
-rw-r--r--packages/opie-euroconv/opie-euroconv_1.2.1.bb (renamed from packages/opie-euroconv/opie-euroconv_1.2.0.bb)1
-rw-r--r--packages/opie-euroconv/opie-euroconv_cvs.bb3
-rw-r--r--packages/opie-examples-python/opie-examples-python_1.2.1.bb (renamed from packages/opie-examples-python/opie-examples-python_1.2.0.bb)1
-rw-r--r--packages/opie-examples-python/opie-examples-python_cvs.bb3
-rw-r--r--packages/opie-examples/opie-examples_1.2.1.bb (renamed from packages/opie-examples/opie-examples_1.2.0.bb)1
-rw-r--r--packages/opie-examples/opie-examples_cvs.bb3
-rw-r--r--packages/opie-eye/opie-eye_1.2.1.bb (renamed from packages/opie-eye/opie-eye_1.2.0.bb)1
-rw-r--r--packages/opie-eye/opie-eye_cvs.bb3
-rw-r--r--packages/opie-fifteen/opie-fifteen_1.2.1.bb (renamed from packages/opie-fifteen/opie-fifteen_1.2.0.bb)1
-rw-r--r--packages/opie-fifteen/opie-fifteen_cvs.bb3
-rw-r--r--packages/opie-formatter/opie-formatter_1.2.1.bb (renamed from packages/opie-formatter/opie-formatter_1.2.0.bb)1
-rw-r--r--packages/opie-formatter/opie-formatter_cvs.bb3
-rw-r--r--packages/opie-freetype/opie-freetype_1.2.1.bb (renamed from packages/opie-freetype/opie-freetype_1.2.0.bb)1
-rw-r--r--packages/opie-freetype/opie-freetype_cvs.bb3
-rw-r--r--packages/opie-ftp/opie-ftp_1.2.1.bb (renamed from packages/opie-ftp/opie-ftp_1.2.0.bb)1
-rw-r--r--packages/opie-ftp/opie-ftp_cvs.bb3
-rw-r--r--packages/opie-ftplib/opie-ftplib_1.2.1.bb (renamed from packages/opie-ftplib/opie-ftplib_1.2.0.bb)1
-rw-r--r--packages/opie-ftplib/opie-ftplib_cvs.bb3
-rw-r--r--packages/opie-go/opie-go_1.2.1.bb (renamed from packages/opie-go/opie-go_1.2.0.bb)1
-rw-r--r--packages/opie-go/opie-go_cvs.bb3
-rw-r--r--packages/opie-gutenbrowser/opie-gutenbrowser_1.2.1.bb (renamed from packages/opie-gutenbrowser/opie-gutenbrowser_1.2.0.bb)1
-rw-r--r--packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb3
-rw-r--r--packages/opie-handwriting/opie-handwriting_1.2.1.bb (renamed from packages/opie-handwriting/opie-handwriting_1.2.0.bb)1
-rw-r--r--packages/opie-handwriting/opie-handwriting_cvs.bb3
-rw-r--r--packages/opie-help-en/opie-help-en_1.2.1.bb (renamed from packages/opie-help-en/opie-help-en_1.2.0.bb)1
-rw-r--r--packages/opie-help-en/opie-help-en_cvs.bb3
-rw-r--r--packages/opie-helpbrowser/opie-helpbrowser_1.2.1.bb (renamed from packages/opie-textedit/opie-textedit_1.2.0.bb)1
-rw-r--r--packages/opie-helpbrowser/opie-helpbrowser_cvs.bb3
-rw-r--r--packages/opie-homeapplet/opie-homeapplet_1.2.1.bb (renamed from packages/opie-homeapplet/opie-homeapplet_1.2.0.bb)1
-rw-r--r--packages/opie-homeapplet/opie-homeapplet_cvs.bb3
-rw-r--r--packages/opie-i18n/opie-i18n_1.2.1.bb (renamed from packages/opie-i18n/opie-i18n_1.2.0.bb)1
-rw-r--r--packages/opie-i18n/opie-i18n_cvs.bb3
-rw-r--r--packages/opie-i18n/opie-lrelease-native_1.2.1.bb (renamed from packages/opie-i18n/opie-lrelease-native_1.2.0.bb)0
-rw-r--r--packages/opie-i18n/opie-lrelease-native_cvs.bb2
-rw-r--r--packages/opie-i18n/opie-lupdate-native_1.2.1.bb (renamed from packages/opie-i18n/opie-lupdate-native_1.2.0.bb)0
-rw-r--r--packages/opie-i18n/opie-lupdate-native_cvs.bb2
-rw-r--r--packages/opie-icon-reload/opie-icon-reload_1.2.1.bb (renamed from packages/opie-icon-reload/opie-icon-reload_1.2.0.bb)1
-rw-r--r--packages/opie-icon-reload/opie-icon-reload_cvs.bb3
-rw-r--r--packages/opie-irc/opie-irc_1.2.1.bb (renamed from packages/opie-irc/opie-irc_1.2.0.bb)1
-rw-r--r--packages/opie-irc/opie-irc_cvs.bb3
-rw-r--r--packages/opie-irdaapplet/opie-irdaapplet_1.2.1.bb (renamed from packages/opie-irdaapplet/opie-irdaapplet_1.2.0.bb)1
-rw-r--r--packages/opie-irdaapplet/opie-irdaapplet_cvs.bb3
-rw-r--r--packages/opie-jumpx/opie-jumpx_1.2.1.bb (renamed from packages/opie-jumpx/opie-jumpx_1.2.0.bb)1
-rw-r--r--packages/opie-jumpx/opie-jumpx_cvs.bb3
-rw-r--r--packages/opie-kbill/opie-kbill_1.2.1.bb (renamed from packages/opie-kbill/opie-kbill_1.2.0.bb)1
-rw-r--r--packages/opie-kbill/opie-kbill_cvs.bb3
-rw-r--r--packages/opie-kcheckers/opie-kcheckers_1.2.1.bb (renamed from packages/opie-kcheckers/opie-kcheckers_1.2.0.bb)1
-rw-r--r--packages/opie-kcheckers/opie-kcheckers_cvs.bb3
-rw-r--r--packages/opie-keyboard/opie-keyboard_1.2.1.bb (renamed from packages/opie-keyboard/opie-keyboard_1.2.0.bb)1
-rw-r--r--packages/opie-keyboard/opie-keyboard_cvs.bb3
-rw-r--r--packages/opie-keypebble/opie-keypebble_1.2.1.bb (renamed from packages/opie-keypebble/opie-keypebble_1.2.0.bb)1
-rw-r--r--packages/opie-keypebble/opie-keypebble_cvs.bb3
-rw-r--r--packages/opie-keytabs/opie-keytabs_1.2.1.bb (renamed from packages/opie-keytabs/opie-keytabs_1.2.0.bb)1
-rw-r--r--packages/opie-keytabs/opie-keytabs_cvs.bb3
-rw-r--r--packages/opie-keyview/opie-keyview_1.2.1.bb (renamed from packages/opie-keyview/opie-keyview_1.2.0.bb)1
-rw-r--r--packages/opie-keyview/opie-keyview_cvs.bb3
-rw-r--r--packages/opie-kjumpx/opie-kjumpx_1.2.1.bb (renamed from packages/opie-kjumpx/opie-kjumpx_1.2.0.bb)1
-rw-r--r--packages/opie-kjumpx/opie-kjumpx_cvs.bb3
-rw-r--r--packages/opie-kpacman/opie-kpacman_1.2.1.bb (renamed from packages/opie-kpacman/opie-kpacman_1.2.0.bb)1
-rw-r--r--packages/opie-kpacman/opie-kpacman_cvs.bb3
-rw-r--r--packages/opie-language/opie-language_1.2.1.bb (renamed from packages/opie-language/opie-language_1.2.0.bb)1
-rw-r--r--packages/opie-language/opie-language_cvs.bb3
-rw-r--r--packages/opie-launcher-settings/opie-launcher-settings_1.2.1.bb (renamed from packages/opie-launcher-settings/opie-launcher-settings_1.2.0.bb)1
-rw-r--r--packages/opie-launcher-settings/opie-launcher-settings_cvs.bb3
-rw-r--r--packages/opie-libqrsync/opie-libqrsync_1.2.1.bb (renamed from packages/opie-libqrsync/opie-libqrsync_1.2.0.bb)1
-rw-r--r--packages/opie-libqrsync/opie-libqrsync_cvs.bb3
-rw-r--r--packages/opie-light-and-power/opie-light-and-power_1.2.1.bb (renamed from packages/opie-light-and-power/opie-light-and-power_1.2.0.bb)1
-rw-r--r--packages/opie-light-and-power/opie-light-and-power_cvs.bb3
-rw-r--r--packages/opie-lockapplet/opie-lockapplet_1.2.1.bb (renamed from packages/opie-lockapplet/opie-lockapplet_1.2.0.bb)1
-rw-r--r--packages/opie-lockapplet/opie-lockapplet_cvs.bb3
-rw-r--r--packages/opie-login/opie-login_1.2.1.bb (renamed from packages/opie-login/opie-login_1.2.0.bb)1
-rw-r--r--packages/opie-login/opie-login_cvs.bb3
-rw-r--r--packages/opie-logoutapplet/opie-logoutapplet_1.2.1.bb (renamed from packages/opie-logoutapplet/opie-logoutapplet_1.2.0.bb)1
-rw-r--r--packages/opie-logoutapplet/opie-logoutapplet_cvs.bb3
-rw-r--r--packages/opie-mail/opie-mail_1.2.1.bb (renamed from packages/opie-mail/opie-mail_1.2.0.bb)1
-rw-r--r--packages/opie-mail/opie-mail_cvs.bb3
-rw-r--r--packages/opie-mailapplet/opie-mailapplet_1.2.1.bb (renamed from packages/opie-mailapplet/opie-mailapplet_1.2.0.bb)1
-rw-r--r--packages/opie-mailapplet/opie-mailapplet_cvs.bb3
-rw-r--r--packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.1.bb (renamed from packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.0.bb)1
-rw-r--r--packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb3
-rw-r--r--packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.1.bb (renamed from packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.0.bb)1
-rw-r--r--packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb3
-rw-r--r--packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.1.bb (renamed from packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.0.bb)1
-rw-r--r--packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb3
-rw-r--r--packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.1.bb (renamed from packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.0.bb)1
-rw-r--r--packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb3
-rw-r--r--packages/opie-mediaplayer1/opie-mediaplayer1_1.2.1.bb (renamed from packages/opie-mediaplayer1/opie-mediaplayer1_1.2.0.bb)5
-rw-r--r--packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb3
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.1.bb (renamed from packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.0.bb)0
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb2
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.1.bb (renamed from packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.0.bb)0
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb2
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.1.bb (renamed from packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.0.bb)0
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb2
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.1.bb (renamed from packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.0.bb)0
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb2
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb8
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb6
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb3
-rw-r--r--packages/opie-mediummount/opie-mediummount_1.2.1.bb (renamed from packages/opie-mediummount/opie-mediummount_1.2.0.bb)1
-rw-r--r--packages/opie-mediummount/opie-mediummount_cvs.bb3
-rw-r--r--packages/opie-memoryapplet/opie-memoryapplet_1.2.1.bb (renamed from packages/opie-memoryapplet/opie-memoryapplet_1.2.0.bb)1
-rw-r--r--packages/opie-memoryapplet/opie-memoryapplet_cvs.bb3
-rw-r--r--packages/opie-mindbreaker/opie-mindbreaker_1.2.1.bb (renamed from packages/opie-mindbreaker/opie-mindbreaker_1.2.0.bb)1
-rw-r--r--packages/opie-mindbreaker/opie-mindbreaker_cvs.bb3
-rw-r--r--packages/opie-minesweep/opie-minesweep_1.2.1.bb (renamed from packages/opie-minesweep/opie-minesweep_1.2.0.bb)1
-rw-r--r--packages/opie-minesweep/opie-minesweep_cvs.bb3
-rw-r--r--packages/opie-multikey/opie-multikey_1.2.1.bb (renamed from packages/opie-multikey/opie-multikey_1.2.0.bb)1
-rw-r--r--packages/opie-multikey/opie-multikey_cvs.bb3
-rw-r--r--packages/opie-multikeyapplet/opie-multikeyapplet_1.2.1.bb (renamed from packages/opie-multikeyapplet/opie-multikeyapplet_1.2.0.bb)1
-rw-r--r--packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb3
-rw-r--r--packages/opie-networkapplet/opie-networkapplet_1.2.1.bb (renamed from packages/opie-networkapplet/opie-networkapplet_1.2.0.bb)1
-rw-r--r--packages/opie-networkapplet/opie-networkapplet_cvs.bb3
-rw-r--r--packages/opie-networksettings/opie-networksettings_1.2.1.bb (renamed from packages/opie-networksettings/opie-networksettings_1.2.0.bb)1
-rw-r--r--packages/opie-networksettings/opie-networksettings_cvs.bb3
-rw-r--r--packages/opie-notesapplet/opie-notesapplet_1.2.1.bb (renamed from packages/opie-notesapplet/opie-notesapplet_1.2.0.bb)1
-rw-r--r--packages/opie-notesapplet/opie-notesapplet_cvs.bb3
-rw-r--r--packages/opie-odict/opie-odict_1.2.1.bb (renamed from packages/opie-odict/opie-odict_1.2.0.bb)1
-rw-r--r--packages/opie-odict/opie-odict_cvs.bb3
-rw-r--r--packages/opie-oxygen/opie-oxygen_1.2.1.bb (renamed from packages/opie-oxygen/opie-oxygen_1.2.0.bb)1
-rw-r--r--packages/opie-oxygen/opie-oxygen_cvs.bb3
-rw-r--r--packages/opie-oyatzee/opie-oyatzee_1.2.1.bb (renamed from packages/opie-oyatzee/opie-oyatzee_1.2.0.bb)1
-rw-r--r--packages/opie-oyatzee/opie-oyatzee_cvs.bb3
-rw-r--r--packages/opie-packagemanager/files/ipkg-fix.patch40
-rw-r--r--packages/opie-packagemanager/opie-packagemanager_1.2.1.bb (renamed from packages/opie-packagemanager/opie-packagemanager_1.2.0.bb)7
-rw-r--r--packages/opie-packagemanager/opie-packagemanager_cvs.bb3
-rw-r--r--packages/opie-parashoot/opie-parashoot_1.2.1.bb (renamed from packages/opie-parashoot/opie-parashoot_1.2.0.bb)1
-rw-r--r--packages/opie-parashoot/opie-parashoot_cvs.bb3
-rw-r--r--packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb4
-rw-r--r--packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb5
-rw-r--r--packages/opie-pickboard/opie-pickboard_1.2.1.bb (renamed from packages/opie-pickboard/opie-pickboard_1.2.0.bb)1
-rw-r--r--packages/opie-pickboard/opie-pickboard_cvs.bb3
-rw-r--r--packages/opie-pics/opie-pics_1.2.1.bb (renamed from packages/opie-pics/opie-pics_1.2.0.bb)1
-rw-r--r--packages/opie-pics/opie-pics_cvs.bb3
-rw-r--r--packages/opie-pimconverter/opie-pimconverter_1.2.1.bb (renamed from packages/opie-pimconverter/opie-pimconverter_1.2.0.bb)1
-rw-r--r--packages/opie-pimconverter/opie-pimconverter_cvs.bb3
-rw-r--r--packages/opie-powerchord/opie-powerchord_1.2.1.bb (renamed from packages/opie-powerchord/opie-powerchord_1.2.0.bb)1
-rw-r--r--packages/opie-powerchord/opie-powerchord_cvs.bb3
-rw-r--r--packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.1.bb (renamed from packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.0.bb)1
-rw-r--r--packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb3
-rw-r--r--packages/opie-qasteroids/opie-qasteroids_1.2.1.bb (renamed from packages/opie-qasteroids/opie-qasteroids_1.2.0.bb)1
-rw-r--r--packages/opie-qasteroids/opie-qasteroids_cvs.bb3
-rw-r--r--packages/opie-qcop/opie-qcop_1.2.1.bb (renamed from packages/opie-qcop/opie-qcop_1.2.0.bb)1
-rw-r--r--packages/opie-qcop/opie-qcop_cvs.bb3
-rw-r--r--packages/opie-qss/opie-qss_1.2.1.bb (renamed from packages/opie-qss/opie-qss_1.2.0.bb)1
-rw-r--r--packages/opie-qss/opie-qss_cvs.bb3
-rw-r--r--packages/opie-quicklauncher/opie-quicklauncher_1.2.1.bb (renamed from packages/opie-quicklauncher/opie-quicklauncher_1.2.0.bb)1
-rw-r--r--packages/opie-quicklauncher/opie-quicklauncher_cvs.bb3
-rw-r--r--packages/opie-rdesktop/opie-rdesktop_1.2.1.bb (renamed from packages/opie-rdesktop/opie-rdesktop_1.2.0.bb)1
-rw-r--r--packages/opie-rdesktop/opie-rdesktop_cvs.bb3
-rw-r--r--packages/opie-reader/opie-reader.inc26
-rw-r--r--packages/opie-reader/opie-reader_1.2.1.bb (renamed from packages/opie-reader/opie-reader_1.2.0.bb)1
-rw-r--r--packages/opie-reader/opie-reader_cvs.bb31
-rw-r--r--packages/opie-recorder/opie-recorder_1.2.1.bb (renamed from packages/opie-recorder/opie-recorder_1.2.0.bb)1
-rw-r--r--packages/opie-recorder/opie-recorder_cvs.bb3
-rw-r--r--packages/opie-remote/opie-remote_1.2.1.bb (renamed from packages/opie-remote/opie-remote_1.2.0.bb)1
-rw-r--r--packages/opie-remote/opie-remote_cvs.bb3
-rw-r--r--packages/opie-restartapplet/opie-restartapplet2_1.2.1.bb (renamed from packages/opie-restartapplet/opie-restartapplet2_1.2.0.bb)0
-rw-r--r--packages/opie-restartapplet/opie-restartapplet2_cvs.bb2
-rw-r--r--packages/opie-restartapplet/opie-restartapplet_1.2.1.bb (renamed from packages/opie-restartapplet/opie-restartapplet_1.2.0.bb)1
-rw-r--r--packages/opie-restartapplet/opie-restartapplet_cvs.bb3
-rw-r--r--packages/opie-restartapplet2/opie-restartapplet2_1.2.1.bb (renamed from packages/opie-restartapplet2/opie-restartapplet2_1.2.0.bb)1
-rw-r--r--packages/opie-restartapplet2/opie-restartapplet2_cvs.bb3
-rw-r--r--packages/opie-rotateapplet/opie-rotateapplet_1.2.1.bb (renamed from packages/opie-rotateapplet/opie-rotateapplet_1.2.0.bb)1
-rw-r--r--packages/opie-rotateapplet/opie-rotateapplet_cvs.bb3
-rw-r--r--packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb (renamed from packages/opie-screenshotapplet/opie-screenshotapplet_1.2.0.bb)1
-rw-r--r--packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb3
-rw-r--r--packages/opie-search/opie-search_1.2.1.bb (renamed from packages/opie-search/opie-search_1.2.0.bb)1
-rw-r--r--packages/opie-search/opie-search_cvs.bb3
-rw-r--r--packages/opie-security/opie-security_1.2.1.bb (renamed from packages/opie-security/opie-security_1.2.0.bb)1
-rw-r--r--packages/opie-security/opie-security_cvs.bb3
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb (renamed from packages/opie-securityplugins/opie-securityplugin-blueping_1.2.0.bb)0
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb2
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb (renamed from packages/opie-securityplugins/opie-securityplugin-dummy_1.2.0.bb)0
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb2
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb (renamed from packages/opie-securityplugins/opie-securityplugin-notice_1.2.0.bb)0
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb2
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb (renamed from packages/opie-securityplugins/opie-securityplugin-pin_1.2.0.bb)0
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb2
-rw-r--r--packages/opie-securityplugins/opie-securityplugins_1.2.1.bb (renamed from packages/opie-securityplugins/opie-securityplugins_1.2.0.bb)1
-rw-r--r--packages/opie-securityplugins/opie-securityplugins_cvs.bb3
-rw-r--r--packages/opie-sfcave/opie-sfcave_1.2.1.bb (renamed from packages/opie-sfcave/opie-sfcave_1.2.0.bb)1
-rw-r--r--packages/opie-sfcave/opie-sfcave_cvs.bb3
-rw-r--r--packages/opie-sh-snes/opie-sh-snes_1.2.1.bb (renamed from packages/opie-sh-snes/opie-sh-snes_1.2.0.bb)1
-rw-r--r--packages/opie-sh-snes/opie-sh-snes_cvs.bb3
-rw-r--r--packages/opie-sh/opie-sh_1.2.1.bb (renamed from packages/opie-sh/opie-sh_1.2.0.bb)1
-rw-r--r--packages/opie-sh/opie-sh_cvs.bb3
-rw-r--r--packages/opie-sheet/opie-sheet_1.2.1.bb (renamed from packages/opie-sheet/opie-sheet_1.2.0.bb)1
-rw-r--r--packages/opie-sheet/opie-sheet_cvs.bb3
-rw-r--r--packages/opie-snake/opie-snake_1.2.1.bb (renamed from packages/opie-snake/opie-snake_1.2.0.bb)1
-rw-r--r--packages/opie-snake/opie-snake_cvs.bb3
-rw-r--r--packages/opie-solitaire/opie-solitaire_1.2.1.bb (renamed from packages/opie-solitaire/opie-solitaire_1.2.0.bb)1
-rw-r--r--packages/opie-solitaire/opie-solitaire_cvs.bb3
-rw-r--r--packages/opie-sounds/opie-sounds_1.2.1.bb (renamed from packages/opie-sounds/opie-sounds_1.2.0.bb)1
-rw-r--r--packages/opie-sounds/opie-sounds_cvs.bb3
-rw-r--r--packages/opie-sshkeys/opie-sshkeys_1.2.1.bb (renamed from packages/opie-sshkeys/opie-sshkeys_1.2.0.bb)1
-rw-r--r--packages/opie-sshkeys/opie-sshkeys_cvs.bb3
-rw-r--r--packages/opie-style-flat/opie-style-flat_1.2.1.bb (renamed from packages/opie-style-flat/opie-style-flat_1.2.0.bb)1
-rw-r--r--packages/opie-style-flat/opie-style-flat_cvs.bb3
-rw-r--r--packages/opie-style-fresh/opie-style-fresh_1.2.1.bb (renamed from packages/opie-style-fresh/opie-style-fresh_1.2.0.bb)1
-rw-r--r--packages/opie-style-fresh/opie-style-fresh_cvs.bb3
-rw-r--r--packages/opie-style-liquid/opie-style-liquid_1.2.1.bb (renamed from packages/opie-style-liquid/opie-style-liquid_1.2.0.bb)1
-rw-r--r--packages/opie-style-liquid/opie-style-liquid_cvs.bb3
-rw-r--r--packages/opie-style-metal/opie-style-metal_1.2.1.bb (renamed from packages/opie-style-metal/opie-style-metal_1.2.0.bb)1
-rw-r--r--packages/opie-style-metal/opie-style-metal_cvs.bb3
-rw-r--r--packages/opie-style-phase/opie-style-phase_1.2.1.bb (renamed from packages/opie-style-phase/opie-style-phase_1.2.0.bb)1
-rw-r--r--packages/opie-style-phase/opie-style-phase_cvs.bb3
-rw-r--r--packages/opie-style-web/opie-style-web_1.2.1.bb (renamed from packages/opie-style-web/opie-style-web_1.2.0.bb)1
-rw-r--r--packages/opie-style-web/opie-style-web_cvs.bb3
-rw-r--r--packages/opie-suspendapplet/opie-suspendapplet_1.2.1.bb (renamed from packages/opie-suspendapplet/opie-suspendapplet_1.2.0.bb)1
-rw-r--r--packages/opie-suspendapplet/opie-suspendapplet_cvs.bb3
-rw-r--r--packages/opie-symlinker/opie-symlinker_1.2.1.bb (renamed from packages/opie-symlinker/opie-symlinker_1.2.0.bb)1
-rw-r--r--packages/opie-symlinker/opie-symlinker_cvs.bb3
-rw-r--r--packages/opie-sysinfo/opie-sysinfo_1.2.1.bb (renamed from packages/opie-sysinfo/opie-sysinfo_1.2.0.bb)1
-rw-r--r--packages/opie-sysinfo/opie-sysinfo_cvs.bb3
-rw-r--r--packages/opie-systemtime/opie-systemtime_1.2.1.bb (renamed from packages/opie-systemtime/opie-systemtime_1.2.0.bb)1
-rw-r--r--packages/opie-systemtime/opie-systemtime_cvs.bb3
-rw-r--r--packages/opie-tableviewer/opie-tableviewer_1.2.1.bb (renamed from packages/opie-tableviewer/opie-tableviewer_1.2.0.bb)1
-rw-r--r--packages/opie-tableviewer/opie-tableviewer_cvs.bb3
-rw-r--r--packages/opie-taskbar/opie-taskbar_1.2.1.bb (renamed from packages/opie-taskbar/opie-taskbar_1.2.0.bb)1
-rw-r--r--packages/opie-taskbar/opie-taskbar_cvs.bb3
-rw-r--r--packages/opie-tetrix/opie-tetrix_1.2.1.bb (renamed from packages/opie-tetrix/opie-tetrix_1.2.0.bb)1
-rw-r--r--packages/opie-tetrix/opie-tetrix_cvs.bb3
-rw-r--r--packages/opie-textedit/opie-textedit_1.2.1.bb (renamed from packages/opie-helpbrowser/opie-helpbrowser_1.2.0.bb)1
-rw-r--r--packages/opie-textedit/opie-textedit_cvs.bb3
-rw-r--r--packages/opie-theme/opie-theme_1.2.1.bb (renamed from packages/opie-theme/opie-theme_1.2.0.bb)1
-rw-r--r--packages/opie-theme/opie-theme_cvs.bb3
-rw-r--r--packages/opie-tictac/opie-tictac_1.2.1.bb (renamed from packages/opie-tictac/opie-tictac_1.2.0.bb)1
-rw-r--r--packages/opie-tictac/opie-tictac_cvs.bb3
-rw-r--r--packages/opie-tinykate/opie-tinykate_1.2.1.bb (renamed from packages/opie-tinykate/opie-tinykate_1.2.0.bb)1
-rw-r--r--packages/opie-tinykate/opie-tinykate_cvs.bb3
-rw-r--r--packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.1.bb (renamed from packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.0.bb)1
-rw-r--r--packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb3
-rw-r--r--packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.1.bb (renamed from packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.0.bb)1
-rw-r--r--packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb3
-rw-r--r--packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.1.bb (renamed from packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.0.bb)1
-rw-r--r--packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb3
-rw-r--r--packages/opie-today-mailplugin/opie-today-mailplugin_1.2.1.bb (renamed from packages/opie-today-mailplugin/opie-today-mailplugin_1.2.0.bb)1
-rw-r--r--packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb3
-rw-r--r--packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.1.bb (renamed from packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.0.bb)1
-rw-r--r--packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb3
-rw-r--r--packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.1.bb (renamed from packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.0.bb)1
-rw-r--r--packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb3
-rw-r--r--packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.1.bb (renamed from packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.0.bb)1
-rw-r--r--packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb3
-rw-r--r--packages/opie-today/opie-today_1.2.1.bb (renamed from packages/opie-today/opie-today_1.2.0.bb)1
-rw-r--r--packages/opie-today/opie-today_cvs.bb3
-rw-r--r--packages/opie-todo/opie-todo_1.2.1.bb (renamed from packages/opie-todo/opie-todo_1.2.0.bb)1
-rw-r--r--packages/opie-todo/opie-todo_cvs.bb3
-rw-r--r--packages/opie-tonleiter/opie-tonleiter_1.2.1.bb (renamed from packages/opie-tonleiter/opie-tonleiter_1.2.0.bb)1
-rw-r--r--packages/opie-tonleiter/opie-tonleiter_cvs.bb3
-rw-r--r--packages/opie-unikeyboard/opie-unikeyboard_1.2.1.bb (renamed from packages/opie-unikeyboard/opie-unikeyboard_1.2.0.bb)1
-rw-r--r--packages/opie-unikeyboard/opie-unikeyboard_cvs.bb3
-rw-r--r--packages/opie-usermanager/opie-usermanager_1.2.1.bb (renamed from packages/opie-usermanager/opie-usermanager_1.2.0.bb)1
-rw-r--r--packages/opie-usermanager/opie-usermanager_cvs.bb3
-rw-r--r--packages/opie-vmemo-settings/opie-vmemo-settings_1.2.1.bb (renamed from packages/opie-vmemo-settings/opie-vmemo-settings_1.2.0.bb)1
-rw-r--r--packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb3
-rw-r--r--packages/opie-vmemo/opie-vmemo_1.2.1.bb (renamed from packages/opie-vmemo/opie-vmemo_1.2.0.bb)1
-rw-r--r--packages/opie-vmemo/opie-vmemo_cvs.bb3
-rw-r--r--packages/opie-volumeapplet/opie-volumeapplet_1.2.1.bb (renamed from packages/opie-volumeapplet/opie-volumeapplet_1.2.0.bb)1
-rw-r--r--packages/opie-volumeapplet/opie-volumeapplet_cvs.bb3
-rw-r--r--packages/opie-vtapplet/opie-vtapplet_1.2.1.bb (renamed from packages/opie-vtapplet/opie-vtapplet_1.2.0.bb)1
-rw-r--r--packages/opie-vtapplet/opie-vtapplet_cvs.bb3
-rw-r--r--packages/opie-wellenreiter/files/we-version.patch44
-rw-r--r--packages/opie-wellenreiter/opie-wellenreiter_1.2.0.bb8
-rw-r--r--packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb6
-rw-r--r--packages/opie-wellenreiter/opie-wellenreiter_cvs.bb3
-rw-r--r--packages/opie-wirelessapplet/opie-wirelessapplet_1.2.1.bb (renamed from packages/opie-wirelessapplet/opie-wirelessapplet_1.2.0.bb)1
-rw-r--r--packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb3
-rw-r--r--packages/opie-wordgame/opie-wordgame_1.2.1.bb (renamed from packages/opie-wordgame/opie-wordgame_1.2.0.bb)1
-rw-r--r--packages/opie-wordgame/opie-wordgame_cvs.bb3
-rw-r--r--packages/opie-write/opie-write_1.2.1.bb (renamed from packages/opie-write/opie-write_1.2.0.bb)1
-rw-r--r--packages/opie-write/opie-write_cvs.bb3
-rw-r--r--packages/opie-zkbapplet/opie-zkbapplet_1.2.1.bb (renamed from packages/opie-zkbapplet/opie-zkbapplet_1.2.0.bb)1
-rw-r--r--packages/opie-zkbapplet/opie-zkbapplet_cvs.bb3
-rw-r--r--packages/opie-zlines/opie-zlines_1.2.1.bb (renamed from packages/opie-zlines/opie-zlines_1.2.0.bb)1
-rw-r--r--packages/opie-zlines/opie-zlines_cvs.bb3
-rw-r--r--packages/opie-zsafe/opie-zsafe_1.2.1.bb (renamed from packages/opie-zsafe/opie-zsafe_1.2.0.bb)1
-rw-r--r--packages/opie-zsafe/opie-zsafe_cvs.bb3
-rw-r--r--packages/opie-zsame/opie-zsame_1.2.1.bb (renamed from packages/opie-zsame/opie-zsame_1.2.0.bb)1
-rw-r--r--packages/opie-zsame/opie-zsame_cvs.bb3
-rw-r--r--packages/qt/qt-x11-free_3.3.5.bb2
-rw-r--r--packages/qt/qt-x11-free_4.0.1.bb2
-rw-r--r--packages/wlan-ng/wlan-ng-modules-0.2.2/compile-fix-HACK.patch43
-rw-r--r--packages/wlan-ng/wlan-ng-modules-0.2.2/config.in4
-rw-r--r--packages/wlan-ng/wlan-ng-modules-0.2.2/might-sleep.patch16
-rw-r--r--packages/wlan-ng/wlan-ng-modules-0.2.2/module_param_array.patch19
-rw-r--r--packages/wlan-ng/wlan-ng-modules-0.2.2/more-compat.patch7
-rw-r--r--packages/wlan-ng/wlan-ng-modules-0.2.2/pcmciasrc.patch45
-rw-r--r--packages/wlan-ng/wlan-ng-modules-0.2.2/scripts-makefile-hostcc.patch16
-rw-r--r--packages/wlan-ng/wlan-ng-modules_0.2.2.bb6
-rw-r--r--packages/wlan-ng/wlan-ng-utils-0.2.2/config.in6
-rw-r--r--packages/wlan-ng/wlan-ng-utils_0.2.2.bb2
-rw-r--r--packages/xserver-common/files/.mtn2git_empty (renamed from packages/opie-wellenreiter/files/.mtn2git_empty)0
-rw-r--r--packages/xserver-common/files/cxk-rotation.patch24
-rw-r--r--packages/xserver-common/xserver-common_1.1.bb3
406 files changed, 971 insertions, 1126 deletions
diff --git a/packages/opie-packagemanager/files/.mtn2git_empty b/packages/gpe-bluetooth/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-packagemanager/files/.mtn2git_empty
+++ b/packages/gpe-bluetooth/files/.mtn2git_empty
diff --git a/packages/gpe-bluetooth/files/bluez-pin-gpe.glade b/packages/gpe-bluetooth/files/bluez-pin-gpe.glade
new file mode 100644
index 0000000000..379ec5499a
--- /dev/null
+++ b/packages/gpe-bluetooth/files/bluez-pin-gpe.glade
@@ -0,0 +1,182 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+<requires lib="gnome"/>
+
+<widget class="GtkDialog" id="dialog1">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Bluetooth PIN</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="has_separator">False</property>
+
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child internal-child="action_area">
+ <widget class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+ <child>
+ <widget class="GtkButton" id="cancelbutton1">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">-6</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="okbutton1">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-ok</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">-5</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">8</property>
+ <property name="ypad">8</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Connection type</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">4</property>
+
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_PIN:</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">entry1</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="entry1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ <accessibility>
+ <atkrelation target="entry1" type="label-for"/>
+ </accessibility>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
+</glade-interface>
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb
index 6a4e6dc907..cce7301b38 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb
@@ -7,9 +7,16 @@ RDEPENDS = "bluez-utils-dbus blueprobe"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "gpe"
PRIORITY = "optional"
-PR = "r0"
+PR = "r1"
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
+ file://bluez-pin-gpe.glade"
FILES_${PN} += '${datadir}/bluez-pin'
+do_install_append() {
+install -d ${D}${datadir}/bluez-pin
+install -m 644 ${WORKDIR}/bluez-pin-gpe.glade ${D}${datadir}/bluez-pin/
+
+}
+
diff --git a/packages/libmailwrapper/libmailwrapper_1.2.0.bb b/packages/libmailwrapper/libmailwrapper_1.2.1.bb
index 0797d66ad6..29aa09c148 100644
--- a/packages/libmailwrapper/libmailwrapper_1.2.0.bb
+++ b/packages/libmailwrapper/libmailwrapper_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail/libmailwrapper "
diff --git a/packages/libmailwrapper/libmailwrapper_cvs.bb b/packages/libmailwrapper/libmailwrapper_cvs.bb
index c6f15411c0..55829044c2 100644
--- a/packages/libmailwrapper/libmailwrapper_cvs.bb
+++ b/packages/libmailwrapper/libmailwrapper_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail/libmailwrapper "
diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc
index b19a71c1f9..4a05010dea 100644
--- a/packages/libopie/libopie2.inc
+++ b/packages/libopie/libopie2.inc
@@ -4,7 +4,7 @@ SECTION = "opie/libs"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "LGPL"
I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
-DEPENDS = "libqpe-opie libpcap sqlite3"
+DEPENDS = "libqpe-opie libpcap sqlite3 bluez-libs"
PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2"
S = "${WORKDIR}/libopie2"
@@ -23,8 +23,8 @@ EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
#NOTE: We no longer enable the sqlite PIM backend here, since a) using it means no sync and b) it's too large for 16MB images
EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=n'
-MODULES = "opiecore opiedb opiemm opienet opiepim opiesecurity opieui"
-LIBS = "core2 db2 mm2 net2 pim2 security2 ui2"
+MODULES = "opiecore opiedb opiemm opienet opiepim opiesecurity opieui opiebluez"
+LIBS = "core2 db2 mm2 net2 pim2 security2 ui2 bluez2"
PRIVATE = "opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h opimeventsortvector.h"
# uclibc doesn't have backtrace()
diff --git a/packages/libopie/libopie2_1.2.0.bb b/packages/libopie/libopie2_1.2.1.bb
index 74bf375b55..604e1a4666 100644
--- a/packages/libopie/libopie2_1.2.0.bb
+++ b/packages/libopie/libopie2_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
file://include.pro"
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index 0a1f1bea15..14d55f913b 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,11 +1,6 @@
include ${PN}.inc
-DEPENDS += "bluez-libs"
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
-
-MODULES = "opiecore opiedb opiemm opienet opiepim opiesecurity opieui opiebluez"
-LIBS = "core2 db2 mm2 net2 pim2 security2 ui2 bluez2"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
file://include.pro"
diff --git a/packages/libopieobex/chdir-patch.patch b/packages/libopieobex/chdir-patch.patch
deleted file mode 100644
index 60889ae893..0000000000
--- a/packages/libopieobex/chdir-patch.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Most Obex Push receivers are broken when getting a path inside
-the push. We will change the working directory.
-This patch is included upstream already
-
-Index: obex.cc
-===================================================================
-RCS file: /cvs/opie/core/obex/obex.cc,v
-retrieving revision 1.9
-diff -u -r1.9 obex.cc
---- obex.cc 12 Sep 2004 18:55:56 -0000 1.9
-+++ obex.cc 29 Mar 2005 23:28:37 -0000
-@@ -74,8 +74,10 @@
- }
- // OProcess inititialisation
- m_send = new OProcess();
-+ m_send->setWorkingDirectory( QFileInfo(m_file).dirPath(true) );
-+
- *m_send << "irobex_palm3";
-- *m_send << QFile::encodeName(m_file);
-+ *m_send << QFile::encodeName(QFileInfo(m_file).fileName());
-
- // connect to slots Exited and and StdOut
- connect(m_send, SIGNAL(processExited(Opie::Core::OProcess*) ),
diff --git a/packages/libopieobex/libopieobex0_1.2.0.bb b/packages/libopieobex/libopieobex0_1.2.0.bb
deleted file mode 100644
index a90177b6d5..0000000000
--- a/packages/libopieobex/libopieobex0_1.2.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-include libopieobex0.inc
-
-PR = "r1"
-
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
- file://chdir-patch.patch;patch=1;pnum=0 "
diff --git a/packages/libopieobex/libopieobex0_1.2.1.bb b/packages/libopieobex/libopieobex0_1.2.1.bb
new file mode 100644
index 0000000000..f5a2b1bc45
--- /dev/null
+++ b/packages/libopieobex/libopieobex0_1.2.1.bb
@@ -0,0 +1,5 @@
+include libopieobex0.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb
index 05983a8ee3..3ea7522aa5 100644
--- a/packages/libopieobex/libopieobex0_cvs.bb
+++ b/packages/libopieobex/libopieobex0_cvs.bb
@@ -1,7 +1,6 @@
include libopieobex0.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r1"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/libopietooth/libopietooth1.inc b/packages/libopietooth/libopietooth1.inc
new file mode 100644
index 0000000000..4aad9fb05e
--- /dev/null
+++ b/packages/libopietooth/libopietooth1.inc
@@ -0,0 +1,22 @@
+DESCRIPTION = "Opie Bluetooth library"
+SECTION = "opie/libs"
+PRIORITY = "optional"
+DEPENDS = "libopie2"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "LGPL"
+
+
+S = "${WORKDIR}/lib"
+
+inherit opie
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/opietooth/
+ install -m 0644 *.h ${STAGING_INCDIR}/opietooth/
+ oe_libinstall -so libopietooth1 ${STAGING_LIBDIR}/
+}
+
+do_install() {
+ oe_libinstall -so libopietooth1 ${D}${palmtopdir}/lib
+}
+
diff --git a/packages/libopietooth/libopietooth1_1.2.0.bb b/packages/libopietooth/libopietooth1_1.2.1.bb
index 0dc91b2731..0dc91b2731 100644
--- a/packages/libopietooth/libopietooth1_1.2.0.bb
+++ b/packages/libopietooth/libopietooth1_1.2.1.bb
diff --git a/packages/libopietooth/libopietooth1_cvs.bb b/packages/libopietooth/libopietooth1_cvs.bb
index 79244a69b4..da3ef3455a 100644
--- a/packages/libopietooth/libopietooth1_cvs.bb
+++ b/packages/libopietooth/libopietooth1_cvs.bb
@@ -1,4 +1,4 @@
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/lib"
-PV = "1.2.0+cvs-${CVSDATE}"
+PV = "1.2.1+cvs-${CVSDATE}"
include libopietooth1.inc
diff --git a/packages/libqanava/libqanava_0.0.3.bb b/packages/libqanava/libqanava_0.0.3.bb
index 968c88745d..85be9558c7 100644
--- a/packages/libqanava/libqanava_0.0.3.bb
+++ b/packages/libqanava/libqanava_0.0.3.bb
@@ -3,6 +3,7 @@ to enable graphical display of graphs and other relational structures."
SECTION = "x11/libs"
HOMEPAGE = "http://www.libqanava.org/"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "qt3x11"
LICENSE = "GPL"
PR = "r1"
diff --git a/packages/libqpe/libqpe-opie/0905_datebookmonth.patch b/packages/libqpe/libqpe-opie/0905_datebookmonth.patch
new file mode 100644
index 0000000000..7c4d5fb389
--- /dev/null
+++ b/packages/libqpe/libqpe-opie/0905_datebookmonth.patch
@@ -0,0 +1,23 @@
+Index: datebookmonth.cpp
+===================================================================
+RCS file: /cvs/opie/library/datebookmonth.cpp,v
+retrieving revision 1.10
+diff -u -r1.10 datebookmonth.cpp
+--- datebookmonth.cpp 20 Mar 2005 18:29:19 -0000 1.10
++++ datebookmonth.cpp 5 Sep 2005 19:53:47 -0000
+@@ -661,7 +661,14 @@
+
+ // Finally, draw the number.
+ QFont f = p->font();
+- f.setPointSize( ( f.pointSize() / 3 ) * 2 );
++ if(qApp->desktop()->width() >= 480)
++ {
++ f.setPointSize( f.pointSize() - 2 );
++ }
++ else
++ {
++ f.setPointSize( ( f.pointSize() / 3 ) * 2 );
++ }
+ p->setFont( f );
+ QFontMetrics fm( f );
+ p->drawText( 1, 1 + fm.ascent(), QString::number( day() ) );
diff --git a/packages/libqpe/libqpe-opie/fix-nomax.patch b/packages/libqpe/libqpe-opie/fix-nomax.patch
deleted file mode 100644
index a31369fcb6..0000000000
--- a/packages/libqpe/libqpe-opie/fix-nomax.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- library/widget_showing.cpp~fix-nomax
-+++ library/widget_showing.cpp
-@@ -52,7 +52,7 @@
- return;
- }
-
--#ifndef OPIE_NO_WINDOWED
-+#ifdef OPIE_NO_WINDOWED
- Q_UNUSED( nomax )
- if ( TRUE ) {
- #else
diff --git a/packages/libqpe/libqpe-opie_1.2.0.bb b/packages/libqpe/libqpe-opie_1.2.1.bb
index a20071b8fc..6cd4368187 100644
--- a/packages/libqpe/libqpe-opie_1.2.0.bb
+++ b/packages/libqpe/libqpe-opie_1.2.1.bb
@@ -1,9 +1,8 @@
include ${PN}.inc
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-PR = "r2"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
- file://fix-nomax.patch;patch=1 \
+ file://0905_datebookmonth.patch;patch=1;pnum=0 \
file://fix-titleheight.patch;patch=1"
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index 01cb70652c..06e626b132 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r1"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/library \
file://fix-titleheight.patch;patch=1"
diff --git a/packages/libqtaux/libqtaux2_1.2.0.bb b/packages/libqtaux/libqtaux2_1.2.1.bb
index c18ff44b6a..aa694d43f1 100644
--- a/packages/libqtaux/libqtaux2_1.2.0.bb
+++ b/packages/libqtaux/libqtaux2_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libqtaux"
diff --git a/packages/libqtaux/libqtaux2_cvs.bb b/packages/libqtaux/libqtaux2_cvs.bb
index 3d3153ec5b..3989da142d 100644
--- a/packages/libqtaux/libqtaux2_cvs.bb
+++ b/packages/libqtaux/libqtaux2_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/libqtaux"
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-tosa
index c7eba4a337..dd1e70fa03 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-tosa
+++ b/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-tosa
@@ -1,14 +1,13 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-mm1
-# Mon Jul 4 15:43:10 2005
+# Linux kernel version: 2.6.13-mm1
+# Tue Sep 6 08:38:08 2005
#
CONFIG_ARM=y
CONFIG_MMU=y
CONFIG_UID16=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_IOMAP=y
#
# Code maturity level options
@@ -23,6 +22,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
# General setup
#
CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
# CONFIG_POSIX_MQUEUE is not set
@@ -33,6 +33,7 @@ CONFIG_SYSCTL=y
CONFIG_HOTPLUG=y
CONFIG_KOBJECT_UEVENT=y
# CONFIG_IKCONFIG is not set
+CONFIG_INITRAMFS_SOURCE=""
CONFIG_EMBEDDED=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
@@ -86,6 +87,7 @@ CONFIG_ARCH_PXA=y
# CONFIG_ARCH_VERSATILE is not set
# CONFIG_ARCH_IMX is not set
# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
#
# Intel PXA2xx Implementations
@@ -95,6 +97,8 @@ CONFIG_ARCH_PXA=y
# CONFIG_ARCH_PXA_IDP is not set
CONFIG_PXA_SHARPSL=y
# CONFIG_MACH_HX2750 is not set
+CONFIG_PXA_SHARPSL_25x=y
+# CONFIG_PXA_SHARPSL_27x is not set
# CONFIG_MACH_POODLE is not set
# CONFIG_MACH_CORGI is not set
# CONFIG_MACH_SHEPHERD is not set
@@ -145,8 +149,8 @@ CONFIG_PCMCIA_PXA2XX=y
#
# Kernel Features
#
-# CONFIG_SMP is not set
CONFIG_PREEMPT=y
+# CONFIG_NO_IDLE_HZ is not set
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
@@ -154,6 +158,7 @@ CONFIG_FLATMEM_MANUAL=y
# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_ALIGNMENT_TRAP=y
#
@@ -161,7 +166,7 @@ CONFIG_ALIGNMENT_TRAP=y
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 "
+CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2"
# CONFIG_XIP_KERNEL is not set
#
@@ -190,216 +195,7 @@ CONFIG_PM=y
CONFIG_APM=y
#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-# CONFIG_DEBUG_DRIVER is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_CONCAT is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_AFS_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_ROM=y
-# CONFIG_MTD_ABSENT is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_SHARP_SL=y
-# CONFIG_MTD_PLATRAM is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLKMTD is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_VERIFY_WRITE=y
-# CONFIG_MTD_NAND_H1900 is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_SHARPSL is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-CONFIG_MTD_NAND_TC6393=y
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_RAM is not set
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_CDROM_PKTCDVD is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_ATA_OVER_ETH is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
-CONFIG_BLK_DEV_IDECS=y
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_IDE_GENERIC is not set
-# CONFIG_IDE_ARM is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI=m
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-
-#
-# SCSI Transport Attributes
-#
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_SCSI_SATA is not set
-# CONFIG_SCSI_DEBUG is not set
-
-#
-# PCMCIA SCSI adapter support
-#
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Networking support
+# Networking
#
CONFIG_NET=y
@@ -409,10 +205,13 @@ CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
# CONFIG_NET_KEY is not set
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
@@ -422,19 +221,10 @@ CONFIG_SYN_COOKIES=y
# CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set
# CONFIG_INET_TUNNEL is not set
-CONFIG_IP_TCPDIAG=y
-# CONFIG_IP_TCPDIAG_IPV6 is not set
-
-#
-# TCP congestion control
-#
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_WESTWOOD=y
-CONFIG_TCP_CONG_HTCP=y
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
#
# IP: Virtual Server Configuration
@@ -456,6 +246,7 @@ CONFIG_NETFILTER=y
CONFIG_IP_NF_CONNTRACK=m
# CONFIG_IP_NF_CT_ACCT is not set
# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
CONFIG_IP_NF_CT_PROTO_SCTP=m
CONFIG_IP_NF_FTP=m
CONFIG_IP_NF_IRC=m
@@ -484,8 +275,10 @@ CONFIG_IP_NF_MATCH_OWNER=m
CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IP_NF_MATCH_REALM=m
CONFIG_IP_NF_MATCH_SCTP=m
+# CONFIG_IP_NF_MATCH_DCCP is not set
CONFIG_IP_NF_MATCH_COMMENT=m
CONFIG_IP_NF_MATCH_HASHLIMIT=m
+# CONFIG_IP_NF_MATCH_STRING is not set
CONFIG_IP_NF_FILTER=m
# CONFIG_IP_NF_TARGET_REJECT is not set
CONFIG_IP_NF_TARGET_LOG=m
@@ -508,6 +301,7 @@ CONFIG_IP_NF_MANGLE=m
# CONFIG_IP_NF_TARGET_DSCP is not set
# CONFIG_IP_NF_TARGET_MARK is not set
# CONFIG_IP_NF_TARGET_CLASSIFY is not set
+# CONFIG_IP_NF_TARGET_TTL is not set
CONFIG_IP_NF_RAW=m
# CONFIG_IP_NF_TARGET_NOTRACK is not set
CONFIG_IP_NF_ARPTABLES=m
@@ -534,11 +328,16 @@ CONFIG_IP6_NF_MATCH_LENGTH=m
CONFIG_IP6_NF_MATCH_EUI64=m
CONFIG_IP6_NF_FILTER=m
# CONFIG_IP6_NF_TARGET_LOG is not set
+# CONFIG_IP6_NF_TARGET_REJECT is not set
CONFIG_IP6_NF_MANGLE=m
# CONFIG_IP6_NF_TARGET_MARK is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
CONFIG_IP6_NF_RAW=m
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
#
# SCTP Configuration (EXPERIMENTAL)
@@ -556,10 +355,6 @@ CONFIG_XFRM_USER=m
# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
# CONFIG_NET_SCHED is not set
CONFIG_NET_CLS_ROUTE=y
@@ -567,11 +362,7 @@ CONFIG_NET_CLS_ROUTE=y
# Network testing
#
# CONFIG_NET_PKTGEN is not set
-# CONFIG_KGDBOE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NETPOLL_RX is not set
-# CONFIG_NETPOLL_TRAP is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_NETFILTER_NETLINK is not set
# CONFIG_HAMRADIO is not set
CONFIG_IRDA=m
@@ -655,6 +446,219 @@ CONFIG_IEEE80211=m
CONFIG_IEEE80211_CRYPT_WEP=m
CONFIG_IEEE80211_CRYPT_CCMP=m
CONFIG_IEEE80211_CRYPT_TKIP=m
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_DEBUG_DRIVER is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_RAM is not set
+CONFIG_MTD_ROM=y
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_SHARP_SL=y
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLKMTD is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_VERIFY_WRITE=y
+# CONFIG_MTD_NAND_H1900 is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_SHARPSL is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_TC6393=y
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_RAM is not set
+CONFIG_BLK_DEV_RAM_COUNT=16
+# CONFIG_CDROM_PKTCDVD is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_BLK_DEV_IDECS=y
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_IDE_GENERIC is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# PCMCIA SCSI adapter support
+#
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
@@ -662,6 +666,11 @@ CONFIG_NETDEVICES=y
CONFIG_TUN=m
#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
# Ethernet (10 or 100Mbit)
#
CONFIG_NET_ETHERNET=y
@@ -741,6 +750,11 @@ CONFIG_PPP_BSDCOMP=m
# CONFIG_SLIP is not set
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
+# CONFIG_KGDBOE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NETPOLL_RX is not set
+# CONFIG_NETPOLL_TRAP is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
#
# ISDN subsystem
@@ -773,6 +787,7 @@ CONFIG_KEYBOARD_TOSA=y
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_CORGI is not set
+CONFIG_KEYBOARD_SPITZ=y
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
CONFIG_INPUT_TOUCHSCREEN=y
@@ -833,7 +848,6 @@ CONFIG_SA1100_RTC=y
#
# Ftape, the floppy tape device driver
#
-# CONFIG_DRM is not set
#
# PCMCIA character devices
@@ -854,7 +868,7 @@ CONFIG_I2C=y
#
# I2C Algorithms
#
-# CONFIG_I2C_ALGOBIT is not set
+CONFIG_I2C_ALGOBIT=y
# CONFIG_I2C_ALGOPCF is not set
# CONFIG_I2C_ALGOPCA is not set
@@ -863,15 +877,31 @@ CONFIG_I2C=y
#
CONFIG_I2C_PXA=y
# CONFIG_I2C_PXA_SLAVE is not set
-# CONFIG_I2C_ISA is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_STUB is not set
# CONFIG_I2C_PCA_ISA is not set
#
-# Hardware Sensors Chip support
+# Miscellaneous I2C Chip support
#
-# CONFIG_I2C_SENSOR is not set
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
# CONFIG_SENSORS_ADM1021 is not set
# CONFIG_SENSORS_ADM1025 is not set
# CONFIG_SENSORS_ADM1026 is not set
@@ -897,31 +927,21 @@ CONFIG_I2C_PXA=y
# CONFIG_SENSORS_LM92 is not set
# CONFIG_SENSORS_MAX1619 is not set
# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83792D is not set
# CONFIG_SENSORS_W83L785TS is not set
# CONFIG_SENSORS_W83627HF is not set
# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
#
-# Other I2C Chip support
+# Misc devices
#
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_RTC8564 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
#
-# Misc devices
+# Multimedia Capabilities Port drivers
#
#
@@ -941,7 +961,6 @@ CONFIG_VIDEO_DEV=m
#
# Video Adapters
#
-# CONFIG_CONFIG_TUNER_MULTI_I2C is not set
# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
@@ -1006,6 +1025,11 @@ CONFIG_BACKLIGHT_DEVICE=y
CONFIG_BACKLIGHT_TOSA=y
#
+# Speakup console speech
+#
+# CONFIG_SPEAKUP is not set
+
+#
# Sound
#
CONFIG_SOUND=m
@@ -1031,12 +1055,13 @@ CONFIG_SND_PCM_OSS=m
# CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set
CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_AC97_BUS=m
#
# ALSA ARM devices
#
-CONFIG_SND_PXA2XX_AC97=m
CONFIG_SND_PXA2XX_PCM=m
+CONFIG_SND_PXA2XX_AC97=m
#
# USB devices
@@ -1073,17 +1098,17 @@ CONFIG_USB_DEVICEFS=y
# USB Host Controller Drivers
#
# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_SL811_HCD is not set
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_CS=m
#
# USB Device Class drivers
#
-CONFIG_USB_AUDIO=m
+# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
#
# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
#
-CONFIG_USB_MIDI=m
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
@@ -1100,6 +1125,7 @@ CONFIG_USB_STORAGE=m
# CONFIG_USB_STORAGE_SDDR09 is not set
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
#
# USB Input Devices
@@ -1122,8 +1148,11 @@ CONFIG_USB_POWERMATE=m
CONFIG_USB_MTOUCH=m
# CONFIG_USB_ITMTOUCH is not set
CONFIG_USB_EGALAX=m
+# CONFIG_USB_YEALINK is not set
CONFIG_USB_XPAD=m
CONFIG_USB_ATI_REMOTE=m
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
#
# USB Imaging devices
@@ -1153,32 +1182,16 @@ CONFIG_USB_KAWETH=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
CONFIG_USB_USBNET=m
-
-#
-# USB Host-to-Host Cables
-#
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_GENESYS=y
-CONFIG_USB_NET1080=y
-CONFIG_USB_PL2301=y
-CONFIG_USB_KC2190=y
-
-#
-# Intelligent USB Devices/Gadgets
-#
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ZAURUS=y
-CONFIG_USB_CDCETHER=y
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_AX8817X=y
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+# CONFIG_USB_NET_RNDIS is not set
+# CONFIG_USB_NET_SIMPLE is not set
+# CONFIG_USB_NET_ZAURUS is not set
# CONFIG_USB_ZD1201 is not set
-CONFIG_USB_MON=m
+CONFIG_USB_MON=y
#
# USB port drivers
@@ -1191,7 +1204,7 @@ CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
# CONFIG_USB_SERIAL_AIRPRIME is not set
CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CP2101 is not set
CONFIG_USB_SERIAL_CYPRESS_M8=m
@@ -1246,6 +1259,7 @@ CONFIG_USB_CYTHERM=m
CONFIG_USB_PHIDGETKIT=m
CONFIG_USB_PHIDGETSERVO=m
CONFIG_USB_IDMOUSE=m
+# CONFIG_USB_LD is not set
# CONFIG_USB_TEST is not set
#
@@ -1281,6 +1295,7 @@ CONFIG_USB_G_SERIAL=m
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC_BLOCK=y
+# CONFIG_MMC_BULKTRANSFER is not set
CONFIG_MMC_PXA=y
# CONFIG_MMC_WBSD is not set
@@ -1288,22 +1303,19 @@ CONFIG_MMC_PXA=y
# File systems
#
CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XATTR is not set
# CONFIG_EXT2_FS_XIP is not set
# CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
-CONFIG_FS_MBCACHE=y
# CONFIG_REISER4_FS is not set
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
+# CONFIG_FS_POSIX_ACL is not set
#
# XFS support
#
# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
CONFIG_INOTIFY=y
@@ -1311,11 +1323,6 @@ CONFIG_INOTIFY=y
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
-
-#
-# Caches
-#
-# CONFIG_FSCACHE is not set
CONFIG_FUSE_FS=m
#
@@ -1339,10 +1346,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
#
CONFIG_PROC_FS=y
CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVPTS_FS_XATTR is not set
CONFIG_TMPFS=y
-# CONFIG_TMPFS_XATTR is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
# CONFIG_CONFIGFS_FS is not set
@@ -1353,6 +1357,7 @@ CONFIG_RAMFS=y
#
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
+# CONFIG_ASFS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_HFSPLUS_FS is not set
# CONFIG_BEFS_FS is not set
@@ -1540,6 +1545,7 @@ CONFIG_CRYPTO_TEST=m
# Library routines
#
CONFIG_CRC_CCITT=y
+# CONFIG_CRC16 is not set
CONFIG_CRC32=y
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=y
diff --git a/packages/linux/linux-openzaurus_2.6.13-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-mm1.bb
index 16d554fa6b..1aee33c312 100644
--- a/packages/linux/linux-openzaurus_2.6.13-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r5"
+PR = "r7"
DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -14,18 +14,9 @@ BASRC = "http://www.orca.cx/zaurus/patches"
# Handy URLs
# http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \
-# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.11-rc5.bz2;patch=1 \
# http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.12-rc4-git1.bz2;patch=1 \
# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.12-rc6.bz2;patch=1 \
-# ${RPSRC}/rmk_devbuff-r0.patch;patch=1 \
-# ${RPSRC}/corgi_base_extras1-r4.patch;patch=1 \
-# ${RPSRC}/reverse_pagefault-r3.patch;patch=1 \
-# ${RPSRC}/corgi_tspmufix-r0.patch;patch=1 \
-# ${RPSRC}/nwfpe_x80-r0.patch;patch=1 \
-# ${DOSRC}/mmc-bulk-r0.patch;patch=1 \
-# ${RPSRC}/pxa27x_extraregs-r4.patch;patch=1 \
-
# Patches submitted upstream are towards top of this list
# Hacks should clearly named and at the bottom
# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc5.bz2;patch=1 \
@@ -35,36 +26,38 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
${RPSRC}/pxafb_hsync-r2.patch;patch=1 \
${RPSRC}/borzoi_machtype-r0.patch;patch=1 \
${RPSRC}/sharp_multi_pcmcia-r4.patch;patch=1 \
- ${RPSRC}/ohci_portcount-r0.patch;patch=1 \
- ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \
${RPSRC}/rmk_mmc_updates-r0.patch;patch=1 \
- ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \
${RPSRC}/sharpsl_detection-r1.patch;patch=1 \
${RPSRC}/corgi_mmc_detect-r0.patch;patch=1 \
${RPSRC}/scoop_typefix-r0.patch;patch=1 \
- ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \
- ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
- ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \
${RPSRC}/sharpsl_ssp-r4.patch;patch=1 \
${RPSRC}/sharpsl_lcd-r4.patch;patch=1 \
${RPSRC}/sharpsl_ts-r6.patch;patch=1 \
${RPSRC}/sharpsl_bl-r5.patch;patch=1 \
- ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \
+ ${RPSRC}/spitzkbd-r3.patch;patch=1 \
${RPSRC}/spitz_base-r17.patch;patch=1 \
- ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \
+ ${RPSRC}/sharpsl_mtd_extras-r1.patch;patch=1 \
+ ${RPSRC}/ohci_portcount-r0.patch;patch=1 \
+ ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \
+ ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \
+ ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \
+ ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \
${RPSRC}/corgi_pm-r3.patch;patch=1 \
+ ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \
${RPSRC}/spitz_pm-r3.patch;patch=1 \
- ${RPSRC}/spitzkbd-r3.patch;patch=1 \
+ ${RPSRC}/spitz_kbd_fix1-r0.patch;patch=1 \
${RPSRC}/spitzcf-r3.patch;patch=1 \
- ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
+ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
+ ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \
+ ${RPSRC}/rmk-i2c-pxa-r2.patch;patch=1 \
${RPSRC}/pxa_irda-r3.patch;patch=1 \
${RPSRC}/corgi_irda-r3.patch;patch=1 \
+ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
+ ${RPSRC}/scoop_susres-r1.patch;patch=1 \
${RPSRC}/input_power-r2.patch;patch=1 \
${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
${RPSRC}/sharpsl_bl_kick-r1.patch;patch=1 \
${RPSRC}/corgi_snd-r10.patch;patch=1 \
- ${RPSRC}/rmk-i2c-pxa-r2.patch;patch=1 \
- ${RPSRC}/sharpsl_mtd_extras-r1.patch;patch=1 \
${RPSRC}/ipaq/hx2750_base-r20.patch;patch=1 \
${RPSRC}/ipaq/hx2750_bl-r1.patch;patch=1 \
${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \
@@ -72,19 +65,17 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
${RPSRC}/ipaq/tsc2101-r7.patch;patch=1 \
${RPSRC}/ipaq/hx2750_test1-r2.patch;patch=1 \
${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
- ${DOSRC}/tc6393-device-r4.patch;patch=1 \
+ ${DOSRC}/tc6393-device-r5.patch;patch=1 \
${DOSRC}/tc6393_nand-r6.patch;patch=1 \
- ${RPSRC}/temp/tosa-machine-base-r7.patch;patch=1 \
+ ${DOSRC}/tosa-machine-base-r9.patch;patch=1 \
${DOSRC}/tosa-keyboard-r6.patch;patch=1 \
${DOSRC}/tc6393fb-r6.patch;patch=1 \
- ${DOSRC}/tosa-power-r5.patch;patch=1 \
- ${DOSRC}/tosa-mmc-r3.patch;patch=1 \
- ${DOSRC}/tosa-udc-r3.patch;patch=1 \
- ${DOSRC}/tosa-irda-r2.patch;patch=1 \
+ ${DOSRC}/tosa-power-r6.patch;patch=1 \
+ ${DOSRC}/tosa-mmc-r5.patch;patch=1 \
+ ${DOSRC}/tosa-udc-r4.patch;patch=1 \
+ ${DOSRC}/tosa-irda-r3.patch;patch=1 \
${DOSRC}/tosa-lcd-r3.patch;patch=1 \
- ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
- ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
- ${RPSRC}/scoop_susres-r1.patch;patch=1 \
+ ${DOSRC}/tosa-bl-r5.patch;patch=1 \
${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \
${RPSRC}/mmc_timeout-r0.patch;patch=1 \
${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
@@ -108,11 +99,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
SRC_URI_append_poodle = "${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 \
${RPSRC}/rpextra_poodle-r0.patch;patch=1 "
SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \
- ${DOSRC}/pxa-ac97-alsa-r1.patch;patch=1 \
- ${DOSRC}/pxa-ac97-alsa-resume-r0.patch;patch=1 \
- ${DOSRC}/ac97-bus-r0.patch;patch=1 \
- ${DOSRC}/wm9712-ts-r2.patch;patch=1 \
- ${DOSRC}/tosa-pxaac97-r1.patch;patch=1 \
+ ${DOSRC}/pxa-ac97-suspend-r0.patch;patch=1 \
+ ${DOSRC}/ac97codec-rename-revert-r0.patch;patch=1 \
+ ${DOSRC}/wm9712-ts-r3.patch;patch=1 \
+ ${DOSRC}/tosa-pxaac97-r4.patch;patch=1 \
${DOSRC}/tosa-bluetooth-r0.patch;patch=1 "
S = "${WORKDIR}/linux-2.6.13"
@@ -188,15 +178,19 @@ do_configure() {
yes '' | oe_runmake oldconfig
}
-# Check the kernel is below the 1272*1024 byte limit for the c7x0
+# Check the kernel is below the 1272*1024 byte limit for the PXA Zaurii
do_compile_append() {
- if [ "${MACHINE}" == "c7x0" ]; then
- size=`ls arch/${ARCH}/boot/${KERNEL_IMAGETYPE} -s | cut -d ' ' -f 1`
- if [ $size -ge 1271 ]; then
- rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
- die "This kernel is too big for the c7x0 and will destroy your machine if you flash it!!!"
- fi
- fi
+ case ${MACHINE} in
+ c7x0 | akita | poodle | spitz | borzoi )
+ size=`ls arch/${ARCH}/boot/${KERNEL_IMAGETYPE} -s | cut -d ' ' -f 1`
+ if [ $size -ge 1271 ]; then
+ rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
+ die "This kernel is too big for the c7x0 and will destroy your machine if you flash it!!!"
+ fi
+ ;;
+ *)
+ ;;
+ esac
}
do_deploy() {
diff --git a/packages/linux/triton-kernel_2.6.11.bb b/packages/linux/triton-kernel_2.6.11.bb
index 31e37a1c2c..5e95d969d1 100644
--- a/packages/linux/triton-kernel_2.6.11.bb
+++ b/packages/linux/triton-kernel_2.6.11.bb
@@ -6,12 +6,12 @@ PR = "r0"
KERNEL_SUFFIX = "triton"
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \
- ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.11/2.6.11-mm2/2.6.11-mm2.bz2;patch=1 \
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+ ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/${PV}/${PV}-mm2/${PV}-mm2.bz2;patch=1 \
file://patch-2.6.11-mm2-karo9.bz2;patch=1 \
file://defconfig"
-S = "${WORKDIR}/linux-2.6.11"
+S = "${WORKDIR}/linux-${PV}"
COMPATIBLE_HOST = 'arm.*-linux'
diff --git a/packages/lyx/lyx_1.3.6.bb b/packages/lyx/lyx_1.3.6.bb
index 4c9576f935..de58313b0a 100644
--- a/packages/lyx/lyx_1.3.6.bb
+++ b/packages/lyx/lyx_1.3.6.bb
@@ -3,7 +3,7 @@ SECTION = "x11/office"
LICENSE = "GPL"
HOMEPAGE = "http://www.lyx.org"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "boost"
+DEPENDS = "boost qt3x11"
RRECOMMENDS = "tetex"
PR = "r1"
diff --git a/packages/opie-aboutapplet/opie-aboutapplet_1.2.0.bb b/packages/opie-aboutapplet/opie-aboutapplet_1.2.1.bb
index ecbeb5270a..809db56b9f 100644
--- a/packages/opie-aboutapplet/opie-aboutapplet_1.2.0.bb
+++ b/packages/opie-aboutapplet/opie-aboutapplet_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/aboutapplet"
diff --git a/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb b/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb
index 2386350f73..9632bf4f0d 100644
--- a/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb
+++ b/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/aboutapplet"
diff --git a/packages/opie-addressbook/opie-addressbook_1.2.0.bb b/packages/opie-addressbook/opie-addressbook_1.2.1.bb
index 2218fb4d7e..a8bf6f7e5a 100644
--- a/packages/opie-addressbook/opie-addressbook_1.2.0.bb
+++ b/packages/opie-addressbook/opie-addressbook_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/addressbook \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-addressbook/opie-addressbook_cvs.bb b/packages/opie-addressbook/opie-addressbook_cvs.bb
index 78afc4ec3a..d16e6f41d3 100644
--- a/packages/opie-addressbook/opie-addressbook_cvs.bb
+++ b/packages/opie-addressbook/opie-addressbook_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/addressbook \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-advancedfm/opie-advancedfm_1.2.0.bb b/packages/opie-advancedfm/opie-advancedfm_1.2.1.bb
index a16cbafe69..8a4cc0ebc5 100644
--- a/packages/opie-advancedfm/opie-advancedfm_1.2.0.bb
+++ b/packages/opie-advancedfm/opie-advancedfm_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-advancedfm/opie-advancedfm_cvs.bb b/packages/opie-advancedfm/opie-advancedfm_cvs.bb
index f80ec9999b..bf7139ebbd 100644
--- a/packages/opie-advancedfm/opie-advancedfm_cvs.bb
+++ b/packages/opie-advancedfm/opie-advancedfm_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-alarm/opie-alarm_1.2.0.bb b/packages/opie-alarm/opie-alarm_1.2.1.bb
index 5903942551..ada72aea1b 100644
--- a/packages/opie-alarm/opie-alarm_1.2.0.bb
+++ b/packages/opie-alarm/opie-alarm_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/opiealarm \
file://01opiealarm "
diff --git a/packages/opie-alarm/opie-alarm_cvs.bb b/packages/opie-alarm/opie-alarm_cvs.bb
index de093e9f65..f66ce15dc5 100644
--- a/packages/opie-alarm/opie-alarm_cvs.bb
+++ b/packages/opie-alarm/opie-alarm_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
file://01opiealarm "
diff --git a/packages/opie-appearance/opie-appearance_1.2.0.bb b/packages/opie-appearance/opie-appearance_1.2.1.bb
index 08048ac15c..bad3343356 100644
--- a/packages/opie-appearance/opie-appearance_1.2.0.bb
+++ b/packages/opie-appearance/opie-appearance_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/appearance2 \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-appearance/opie-appearance_cvs.bb b/packages/opie-appearance/opie-appearance_cvs.bb
index 53cc88435f..b302e4ac5c 100644
--- a/packages/opie-appearance/opie-appearance_cvs.bb
+++ b/packages/opie-appearance/opie-appearance_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/appearance2 \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-aqpkg/opie-aqpkg_1.2.0.bb b/packages/opie-aqpkg/opie-aqpkg_1.2.1.bb
index 7ca77adf32..17a7683cef 100644
--- a/packages/opie-aqpkg/opie-aqpkg_1.2.0.bb
+++ b/packages/opie-aqpkg/opie-aqpkg_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/aqpkg \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-aqpkg/opie-aqpkg_cvs.bb b/packages/opie-aqpkg/opie-aqpkg_cvs.bb
index 96dd375e8b..0b6492216b 100644
--- a/packages/opie-aqpkg/opie-aqpkg_cvs.bb
+++ b/packages/opie-aqpkg/opie-aqpkg_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/aqpkg \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.0.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.1.bb
index ebf1dd027d..f1b992d7c8 100644
--- a/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.0.bb
+++ b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/autorotateapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb
index 75b1c9c1c3..971177ff28 100644
--- a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb
+++ b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/autorotateapplet \
${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-backgammon/opie-backgammon_1.2.0.bb b/packages/opie-backgammon/opie-backgammon_1.2.1.bb
index d0a72ed40c..0cae5c2a10 100644
--- a/packages/opie-backgammon/opie-backgammon_1.2.0.bb
+++ b/packages/opie-backgammon/opie-backgammon_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/backgammon \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-backgammon/opie-backgammon_cvs.bb b/packages/opie-backgammon/opie-backgammon_cvs.bb
index 1eb8633589..767e6ee379 100644
--- a/packages/opie-backgammon/opie-backgammon_cvs.bb
+++ b/packages/opie-backgammon/opie-backgammon_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/backgammon \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-backup/opie-backup_1.2.0.bb b/packages/opie-backup/opie-backup_1.2.1.bb
index e5f9fb2626..e0b1328815 100644
--- a/packages/opie-backup/opie-backup_1.2.0.bb
+++ b/packages/opie-backup/opie-backup_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/backup \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-backup/opie-backup_cvs.bb b/packages/opie-backup/opie-backup_cvs.bb
index 473efa9e24..112a884bbf 100644
--- a/packages/opie-backup/opie-backup_cvs.bb
+++ b/packages/opie-backup/opie-backup_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/backup \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-bartender/opie-bartender_1.2.0.bb b/packages/opie-bartender/opie-bartender_1.2.1.bb
index d7badd3ba4..40c46f0070 100644
--- a/packages/opie-bartender/opie-bartender_1.2.0.bb
+++ b/packages/opie-bartender/opie-bartender_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-bartender \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-bartender/opie-bartender_cvs.bb b/packages/opie-bartender/opie-bartender_cvs.bb
index 17d5c27639..f61e384c17 100644
--- a/packages/opie-bartender/opie-bartender_cvs.bb
+++ b/packages/opie-bartender/opie-bartender_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-bartender \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-batteryapplet/opie-batteryapplet_1.2.0.bb b/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb
index 38c2dc16b4..cb561d860d 100644
--- a/packages/opie-batteryapplet/opie-batteryapplet_1.2.0.bb
+++ b/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/batteryapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb
index 36595aab07..3260d8052f 100644
--- a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb
+++ b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/batteryapplet \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-bluepin/opie-bluepin_1.2.0.bb b/packages/opie-bluepin/opie-bluepin_1.2.1.bb
index fba2574c0d..6a69cec2f7 100644
--- a/packages/opie-bluepin/opie-bluepin_1.2.0.bb
+++ b/packages/opie-bluepin/opie-bluepin_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/blue-pin"
diff --git a/packages/opie-bluepin/opie-bluepin_cvs.bb b/packages/opie-bluepin/opie-bluepin_cvs.bb
index 6476cbd518..b912ef4430 100644
--- a/packages/opie-bluepin/opie-bluepin_cvs.bb
+++ b/packages/opie-bluepin/opie-bluepin_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/blue-pin"
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.0.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.1.bb
index dce8ca537a..43d21d82db 100644
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.0.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/applet \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics/bluetoothapplet"
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
index eb317a4f14..e782ee3992 100644
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \
${HANDHELDS_CVS};module=opie/pics/bluetoothapplet"
diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.0.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb
index fa834dc8e6..b048a02795 100644
--- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.0.bb
+++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/manager \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb
index 7c75c0575e..e613d5bfc4 100644
--- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb
+++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/manager \
${HANDHELDS_CVS};module=opie/apps \
diff --git a/packages/opie-bounce/opie-bounce_1.2.0.bb b/packages/opie-bounce/opie-bounce_1.2.1.bb
index 027bdb811a..3c49e91391 100644
--- a/packages/opie-bounce/opie-bounce_1.2.0.bb
+++ b/packages/opie-bounce/opie-bounce_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/bounce \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-bounce/opie-bounce_cvs.bb b/packages/opie-bounce/opie-bounce_cvs.bb
index 7c2158687a..bee8baa0eb 100644
--- a/packages/opie-bounce/opie-bounce_cvs.bb
+++ b/packages/opie-bounce/opie-bounce_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/bounce \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.0.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.1.bb
index 23e7d2f578..854ebd07fa 100644
--- a/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.0.bb
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/brightnessapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
index 4ea311bb75..679eb2bd52 100644
--- a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/brightnessapplet \
${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-button-settings/opie-button-settings_1.2.0.bb b/packages/opie-button-settings/opie-button-settings_1.2.1.bb
index 9b8250f223..6f1e29f4d5 100644
--- a/packages/opie-button-settings/opie-button-settings_1.2.0.bb
+++ b/packages/opie-button-settings/opie-button-settings_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/button \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-button-settings/opie-button-settings_cvs.bb b/packages/opie-button-settings/opie-button-settings_cvs.bb
index dacb95821b..7e6f8fd30c 100644
--- a/packages/opie-button-settings/opie-button-settings_cvs.bb
+++ b/packages/opie-button-settings/opie-button-settings_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/button \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-buzzword/opie-buzzword_1.2.0.bb b/packages/opie-buzzword/opie-buzzword_1.2.1.bb
index b435698e14..f87d0bbf1f 100644
--- a/packages/opie-buzzword/opie-buzzword_1.2.0.bb
+++ b/packages/opie-buzzword/opie-buzzword_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/buzzword \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-buzzword/opie-buzzword_cvs.bb b/packages/opie-buzzword/opie-buzzword_cvs.bb
index 5f67986396..588b946cde 100644
--- a/packages/opie-buzzword/opie-buzzword_cvs.bb
+++ b/packages/opie-buzzword/opie-buzzword_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/buzzword \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-calculator/opie-calculator_1.2.0.bb b/packages/opie-calculator/opie-calculator_1.2.1.bb
index 49f1944b85..984765fe89 100644
--- a/packages/opie-calculator/opie-calculator_1.2.0.bb
+++ b/packages/opie-calculator/opie-calculator_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/calculator \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-calculator/opie-calculator_cvs.bb b/packages/opie-calculator/opie-calculator_cvs.bb
index 30b0675b0c..fee063f40c 100644
--- a/packages/opie-calculator/opie-calculator_cvs.bb
+++ b/packages/opie-calculator/opie-calculator_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r1"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/calculator \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-calibrate/opie-calibrate_1.2.0.bb b/packages/opie-calibrate/opie-calibrate_1.2.1.bb
index c5cc118fc8..4edc3ffe74 100644
--- a/packages/opie-calibrate/opie-calibrate_1.2.0.bb
+++ b/packages/opie-calibrate/opie-calibrate_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate"
diff --git a/packages/opie-calibrate/opie-calibrate_cvs.bb b/packages/opie-calibrate/opie-calibrate_cvs.bb
index a3fb51513c..84a63c1fdb 100644
--- a/packages/opie-calibrate/opie-calibrate_cvs.bb
+++ b/packages/opie-calibrate/opie-calibrate_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate"
diff --git a/packages/opie-camera/opie-camera_1.2.0.bb b/packages/opie-camera/opie-camera_1.2.1.bb
index c8266fcec3..22b4c9b773 100644
--- a/packages/opie-camera/opie-camera_1.2.0.bb
+++ b/packages/opie-camera/opie-camera_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/${APPNAME} \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-camera/opie-camera_cvs.bb b/packages/opie-camera/opie-camera_cvs.bb
index b4262bba2f..ce8fdf7c50 100644
--- a/packages/opie-camera/opie-camera_cvs.bb
+++ b/packages/opie-camera/opie-camera_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-cardmon/opie-cardmon_1.2.0.bb b/packages/opie-cardmon/opie-cardmon_1.2.1.bb
index 36514091e0..7283fa75f8 100644
--- a/packages/opie-cardmon/opie-cardmon_1.2.0.bb
+++ b/packages/opie-cardmon/opie-cardmon_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/cardmon \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-cardmon/opie-cardmon_cvs.bb b/packages/opie-cardmon/opie-cardmon_cvs.bb
index c7ea49b9a3..0f51227ddf 100644
--- a/packages/opie-cardmon/opie-cardmon_cvs.bb
+++ b/packages/opie-cardmon/opie-cardmon_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/cardmon \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-checkbook/opie-checkbook_1.2.0.bb b/packages/opie-checkbook/opie-checkbook_1.2.1.bb
index a16cbafe69..8a4cc0ebc5 100644
--- a/packages/opie-checkbook/opie-checkbook_1.2.0.bb
+++ b/packages/opie-checkbook/opie-checkbook_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-checkbook/opie-checkbook_cvs.bb b/packages/opie-checkbook/opie-checkbook_cvs.bb
index f80ec9999b..bf7139ebbd 100644
--- a/packages/opie-checkbook/opie-checkbook_cvs.bb
+++ b/packages/opie-checkbook/opie-checkbook_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-citytime/opie-citytime_1.2.0.bb b/packages/opie-citytime/opie-citytime_1.2.1.bb
index 7fcf124cdd..29d244a555 100644
--- a/packages/opie-citytime/opie-citytime_1.2.0.bb
+++ b/packages/opie-citytime/opie-citytime_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/citytime \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-citytime/opie-citytime_cvs.bb b/packages/opie-citytime/opie-citytime_cvs.bb
index a275bc0106..07672df68d 100644
--- a/packages/opie-citytime/opie-citytime_cvs.bb
+++ b/packages/opie-citytime/opie-citytime_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/citytime \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.0.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.1.bb
index 9d134a8b12..b799edfa67 100644
--- a/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.0.bb
+++ b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clipboardapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb
index 1978412a3a..4c204aad92 100644
--- a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb
+++ b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clipboardapplet \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-clock/opie-clock_1.2.0.bb b/packages/opie-clock/opie-clock_1.2.1.bb
index 0cf3b3df46..f86c3d2832 100644
--- a/packages/opie-clock/opie-clock_1.2.0.bb
+++ b/packages/opie-clock/opie-clock_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/clock \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-clock/opie-clock_cvs.bb b/packages/opie-clock/opie-clock_cvs.bb
index 157a1d5a5d..525cf98cf5 100644
--- a/packages/opie-clock/opie-clock_cvs.bb
+++ b/packages/opie-clock/opie-clock_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/clock \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-clockapplet/opie-clockapplet_1.2.0.bb b/packages/opie-clockapplet/opie-clockapplet_1.2.1.bb
index ec97d0ad1e..e315cd4c46 100644
--- a/packages/opie-clockapplet/opie-clockapplet_1.2.0.bb
+++ b/packages/opie-clockapplet/opie-clockapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clockapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-clockapplet/opie-clockapplet_cvs.bb b/packages/opie-clockapplet/opie-clockapplet_cvs.bb
index 362a5f9b89..cbe50f3b64 100644
--- a/packages/opie-clockapplet/opie-clockapplet_cvs.bb
+++ b/packages/opie-clockapplet/opie-clockapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clockapplet \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-confeditor/opie-confeditor_1.2.0.bb b/packages/opie-confeditor/opie-confeditor_1.2.1.bb
index e20ad96ae0..dce2d43da5 100644
--- a/packages/opie-confeditor/opie-confeditor_1.2.0.bb
+++ b/packages/opie-confeditor/opie-confeditor_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/confedit \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-confeditor/opie-confeditor_cvs.bb b/packages/opie-confeditor/opie-confeditor_cvs.bb
index 7a2294baf1..ce322cd140 100644
--- a/packages/opie-confeditor/opie-confeditor_cvs.bb
+++ b/packages/opie-confeditor/opie-confeditor_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/confedit \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-console/opie-console_1.2.0.bb b/packages/opie-console/opie-console_1.2.1.bb
index 9a926d8a92..795e3fcb11 100644
--- a/packages/opie-console/opie-console_1.2.0.bb
+++ b/packages/opie-console/opie-console_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-console/opie-console_cvs.bb b/packages/opie-console/opie-console_cvs.bb
index a2e5409318..a2adfdc927 100644
--- a/packages/opie-console/opie-console_cvs.bb
+++ b/packages/opie-console/opie-console_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r1"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-dagger/opie-dagger_1.2.0.bb b/packages/opie-dagger/opie-dagger_1.2.1.bb
index af35ed8937..52b34898aa 100644
--- a/packages/opie-dagger/opie-dagger_1.2.0.bb
+++ b/packages/opie-dagger/opie-dagger_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/dagger \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-dagger/opie-dagger_cvs.bb b/packages/opie-dagger/opie-dagger_cvs.bb
index f365a3a669..7fa7d88741 100644
--- a/packages/opie-dagger/opie-dagger_cvs.bb
+++ b/packages/opie-dagger/opie-dagger_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/dagger \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-dasher/opie-dasher_1.2.0.bb b/packages/opie-dasher/opie-dasher_1.2.1.bb
index 419471ec66..a8b5176961 100644
--- a/packages/opie-dasher/opie-dasher_1.2.0.bb
+++ b/packages/opie-dasher/opie-dasher_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dasher \
${HANDHELDS_CVS};tag=${TAG};module=opie/share "
diff --git a/packages/opie-dasher/opie-dasher_cvs.bb b/packages/opie-dasher/opie-dasher_cvs.bb
index eb61172264..6228f1d8a2 100644
--- a/packages/opie-dasher/opie-dasher_cvs.bb
+++ b/packages/opie-dasher/opie-dasher_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dasher \
${HANDHELDS_CVS};module=opie/share "
diff --git a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.0.bb b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.1.bb
index 75db4f7451..515c5c9de1 100644
--- a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.0.bb
+++ b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/birthday "
diff --git a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb
index 1c0aa11fa2..88149e2b84 100644
--- a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb
+++ b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/birthday "
diff --git a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.0.bb b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.1.bb
index 2840a80467..bf937db7e1 100644
--- a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.0.bb
+++ b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/christian "
diff --git a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb
index a05991f39e..e1012e109f 100644
--- a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb
+++ b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/christian "
diff --git a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.0.bb b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.1.bb
index 8c5182e5c6..d6d19655a7 100644
--- a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.0.bb
+++ b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/national \
${HANDHELDS_CVS};tag=${TAG};module=opie/etc/nationaldays "
diff --git a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb
index 4f056ac324..5d1997afc7 100644
--- a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb
+++ b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/national \
${HANDHELDS_CVS};module=opie/etc/nationaldays "
diff --git a/packages/opie-datebook/opie-datebook_1.2.0.bb b/packages/opie-datebook/opie-datebook_1.2.1.bb
index bd36da1f64..f4abfbaf9d 100644
--- a/packages/opie-datebook/opie-datebook_1.2.0.bb
+++ b/packages/opie-datebook/opie-datebook_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-datebook/opie-datebook_cvs.bb b/packages/opie-datebook/opie-datebook_cvs.bb
index f1fd5a615a..5044136153 100644
--- a/packages/opie-datebook/opie-datebook_cvs.bb
+++ b/packages/opie-datebook/opie-datebook_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-deco-flat/opie-deco-flat_1.2.0.bb b/packages/opie-deco-flat/opie-deco-flat_1.2.1.bb
index dc60cdd9ef..59aa1d2a23 100644
--- a/packages/opie-deco-flat/opie-deco-flat_1.2.0.bb
+++ b/packages/opie-deco-flat/opie-deco-flat_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/flat "
diff --git a/packages/opie-deco-flat/opie-deco-flat_cvs.bb b/packages/opie-deco-flat/opie-deco-flat_cvs.bb
index e04d6cbde3..b270838fc7 100644
--- a/packages/opie-deco-flat/opie-deco-flat_cvs.bb
+++ b/packages/opie-deco-flat/opie-deco-flat_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/flat "
diff --git a/packages/opie-deco-liquid/opie-deco-liquid_1.2.0.bb b/packages/opie-deco-liquid/opie-deco-liquid_1.2.1.bb
index 91002e722e..6f07a57e40 100644
--- a/packages/opie-deco-liquid/opie-deco-liquid_1.2.0.bb
+++ b/packages/opie-deco-liquid/opie-deco-liquid_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/liquid "
diff --git a/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb b/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb
index 138ac92a38..e5d0281582 100644
--- a/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb
+++ b/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/liquid "
diff --git a/packages/opie-deco-polished/opie-deco-polished_1.2.0.bb b/packages/opie-deco-polished/opie-deco-polished_1.2.1.bb
index 1702995dfb..2dde102adf 100644
--- a/packages/opie-deco-polished/opie-deco-polished_1.2.0.bb
+++ b/packages/opie-deco-polished/opie-deco-polished_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/polished "
diff --git a/packages/opie-deco-polished/opie-deco-polished_cvs.bb b/packages/opie-deco-polished/opie-deco-polished_cvs.bb
index 26d66dda74..045d5bcb03 100644
--- a/packages/opie-deco-polished/opie-deco-polished_cvs.bb
+++ b/packages/opie-deco-polished/opie-deco-polished_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/polished "
diff --git a/packages/opie-doctab/opie-doctab_1.2.0.bb b/packages/opie-doctab/opie-doctab_1.2.1.bb
index 35ecb38030..317b556300 100644
--- a/packages/opie-doctab/opie-doctab_1.2.0.bb
+++ b/packages/opie-doctab/opie-doctab_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/doctab \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
diff --git a/packages/opie-doctab/opie-doctab_cvs.bb b/packages/opie-doctab/opie-doctab_cvs.bb
index beb7beb8ab..d85f04eb50 100644
--- a/packages/opie-doctab/opie-doctab_cvs.bb
+++ b/packages/opie-doctab/opie-doctab_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/doctab \
${HANDHELDS_CVS};module=opie/apps \
diff --git a/packages/opie-drawpad/opie-drawpad_1.2.0.bb b/packages/opie-drawpad/opie-drawpad_1.2.1.bb
index dd1dff31ef..d4a6c7a665 100644
--- a/packages/opie-drawpad/opie-drawpad_1.2.0.bb
+++ b/packages/opie-drawpad/opie-drawpad_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/graphics/drawpad \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-drawpad/opie-drawpad_cvs.bb b/packages/opie-drawpad/opie-drawpad_cvs.bb
index dccb7586b6..e4b0296d4e 100644
--- a/packages/opie-drawpad/opie-drawpad_cvs.bb
+++ b/packages/opie-drawpad/opie-drawpad_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/drawpad \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-dvorak/opie-dvorak_1.2.0.bb b/packages/opie-dvorak/opie-dvorak_1.2.1.bb
index 785774b0c1..f7c4394c3f 100644
--- a/packages/opie-dvorak/opie-dvorak_1.2.0.bb
+++ b/packages/opie-dvorak/opie-dvorak_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dvorak \
${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard"
diff --git a/packages/opie-dvorak/opie-dvorak_cvs.bb b/packages/opie-dvorak/opie-dvorak_cvs.bb
index a4ab26b87f..2216f14acb 100644
--- a/packages/opie-dvorak/opie-dvorak_cvs.bb
+++ b/packages/opie-dvorak/opie-dvorak_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dvorak \
${HANDHELDS_CVS};module=opie/inputmethods/pickboard"
diff --git a/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.0.bb b/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.1.bb
index 128e3663f0..68af4cfec6 100644
--- a/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.0.bb
+++ b/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb b/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb
index b3fd10733b..e4312a747f 100644
--- a/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb
+++ b/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r1"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-euroconv/opie-euroconv_1.2.0.bb b/packages/opie-euroconv/opie-euroconv_1.2.1.bb
index 76a664dafd..2397fda504 100644
--- a/packages/opie-euroconv/opie-euroconv_1.2.0.bb
+++ b/packages/opie-euroconv/opie-euroconv_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/euroconv \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-euroconv/opie-euroconv_cvs.bb b/packages/opie-euroconv/opie-euroconv_cvs.bb
index a98ce41b1d..94a513e0ce 100644
--- a/packages/opie-euroconv/opie-euroconv_cvs.bb
+++ b/packages/opie-euroconv/opie-euroconv_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/euroconv \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-examples-python/opie-examples-python_1.2.0.bb b/packages/opie-examples-python/opie-examples-python_1.2.1.bb
index 4ec2bf2a16..cc41ab54ee 100644
--- a/packages/opie-examples-python/opie-examples-python_1.2.0.bb
+++ b/packages/opie-examples-python/opie-examples-python_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/examples/python \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-examples-python/opie-examples-python_cvs.bb b/packages/opie-examples-python/opie-examples-python_cvs.bb
index 4986ef7667..5aaa9b797a 100644
--- a/packages/opie-examples-python/opie-examples-python_cvs.bb
+++ b/packages/opie-examples-python/opie-examples-python_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/examples/python \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-examples/opie-examples_1.2.0.bb b/packages/opie-examples/opie-examples_1.2.1.bb
index 92cb5b3d74..7b28fc1a9c 100644
--- a/packages/opie-examples/opie-examples_1.2.0.bb
+++ b/packages/opie-examples/opie-examples_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/examples \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-examples/opie-examples_cvs.bb b/packages/opie-examples/opie-examples_cvs.bb
index 4afa2c665f..746bd166d5 100644
--- a/packages/opie-examples/opie-examples_cvs.bb
+++ b/packages/opie-examples/opie-examples_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/examples \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-eye/opie-eye_1.2.0.bb b/packages/opie-eye/opie-eye_1.2.1.bb
index ad17578494..0fc47e6b10 100644
--- a/packages/opie-eye/opie-eye_1.2.0.bb
+++ b/packages/opie-eye/opie-eye_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/graphics/opie-eye \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-eye/opie-eye_cvs.bb b/packages/opie-eye/opie-eye_cvs.bb
index 7e39e1b3f8..fafe5d4e4f 100644
--- a/packages/opie-eye/opie-eye_cvs.bb
+++ b/packages/opie-eye/opie-eye_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/opie-eye \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-fifteen/opie-fifteen_1.2.0.bb b/packages/opie-fifteen/opie-fifteen_1.2.1.bb
index 83efc80b0b..d80333bada 100644
--- a/packages/opie-fifteen/opie-fifteen_1.2.0.bb
+++ b/packages/opie-fifteen/opie-fifteen_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/fifteen \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-fifteen/opie-fifteen_cvs.bb b/packages/opie-fifteen/opie-fifteen_cvs.bb
index fc6840fb75..57e2a65ad5 100644
--- a/packages/opie-fifteen/opie-fifteen_cvs.bb
+++ b/packages/opie-fifteen/opie-fifteen_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/fifteen \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-formatter/opie-formatter_1.2.0.bb b/packages/opie-formatter/opie-formatter_1.2.1.bb
index ff336a8358..f8020d60a0 100644
--- a/packages/opie-formatter/opie-formatter_1.2.0.bb
+++ b/packages/opie-formatter/opie-formatter_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/formatter \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-formatter/opie-formatter_cvs.bb b/packages/opie-formatter/opie-formatter_cvs.bb
index 422b5f255b..6f8a544d7a 100644
--- a/packages/opie-formatter/opie-formatter_cvs.bb
+++ b/packages/opie-formatter/opie-formatter_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/formatter \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-freetype/opie-freetype_1.2.0.bb b/packages/opie-freetype/opie-freetype_1.2.1.bb
index c9475e227f..81996992a2 100644
--- a/packages/opie-freetype/opie-freetype_1.2.0.bb
+++ b/packages/opie-freetype/opie-freetype_1.2.1.bb
@@ -1,5 +1,4 @@
include ${PN}.inc
-PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/freetype"
diff --git a/packages/opie-freetype/opie-freetype_cvs.bb b/packages/opie-freetype/opie-freetype_cvs.bb
index c9c4bb4739..e881398d93 100644
--- a/packages/opie-freetype/opie-freetype_cvs.bb
+++ b/packages/opie-freetype/opie-freetype_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r1"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/freetype"
diff --git a/packages/opie-ftp/opie-ftp_1.2.0.bb b/packages/opie-ftp/opie-ftp_1.2.1.bb
index 93b04e0bc8..7a7335ca67 100644
--- a/packages/opie-ftp/opie-ftp_1.2.0.bb
+++ b/packages/opie-ftp/opie-ftp_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieftp \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-ftp/opie-ftp_cvs.bb b/packages/opie-ftp/opie-ftp_cvs.bb
index 4cafd94eff..22d27c433c 100644
--- a/packages/opie-ftp/opie-ftp_cvs.bb
+++ b/packages/opie-ftp/opie-ftp_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieftp \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-ftplib/opie-ftplib_1.2.0.bb b/packages/opie-ftplib/opie-ftplib_1.2.1.bb
index 597f415aa4..0339703a5d 100644
--- a/packages/opie-ftplib/opie-ftplib_1.2.0.bb
+++ b/packages/opie-ftplib/opie-ftplib_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/ftplib"
diff --git a/packages/opie-ftplib/opie-ftplib_cvs.bb b/packages/opie-ftplib/opie-ftplib_cvs.bb
index e79e9e68ac..f5d1affd57 100644
--- a/packages/opie-ftplib/opie-ftplib_cvs.bb
+++ b/packages/opie-ftplib/opie-ftplib_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/ftplib"
diff --git a/packages/opie-go/opie-go_1.2.0.bb b/packages/opie-go/opie-go_1.2.1.bb
index b1dd4d735b..4c9f590e9e 100644
--- a/packages/opie-go/opie-go_1.2.0.bb
+++ b/packages/opie-go/opie-go_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/go \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-go/opie-go_cvs.bb b/packages/opie-go/opie-go_cvs.bb
index e75b928b0e..5f510859e2 100644
--- a/packages/opie-go/opie-go_cvs.bb
+++ b/packages/opie-go/opie-go_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/go \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.0.bb b/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.1.bb
index 0bf50e1195..19d2a29213 100644
--- a/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.0.bb
+++ b/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-gutenbrowser \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb b/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb
index bf6cd398df..22ceabe5f3 100644
--- a/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb
+++ b/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-gutenbrowser \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-handwriting/opie-handwriting_1.2.0.bb b/packages/opie-handwriting/opie-handwriting_1.2.1.bb
index 12d4ee9661..ba3da45f95 100644
--- a/packages/opie-handwriting/opie-handwriting_1.2.0.bb
+++ b/packages/opie-handwriting/opie-handwriting_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/handwriting \
${HANDHELDS_CVS};tag=${TAG};module=opie/etc/qimpen"
diff --git a/packages/opie-handwriting/opie-handwriting_cvs.bb b/packages/opie-handwriting/opie-handwriting_cvs.bb
index badae38568..2a6f4e4709 100644
--- a/packages/opie-handwriting/opie-handwriting_cvs.bb
+++ b/packages/opie-handwriting/opie-handwriting_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/handwriting \
${HANDHELDS_CVS};module=opie/etc/qimpen"
diff --git a/packages/opie-help-en/opie-help-en_1.2.0.bb b/packages/opie-help-en/opie-help-en_1.2.1.bb
index 280f9fa807..7bf8bd0ad4 100644
--- a/packages/opie-help-en/opie-help-en_1.2.0.bb
+++ b/packages/opie-help-en/opie-help-en_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/help/en/html"
diff --git a/packages/opie-help-en/opie-help-en_cvs.bb b/packages/opie-help-en/opie-help-en_cvs.bb
index 129ff492e0..1da35289f0 100644
--- a/packages/opie-help-en/opie-help-en_cvs.bb
+++ b/packages/opie-help-en/opie-help-en_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/help/en/html "
diff --git a/packages/opie-textedit/opie-textedit_1.2.0.bb b/packages/opie-helpbrowser/opie-helpbrowser_1.2.1.bb
index 3ac2657526..f2e144d3ca 100644
--- a/packages/opie-textedit/opie-textedit_1.2.0.bb
+++ b/packages/opie-helpbrowser/opie-helpbrowser_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb b/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb
index b404155773..f63eab6eb8 100644
--- a/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb
+++ b/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-homeapplet/opie-homeapplet_1.2.0.bb b/packages/opie-homeapplet/opie-homeapplet_1.2.1.bb
index 0ff06b48a4..b80e85ac52 100644
--- a/packages/opie-homeapplet/opie-homeapplet_1.2.0.bb
+++ b/packages/opie-homeapplet/opie-homeapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/homeapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-homeapplet/opie-homeapplet_cvs.bb b/packages/opie-homeapplet/opie-homeapplet_cvs.bb
index 45f3601a2f..43a9ec69ee 100644
--- a/packages/opie-homeapplet/opie-homeapplet_cvs.bb
+++ b/packages/opie-homeapplet/opie-homeapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/homeapplet \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-i18n/opie-i18n_1.2.0.bb b/packages/opie-i18n/opie-i18n_1.2.1.bb
index dc094e3986..b5011c0501 100644
--- a/packages/opie-i18n/opie-i18n_1.2.0.bb
+++ b/packages/opie-i18n/opie-i18n_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/i18n \
${HANDHELDS_CVS};tag=${TAG};module=opie/etc/dict"
diff --git a/packages/opie-i18n/opie-i18n_cvs.bb b/packages/opie-i18n/opie-i18n_cvs.bb
index a8b119b3e8..0e694f2dd9 100644
--- a/packages/opie-i18n/opie-i18n_cvs.bb
+++ b/packages/opie-i18n/opie-i18n_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r1"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/i18n \
${HANDHELDS_CVS};module=opie/etc/dict"
diff --git a/packages/opie-i18n/opie-lrelease-native_1.2.0.bb b/packages/opie-i18n/opie-lrelease-native_1.2.1.bb
index 699a72256c..699a72256c 100644
--- a/packages/opie-i18n/opie-lrelease-native_1.2.0.bb
+++ b/packages/opie-i18n/opie-lrelease-native_1.2.1.bb
diff --git a/packages/opie-i18n/opie-lrelease-native_cvs.bb b/packages/opie-i18n/opie-lrelease-native_cvs.bb
index e6809cc9da..f2e3718a23 100644
--- a/packages/opie-i18n/opie-lrelease-native_cvs.bb
+++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lrelease \
${HANDHELDS_CVS};module=opie/development/translation/shared"
diff --git a/packages/opie-i18n/opie-lupdate-native_1.2.0.bb b/packages/opie-i18n/opie-lupdate-native_1.2.1.bb
index d4e7f18284..d4e7f18284 100644
--- a/packages/opie-i18n/opie-lupdate-native_1.2.0.bb
+++ b/packages/opie-i18n/opie-lupdate-native_1.2.1.bb
diff --git a/packages/opie-i18n/opie-lupdate-native_cvs.bb b/packages/opie-i18n/opie-lupdate-native_cvs.bb
index 57fba3893e..08ae8900b0 100644
--- a/packages/opie-i18n/opie-lupdate-native_cvs.bb
+++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lupdate \
${HANDHELDS_CVS};module=opie/development/translation/shared"
diff --git a/packages/opie-icon-reload/opie-icon-reload_1.2.0.bb b/packages/opie-icon-reload/opie-icon-reload_1.2.1.bb
index 397746ccb4..c541bc78ed 100644
--- a/packages/opie-icon-reload/opie-icon-reload_1.2.0.bb
+++ b/packages/opie-icon-reload/opie-icon-reload_1.2.1.bb
@@ -1,5 +1,4 @@
include ${PN}.inc
-PR = "r0"
diff --git a/packages/opie-icon-reload/opie-icon-reload_cvs.bb b/packages/opie-icon-reload/opie-icon-reload_cvs.bb
index 127dcb1949..b2feb383cf 100644
--- a/packages/opie-icon-reload/opie-icon-reload_cvs.bb
+++ b/packages/opie-icon-reload/opie-icon-reload_cvs.bb
@@ -1,5 +1,4 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
diff --git a/packages/opie-irc/opie-irc_1.2.0.bb b/packages/opie-irc/opie-irc_1.2.1.bb
index 4108f65bc6..a186316b10 100644
--- a/packages/opie-irc/opie-irc_1.2.0.bb
+++ b/packages/opie-irc/opie-irc_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieirc \
${HANDHELDS_CVS};tag=${TAG};module=opie/help \
diff --git a/packages/opie-irc/opie-irc_cvs.bb b/packages/opie-irc/opie-irc_cvs.bb
index 687ae9a7de..eba2a14276 100644
--- a/packages/opie-irc/opie-irc_cvs.bb
+++ b/packages/opie-irc/opie-irc_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieirc \
${HANDHELDS_CVS};module=opie/help \
diff --git a/packages/opie-irdaapplet/opie-irdaapplet_1.2.0.bb b/packages/opie-irdaapplet/opie-irdaapplet_1.2.1.bb
index dbafa4b902..10cacd8a75 100644
--- a/packages/opie-irdaapplet/opie-irdaapplet_1.2.0.bb
+++ b/packages/opie-irdaapplet/opie-irdaapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/irdaapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
index 08c38b022b..3972be6cba 100644
--- a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
+++ b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/irdaapplet \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-jumpx/opie-jumpx_1.2.0.bb b/packages/opie-jumpx/opie-jumpx_1.2.1.bb
index 5781d937f2..24b86582c5 100644
--- a/packages/opie-jumpx/opie-jumpx_1.2.0.bb
+++ b/packages/opie-jumpx/opie-jumpx_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/jumpx \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-jumpx/opie-jumpx_cvs.bb b/packages/opie-jumpx/opie-jumpx_cvs.bb
index a328ee6cf3..632905e5b3 100644
--- a/packages/opie-jumpx/opie-jumpx_cvs.bb
+++ b/packages/opie-jumpx/opie-jumpx_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/jumpx \
${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-kbill/opie-kbill_1.2.0.bb b/packages/opie-kbill/opie-kbill_1.2.1.bb
index 61d002a8a2..90f2a1c1b8 100644
--- a/packages/opie-kbill/opie-kbill_1.2.0.bb
+++ b/packages/opie-kbill/opie-kbill_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kbill \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-kbill/opie-kbill_cvs.bb b/packages/opie-kbill/opie-kbill_cvs.bb
index 772d76ead9..26e56daf4c 100644
--- a/packages/opie-kbill/opie-kbill_cvs.bb
+++ b/packages/opie-kbill/opie-kbill_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kbill \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-kcheckers/opie-kcheckers_1.2.0.bb b/packages/opie-kcheckers/opie-kcheckers_1.2.1.bb
index 6510ddee84..868d99e868 100644
--- a/packages/opie-kcheckers/opie-kcheckers_1.2.0.bb
+++ b/packages/opie-kcheckers/opie-kcheckers_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kcheckers \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-kcheckers/opie-kcheckers_cvs.bb b/packages/opie-kcheckers/opie-kcheckers_cvs.bb
index f1381ee950..7b85d1242c 100644
--- a/packages/opie-kcheckers/opie-kcheckers_cvs.bb
+++ b/packages/opie-kcheckers/opie-kcheckers_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kcheckers \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-keyboard/opie-keyboard_1.2.0.bb b/packages/opie-keyboard/opie-keyboard_1.2.1.bb
index 153521084e..ec608f70d9 100644
--- a/packages/opie-keyboard/opie-keyboard_1.2.0.bb
+++ b/packages/opie-keyboard/opie-keyboard_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/keyboard "
diff --git a/packages/opie-keyboard/opie-keyboard_cvs.bb b/packages/opie-keyboard/opie-keyboard_cvs.bb
index 1b5b61a89f..c8d2f24319 100644
--- a/packages/opie-keyboard/opie-keyboard_cvs.bb
+++ b/packages/opie-keyboard/opie-keyboard_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/keyboard "
diff --git a/packages/opie-keypebble/opie-keypebble_1.2.0.bb b/packages/opie-keypebble/opie-keypebble_1.2.1.bb
index bc24d0bf42..ec7979ea82 100644
--- a/packages/opie-keypebble/opie-keypebble_1.2.0.bb
+++ b/packages/opie-keypebble/opie-keypebble_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/comm/${APPNAME} \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-keypebble/opie-keypebble_cvs.bb b/packages/opie-keypebble/opie-keypebble_cvs.bb
index 44453c7f11..62f6910c24 100644
--- a/packages/opie-keypebble/opie-keypebble_cvs.bb
+++ b/packages/opie-keypebble/opie-keypebble_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/comm/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-keytabs/opie-keytabs_1.2.0.bb b/packages/opie-keytabs/opie-keytabs_1.2.1.bb
index 63dfec7ccd..71588448ee 100644
--- a/packages/opie-keytabs/opie-keytabs_1.2.0.bb
+++ b/packages/opie-keytabs/opie-keytabs_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/etc"
diff --git a/packages/opie-keytabs/opie-keytabs_cvs.bb b/packages/opie-keytabs/opie-keytabs_cvs.bb
index 1fc28422f6..7948e68e4d 100644
--- a/packages/opie-keytabs/opie-keytabs_cvs.bb
+++ b/packages/opie-keytabs/opie-keytabs_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/etc"
diff --git a/packages/opie-keyview/opie-keyview_1.2.0.bb b/packages/opie-keyview/opie-keyview_1.2.1.bb
index eeb3d315e4..f922d2f629 100644
--- a/packages/opie-keyview/opie-keyview_1.2.0.bb
+++ b/packages/opie-keyview/opie-keyview_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/keyview "
diff --git a/packages/opie-keyview/opie-keyview_cvs.bb b/packages/opie-keyview/opie-keyview_cvs.bb
index 5b713176de..01147d5543 100644
--- a/packages/opie-keyview/opie-keyview_cvs.bb
+++ b/packages/opie-keyview/opie-keyview_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/development/keyview "
diff --git a/packages/opie-kjumpx/opie-kjumpx_1.2.0.bb b/packages/opie-kjumpx/opie-kjumpx_1.2.1.bb
index 7ba4d3c1b2..6b29e8833d 100644
--- a/packages/opie-kjumpx/opie-kjumpx_1.2.0.bb
+++ b/packages/opie-kjumpx/opie-kjumpx_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/kjumpx \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-kjumpx/opie-kjumpx_cvs.bb b/packages/opie-kjumpx/opie-kjumpx_cvs.bb
index 3b3e346fb2..2283e58c17 100644
--- a/packages/opie-kjumpx/opie-kjumpx_cvs.bb
+++ b/packages/opie-kjumpx/opie-kjumpx_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/kjumpx \
${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-kpacman/opie-kpacman_1.2.0.bb b/packages/opie-kpacman/opie-kpacman_1.2.1.bb
index 948896ac6a..b8372fbbad 100644
--- a/packages/opie-kpacman/opie-kpacman_1.2.0.bb
+++ b/packages/opie-kpacman/opie-kpacman_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kpacman \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-kpacman/opie-kpacman_cvs.bb b/packages/opie-kpacman/opie-kpacman_cvs.bb
index 8c406643ca..fe1fa1e11f 100644
--- a/packages/opie-kpacman/opie-kpacman_cvs.bb
+++ b/packages/opie-kpacman/opie-kpacman_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kpacman \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-language/opie-language_1.2.0.bb b/packages/opie-language/opie-language_1.2.1.bb
index e3cf1de78a..891999851d 100644
--- a/packages/opie-language/opie-language_1.2.0.bb
+++ b/packages/opie-language/opie-language_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/language \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-language/opie-language_cvs.bb b/packages/opie-language/opie-language_cvs.bb
index 2dc8186714..89e7455ff7 100644
--- a/packages/opie-language/opie-language_cvs.bb
+++ b/packages/opie-language/opie-language_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/language \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-launcher-settings/opie-launcher-settings_1.2.0.bb b/packages/opie-launcher-settings/opie-launcher-settings_1.2.1.bb
index 65aba115b7..0abedcaab7 100644
--- a/packages/opie-launcher-settings/opie-launcher-settings_1.2.0.bb
+++ b/packages/opie-launcher-settings/opie-launcher-settings_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/launcher \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
diff --git a/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb b/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb
index 966e7f30a8..63b522d682 100644
--- a/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb
+++ b/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/launcher \
${HANDHELDS_CVS};module=opie/apps \
diff --git a/packages/opie-libqrsync/opie-libqrsync_1.2.0.bb b/packages/opie-libqrsync/opie-libqrsync_1.2.1.bb
index 21a65edd94..884cce4a93 100644
--- a/packages/opie-libqrsync/opie-libqrsync_1.2.0.bb
+++ b/packages/opie-libqrsync/opie-libqrsync_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/rsync"
diff --git a/packages/opie-libqrsync/opie-libqrsync_cvs.bb b/packages/opie-libqrsync/opie-libqrsync_cvs.bb
index e01ac684e2..5e2ac04738 100644
--- a/packages/opie-libqrsync/opie-libqrsync_cvs.bb
+++ b/packages/opie-libqrsync/opie-libqrsync_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/rsync"
diff --git a/packages/opie-light-and-power/opie-light-and-power_1.2.0.bb b/packages/opie-light-and-power/opie-light-and-power_1.2.1.bb
index f168a415d7..c881fdcf41 100644
--- a/packages/opie-light-and-power/opie-light-and-power_1.2.0.bb
+++ b/packages/opie-light-and-power/opie-light-and-power_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/light-and-power \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-light-and-power/opie-light-and-power_cvs.bb b/packages/opie-light-and-power/opie-light-and-power_cvs.bb
index 6796dc92f8..ca9bd0589c 100644
--- a/packages/opie-light-and-power/opie-light-and-power_cvs.bb
+++ b/packages/opie-light-and-power/opie-light-and-power_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/light-and-power \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-lockapplet/opie-lockapplet_1.2.0.bb b/packages/opie-lockapplet/opie-lockapplet_1.2.1.bb
index 4b6bb6270f..46163c7323 100644
--- a/packages/opie-lockapplet/opie-lockapplet_1.2.0.bb
+++ b/packages/opie-lockapplet/opie-lockapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/lockapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
diff --git a/packages/opie-lockapplet/opie-lockapplet_cvs.bb b/packages/opie-lockapplet/opie-lockapplet_cvs.bb
index f13f693793..b800a9b334 100644
--- a/packages/opie-lockapplet/opie-lockapplet_cvs.bb
+++ b/packages/opie-lockapplet/opie-lockapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/lockapplet \
${HANDHELDS_CVS};module=opie/pics "
diff --git a/packages/opie-login/opie-login_1.2.0.bb b/packages/opie-login/opie-login_1.2.1.bb
index 593459138b..a8753f95ce 100644
--- a/packages/opie-login/opie-login_1.2.0.bb
+++ b/packages/opie-login/opie-login_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/${APPNAME} \
${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
diff --git a/packages/opie-login/opie-login_cvs.bb b/packages/opie-login/opie-login_cvs.bb
index a7455db7ed..cd25106712 100644
--- a/packages/opie-login/opie-login_cvs.bb
+++ b/packages/opie-login/opie-login_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/${APPNAME} \
${HANDHELDS_CVS};module=opie/core/apps/calibrate \
diff --git a/packages/opie-logoutapplet/opie-logoutapplet_1.2.0.bb b/packages/opie-logoutapplet/opie-logoutapplet_1.2.1.bb
index fd9b21da81..0da3119e9d 100644
--- a/packages/opie-logoutapplet/opie-logoutapplet_1.2.0.bb
+++ b/packages/opie-logoutapplet/opie-logoutapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/logoutapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb b/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb
index a735f8c340..6873dad2b2 100644
--- a/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb
+++ b/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/logoutapplet \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-mail/opie-mail_1.2.0.bb b/packages/opie-mail/opie-mail_1.2.1.bb
index 6e28372740..9d322d38b7 100644
--- a/packages/opie-mail/opie-mail_1.2.0.bb
+++ b/packages/opie-mail/opie-mail_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
diff --git a/packages/opie-mail/opie-mail_cvs.bb b/packages/opie-mail/opie-mail_cvs.bb
index 6247bfc5ae..14d0988f0d 100644
--- a/packages/opie-mail/opie-mail_cvs.bb
+++ b/packages/opie-mail/opie-mail_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail \
${HANDHELDS_CVS};module=opie/apps \
diff --git a/packages/opie-mailapplet/opie-mailapplet_1.2.0.bb b/packages/opie-mailapplet/opie-mailapplet_1.2.1.bb
index f3e7250852..fdea7ee361 100644
--- a/packages/opie-mailapplet/opie-mailapplet_1.2.0.bb
+++ b/packages/opie-mailapplet/opie-mailapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail/taskbarapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-mailapplet/opie-mailapplet_cvs.bb b/packages/opie-mailapplet/opie-mailapplet_cvs.bb
index 9b28687fd6..df2d757934 100644
--- a/packages/opie-mailapplet/opie-mailapplet_cvs.bb
+++ b/packages/opie-mailapplet/opie-mailapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail/taskbarapplet \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.0.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.1.bb
index 254d9a641d..44f420ce08 100644
--- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.0.bb
+++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
file://libmadplugin.pro"
diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
index 0bf5cd1b80..12c964376d 100644
--- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
file://libmadplugin.pro"
diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.0.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.1.bb
index 85b60a9361..47adefb1a8 100644
--- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.0.bb
+++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb
index 39722a7d8c..f80676a50d 100644
--- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.0.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.1.bb
index e988c88a38..3cbb3caba8 100644
--- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.0.bb
+++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
file://vorbis.pro "
diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
index f7f8356550..a753533f9d 100644
--- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
file://vorbis.pro "
diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.0.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.1.bb
index 85b60a9361..47adefb1a8 100644
--- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.0.bb
+++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
index 39722a7d8c..f80676a50d 100644
--- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.0.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.1.bb
index 831a8949a3..e6e8fa3762 100644
--- a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.0.bb
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.1.bb
@@ -1,8 +1,7 @@
include ${PN}.inc
-
-
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+EXTRA_QMAKEVARS_POST += "HEADERS+=rssparser.h SOURCES+=rssparser.cpp"
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb
index 7a888aac39..afba47f3c7 100644
--- a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.0.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.1.bb
index 7707e9671a..7707e9671a 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.0.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.1.bb
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
index ff0aceb431..18617efba3 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>"
-PV = "1.2.0+cvs-${CVSDATE}"
+PV = "1.2.1+cvs-${CVSDATE}"
APPNAME = "opieplayer2"
RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.0.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.1.bb
index 43fe357625..43fe357625 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.0.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.1.bb
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
index c3db7df4d1..a2e6d87bfa 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>"
-PV = "1.2.0+cvs-${CVSDATE}"
+PV = "1.2.1+cvs-${CVSDATE}"
APPNAME = "opieplayer2"
RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.0.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.1.bb
index f40e4ea658..f40e4ea658 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.0.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.1.bb
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
index 7188277895..fae1ef7ddd 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>"
-PV = "1.2.0+cvs-${CVSDATE}"
+PV = "1.2.1+cvs-${CVSDATE}"
APPNAME = "opieplayer2"
RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.0.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.1.bb
index bcff4f1702..bcff4f1702 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.0.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.1.bb
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
index 887f394aa1..c4475385d1 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>"
-PV = "1.2.0+cvs-${CVSDATE}"
+PV = "1.2.1+cvs-${CVSDATE}"
APPNAME = "opieplayer2"
RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb
deleted file mode 100644
index c94efb35ec..0000000000
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-include ${PN}.inc
-
-PR = "r2"
-
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
- file://fix-switch-yuv2rgb_arm2.patch;patch=1"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb
new file mode 100644
index 0000000000..1dcf37adae
--- /dev/null
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb
@@ -0,0 +1,6 @@
+include ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
index cc6d9b43c1..d3219e85b0 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r3"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-mediummount/opie-mediummount_1.2.0.bb b/packages/opie-mediummount/opie-mediummount_1.2.1.bb
index 3d4e8c0a6d..0c887950a8 100644
--- a/packages/opie-mediummount/opie-mediummount_1.2.0.bb
+++ b/packages/opie-mediummount/opie-mediummount_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-mediummount/opie-mediummount_cvs.bb b/packages/opie-mediummount/opie-mediummount_cvs.bb
index 3a4d5c85d7..f94a1c4727 100644
--- a/packages/opie-mediummount/opie-mediummount_cvs.bb
+++ b/packages/opie-mediummount/opie-mediummount_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-memoryapplet/opie-memoryapplet_1.2.0.bb b/packages/opie-memoryapplet/opie-memoryapplet_1.2.1.bb
index 047ce49cc1..4c33d73086 100644
--- a/packages/opie-memoryapplet/opie-memoryapplet_1.2.0.bb
+++ b/packages/opie-memoryapplet/opie-memoryapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/memoryapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \
diff --git a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
index 3d8fd0b20a..93dc9ecba1 100644
--- a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
+++ b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/memoryapplet \
${HANDHELDS_CVS};module=opie/noncore/settings/sysinfo \
diff --git a/packages/opie-mindbreaker/opie-mindbreaker_1.2.0.bb b/packages/opie-mindbreaker/opie-mindbreaker_1.2.1.bb
index cc528c2dc5..1955e77482 100644
--- a/packages/opie-mindbreaker/opie-mindbreaker_1.2.0.bb
+++ b/packages/opie-mindbreaker/opie-mindbreaker_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/mindbreaker \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb b/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb
index 9b38b02b67..94747d4cf8 100644
--- a/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb
+++ b/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/mindbreaker \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-minesweep/opie-minesweep_1.2.0.bb b/packages/opie-minesweep/opie-minesweep_1.2.1.bb
index b343d1a1f0..a88f61e387 100644
--- a/packages/opie-minesweep/opie-minesweep_1.2.0.bb
+++ b/packages/opie-minesweep/opie-minesweep_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/minesweep \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-minesweep/opie-minesweep_cvs.bb b/packages/opie-minesweep/opie-minesweep_cvs.bb
index c0935fb0b4..722482f96e 100644
--- a/packages/opie-minesweep/opie-minesweep_cvs.bb
+++ b/packages/opie-minesweep/opie-minesweep_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/minesweep \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-multikey/opie-multikey_1.2.0.bb b/packages/opie-multikey/opie-multikey_1.2.1.bb
index f8719a8a30..307a92f100 100644
--- a/packages/opie-multikey/opie-multikey_1.2.0.bb
+++ b/packages/opie-multikey/opie-multikey_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \
${HANDHELDS_CVS};tag=${TAG};module=opie/share"
diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb
index 8c0e5b9775..18cb187801 100644
--- a/packages/opie-multikey/opie-multikey_cvs.bb
+++ b/packages/opie-multikey/opie-multikey_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \
${HANDHELDS_CVS};module=opie/share"
diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.0.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.1.bb
index 278bef02e8..1f2acddb65 100644
--- a/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.0.bb
+++ b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/multikeyapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
index e9e1d2f95a..209cbbf012 100644
--- a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
+++ b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/multikeyapplet \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-networkapplet/opie-networkapplet_1.2.0.bb b/packages/opie-networkapplet/opie-networkapplet_1.2.1.bb
index 778bd86a75..aae7d373b1 100644
--- a/packages/opie-networkapplet/opie-networkapplet_1.2.0.bb
+++ b/packages/opie-networkapplet/opie-networkapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/networkapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-networkapplet/opie-networkapplet_cvs.bb b/packages/opie-networkapplet/opie-networkapplet_cvs.bb
index f6f67b446b..6e3d6be2f6 100644
--- a/packages/opie-networkapplet/opie-networkapplet_cvs.bb
+++ b/packages/opie-networkapplet/opie-networkapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/networkapplet \
${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-networksettings/opie-networksettings_1.2.0.bb b/packages/opie-networksettings/opie-networksettings_1.2.1.bb
index 839db3c44b..e652b48e36 100644
--- a/packages/opie-networksettings/opie-networksettings_1.2.0.bb
+++ b/packages/opie-networksettings/opie-networksettings_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/networksettings \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-networksettings/opie-networksettings_cvs.bb b/packages/opie-networksettings/opie-networksettings_cvs.bb
index 9000acc7fd..f3c775f6c3 100644
--- a/packages/opie-networksettings/opie-networksettings_cvs.bb
+++ b/packages/opie-networksettings/opie-networksettings_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-notesapplet/opie-notesapplet_1.2.0.bb b/packages/opie-notesapplet/opie-notesapplet_1.2.1.bb
index 706a8a0ad3..b0b468ec69 100644
--- a/packages/opie-notesapplet/opie-notesapplet_1.2.0.bb
+++ b/packages/opie-notesapplet/opie-notesapplet_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/notesapplet"
diff --git a/packages/opie-notesapplet/opie-notesapplet_cvs.bb b/packages/opie-notesapplet/opie-notesapplet_cvs.bb
index 35df38891b..0989f9ff6c 100644
--- a/packages/opie-notesapplet/opie-notesapplet_cvs.bb
+++ b/packages/opie-notesapplet/opie-notesapplet_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/notesapplet"
diff --git a/packages/opie-odict/opie-odict_1.2.0.bb b/packages/opie-odict/opie-odict_1.2.1.bb
index 45b2a20d69..eb9b93180d 100644
--- a/packages/opie-odict/opie-odict_1.2.0.bb
+++ b/packages/opie-odict/opie-odict_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/odict \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-odict/opie-odict_cvs.bb b/packages/opie-odict/opie-odict_cvs.bb
index 87828a44fa..1e963f15dd 100644
--- a/packages/opie-odict/opie-odict_cvs.bb
+++ b/packages/opie-odict/opie-odict_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/odict \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-oxygen/opie-oxygen_1.2.0.bb b/packages/opie-oxygen/opie-oxygen_1.2.1.bb
index c1e3ddbdc6..da2e79c01d 100644
--- a/packages/opie-oxygen/opie-oxygen_1.2.0.bb
+++ b/packages/opie-oxygen/opie-oxygen_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-oxygen/opie-oxygen_cvs.bb b/packages/opie-oxygen/opie-oxygen_cvs.bb
index 6549f63643..f72ca64b11 100644
--- a/packages/opie-oxygen/opie-oxygen_cvs.bb
+++ b/packages/opie-oxygen/opie-oxygen_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-oyatzee/opie-oyatzee_1.2.0.bb b/packages/opie-oyatzee/opie-oyatzee_1.2.1.bb
index 9903ecc909..41e557f09f 100644
--- a/packages/opie-oyatzee/opie-oyatzee_1.2.0.bb
+++ b/packages/opie-oyatzee/opie-oyatzee_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/oyatzee \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-oyatzee/opie-oyatzee_cvs.bb b/packages/opie-oyatzee/opie-oyatzee_cvs.bb
index 34ad914098..3fff161386 100644
--- a/packages/opie-oyatzee/opie-oyatzee_cvs.bb
+++ b/packages/opie-oyatzee/opie-oyatzee_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/oyatzee \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-packagemanager/files/ipkg-fix.patch b/packages/opie-packagemanager/files/ipkg-fix.patch
deleted file mode 100644
index 256727b0f3..0000000000
--- a/packages/opie-packagemanager/files/ipkg-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- packagemanager/oipkg.h~ipkg-fix
-+++ packagemanager/oipkg.h
-@@ -39,10 +39,6 @@
-
- #include <qobject.h>
-
--extern "C" {
--#include <libipkg.h>
--};
--
- // Ipkg execution options (m_ipkgExecOptions)
- #define FORCE_DEPENDS 0x0001
- #define FORCE_REMOVE 0x0002
-@@ -94,7 +90,6 @@
-
- private:
- Config *m_config; // Pointer to application configuration file
-- args_t m_ipkgArgs; // libipkg configuration arguments
- OConfItemList *m_confInfo; // Contains info from all Ipkg configuration files
- int m_ipkgExecOptions; // Bit-mapped flags for Ipkg execution options
- int m_ipkgExecVerbosity; // Ipkg execution verbosity level
---- packagemanager/oipkg.cpp~ipkg-fix
-+++ packagemanager/oipkg.cpp
-@@ -38,6 +38,11 @@
- #include <stdlib.h>
- #include <unistd.h>
-
-+extern "C" {
-+#include <libipkg.h>
-+};
-+args_t m_ipkgArgs; // libipkg configuration arguments
-+
- const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file
- const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files
- const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists
diff --git a/packages/opie-packagemanager/opie-packagemanager_1.2.0.bb b/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb
index 0e37228025..23e6a1fabd 100644
--- a/packages/opie-packagemanager/opie-packagemanager_1.2.0.bb
+++ b/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb
@@ -1,9 +1,6 @@
include ${PN}.inc
-
-
-PR = "r1"
+
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME};cvsdate=${CVSDATE} \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics;cvsdate=${CVSDATE} \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
- file://ipkg-fix.patch;patch=1"
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-packagemanager/opie-packagemanager_cvs.bb b/packages/opie-packagemanager/opie-packagemanager_cvs.bb
index df386f2144..30fa536cdf 100644
--- a/packages/opie-packagemanager/opie-packagemanager_cvs.bb
+++ b/packages/opie-packagemanager/opie-packagemanager_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/${APPNAME};cvsdate=${CVSDATE} \
${HANDHELDS_CVS};module=opie/pics;cvsdate=${CVSDATE} \
diff --git a/packages/opie-parashoot/opie-parashoot_1.2.0.bb b/packages/opie-parashoot/opie-parashoot_1.2.1.bb
index 490000dbf1..60816499b8 100644
--- a/packages/opie-parashoot/opie-parashoot_1.2.0.bb
+++ b/packages/opie-parashoot/opie-parashoot_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/parashoot \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-parashoot/opie-parashoot_cvs.bb b/packages/opie-parashoot/opie-parashoot_cvs.bb
index fca46f04dc..32e64f389c 100644
--- a/packages/opie-parashoot/opie-parashoot_cvs.bb
+++ b/packages/opie-parashoot/opie-parashoot_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/parashoot \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb
index c3b043c7dc..15a76efde0 100644
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb
@@ -1,8 +1,6 @@
include ${PN}.inc
-
+
PR = "r0"
-# don't consider this file yet, use CVS
-PV = "0.0.0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pcmcia \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
index 239c74e347..b5c913e29a 100644
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pcmcia \
${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-pickboard/opie-pickboard_1.2.0.bb b/packages/opie-pickboard/opie-pickboard_1.2.1.bb
index af5146b4e4..9737c8d192 100644
--- a/packages/opie-pickboard/opie-pickboard_1.2.0.bb
+++ b/packages/opie-pickboard/opie-pickboard_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard"
diff --git a/packages/opie-pickboard/opie-pickboard_cvs.bb b/packages/opie-pickboard/opie-pickboard_cvs.bb
index 1ce0355346..a9bb6c9bd2 100644
--- a/packages/opie-pickboard/opie-pickboard_cvs.bb
+++ b/packages/opie-pickboard/opie-pickboard_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/pickboard"
diff --git a/packages/opie-pics/opie-pics_1.2.0.bb b/packages/opie-pics/opie-pics_1.2.1.bb
index d1605d23c7..95c945ffd0 100644
--- a/packages/opie-pics/opie-pics_1.2.0.bb
+++ b/packages/opie-pics/opie-pics_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics-hires"
diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb
index d007448f3f..c1f3537ef4 100644
--- a/packages/opie-pics/opie-pics_cvs.bb
+++ b/packages/opie-pics/opie-pics_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/pics \
${HANDHELDS_CVS};module=opie/pics-hires"
diff --git a/packages/opie-pimconverter/opie-pimconverter_1.2.0.bb b/packages/opie-pimconverter/opie-pimconverter_1.2.1.bb
index a1611e8c9c..e3e979bec2 100644
--- a/packages/opie-pimconverter/opie-pimconverter_1.2.0.bb
+++ b/packages/opie-pimconverter/opie-pimconverter_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/pimconverter \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-pimconverter/opie-pimconverter_cvs.bb b/packages/opie-pimconverter/opie-pimconverter_cvs.bb
index e3e2102d2a..902303ba45 100644
--- a/packages/opie-pimconverter/opie-pimconverter_cvs.bb
+++ b/packages/opie-pimconverter/opie-pimconverter_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/pimconverter \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-powerchord/opie-powerchord_1.2.0.bb b/packages/opie-powerchord/opie-powerchord_1.2.1.bb
index 5486439761..81edc26a73 100644
--- a/packages/opie-powerchord/opie-powerchord_1.2.0.bb
+++ b/packages/opie-powerchord/opie-powerchord_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/powerchord \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-powerchord/opie-powerchord_cvs.bb b/packages/opie-powerchord/opie-powerchord_cvs.bb
index 782a72c933..3fc9b49253 100644
--- a/packages/opie-powerchord/opie-powerchord_cvs.bb
+++ b/packages/opie-powerchord/opie-powerchord_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/powerchord \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.0.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.1.bb
index b2af9c9a9e..0a3851cf9d 100644
--- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.0.bb
+++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pyquicklaunch \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb
index 221f909d91..f504159802 100644
--- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb
+++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pyquicklaunch \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-qasteroids/opie-qasteroids_1.2.0.bb b/packages/opie-qasteroids/opie-qasteroids_1.2.1.bb
index 8d7ba5a699..19ed04a4ec 100644
--- a/packages/opie-qasteroids/opie-qasteroids_1.2.0.bb
+++ b/packages/opie-qasteroids/opie-qasteroids_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/qasteroids \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-qasteroids/opie-qasteroids_cvs.bb b/packages/opie-qasteroids/opie-qasteroids_cvs.bb
index 1490c1fce1..fb862bdf04 100644
--- a/packages/opie-qasteroids/opie-qasteroids_cvs.bb
+++ b/packages/opie-qasteroids/opie-qasteroids_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/qasteroids \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-qcop/opie-qcop_1.2.0.bb b/packages/opie-qcop/opie-qcop_1.2.1.bb
index 757b2300de..bcde99c437 100644
--- a/packages/opie-qcop/opie-qcop_1.2.0.bb
+++ b/packages/opie-qcop/opie-qcop_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qcop"
diff --git a/packages/opie-qcop/opie-qcop_cvs.bb b/packages/opie-qcop/opie-qcop_cvs.bb
index 7140421c84..0cf361d974 100644
--- a/packages/opie-qcop/opie-qcop_cvs.bb
+++ b/packages/opie-qcop/opie-qcop_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop"
diff --git a/packages/opie-qss/opie-qss_1.2.0.bb b/packages/opie-qss/opie-qss_1.2.1.bb
index ace72c52eb..1ef8cb4c29 100644
--- a/packages/opie-qss/opie-qss_1.2.0.bb
+++ b/packages/opie-qss/opie-qss_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qss"
diff --git a/packages/opie-qss/opie-qss_cvs.bb b/packages/opie-qss/opie-qss_cvs.bb
index 8e488534ff..4e21e5f94c 100644
--- a/packages/opie-qss/opie-qss_cvs.bb
+++ b/packages/opie-qss/opie-qss_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qss"
diff --git a/packages/opie-quicklauncher/opie-quicklauncher_1.2.0.bb b/packages/opie-quicklauncher/opie-quicklauncher_1.2.1.bb
index 924bd701d2..bda2b41f8d 100644
--- a/packages/opie-quicklauncher/opie-quicklauncher_1.2.0.bb
+++ b/packages/opie-quicklauncher/opie-quicklauncher_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/tools/quicklauncher"
diff --git a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
index 77439b93e9..30f21333a2 100644
--- a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
+++ b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/tools/quicklauncher"
diff --git a/packages/opie-rdesktop/opie-rdesktop_1.2.0.bb b/packages/opie-rdesktop/opie-rdesktop_1.2.1.bb
index 22a8ae991f..57991916f4 100644
--- a/packages/opie-rdesktop/opie-rdesktop_1.2.0.bb
+++ b/packages/opie-rdesktop/opie-rdesktop_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opierdesktop \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
diff --git a/packages/opie-rdesktop/opie-rdesktop_cvs.bb b/packages/opie-rdesktop/opie-rdesktop_cvs.bb
index d1bfe47a87..22165ace9c 100644
--- a/packages/opie-rdesktop/opie-rdesktop_cvs.bb
+++ b/packages/opie-rdesktop/opie-rdesktop_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opierdesktop \
${HANDHELDS_CVS};module=opie/apps \
diff --git a/packages/opie-reader/opie-reader.inc b/packages/opie-reader/opie-reader.inc
index d581a9674d..42c097ba17 100644
--- a/packages/opie-reader/opie-reader.inc
+++ b/packages/opie-reader/opie-reader.inc
@@ -13,6 +13,9 @@ PARALLEL_MAKE = ""
inherit opie
+DEPENDS += " flite "
+EXTRA_QMAKEVARS_POST += " SUBDIRS+=FliteDyn SUBDIRS+=FliteDyn16 "
+
do_install() {
install -d ${D}${palmtopdir}/pics/${APPNAME}/
install -d ${D}${palmtopdir}/lib/
@@ -44,3 +47,26 @@ do_install() {
install -m 0644 ${S}/HTMLentities ${D}${palmtopdir}/plugins/reader/data/
}
+python populate_packages_prepend () {
+ print "opie-reader:", bb.data.getVar( 'RDEPENDS_opie-reader', d )
+ plugindir = bb.data.expand('${palmtopdir}/plugins/reader', d)
+ for dir, type in [ ( 'codecs', 'codec' ), ( 'filters', 'filter' ), ( 'outcodecs', 'output' ) ]:
+ dir = plugindir + '/' + dir
+ do_split_packages(d, dir,
+ '^lib(.*)\.so$', 'opie-reader-' + type + '-%s',
+ 'Opie reader %s ' + type,
+ prepend=True)
+
+ # input codes are small and should be installed together with opie-reader,
+ # flite output pulls in libflite and thus should only be installed if
+ # really wanted by the user
+ suggests=[]
+ recommends=[]
+ for package in bb.data.getVar('PACKAGES', d).split():
+ if 'flite' in package:
+ suggests.append(package)
+ else:
+ recommends.append(package)
+ bb.data.setVar('RRECOMMENDS_opie-reader', " ".join( recommends ), d)
+ bb.data.setVar('RSUGGESTS_opie-reader', " ".join( suggests ), d)
+}
diff --git a/packages/opie-reader/opie-reader_1.2.0.bb b/packages/opie-reader/opie-reader_1.2.1.bb
index 67833fa5f6..6765f70718 100644
--- a/packages/opie-reader/opie-reader_1.2.0.bb
+++ b/packages/opie-reader/opie-reader_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-reader/opie-reader_cvs.bb b/packages/opie-reader/opie-reader_cvs.bb
index 66c0bd71ac..d559971a11 100644
--- a/packages/opie-reader/opie-reader_cvs.bb
+++ b/packages/opie-reader/opie-reader_cvs.bb
@@ -1,35 +1,8 @@
include ${PN}.inc
-
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r1"
+
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \
${HANDHELDS_CVS};module=opie/pics \
${HANDHELDS_CVS};module=opie/apps"
-DEPENDS += " flite "
-EXTRA_QMAKEVARS_POST += " SUBDIRS+=FliteDyn SUBDIRS+=FliteDyn16 "
-
-python populate_packages_prepend () {
- print "opie-reader:", bb.data.getVar( 'RDEPENDS_opie-reader', d )
- plugindir = bb.data.expand('${palmtopdir}/plugins/reader', d)
- for dir, type in [ ( 'codecs', 'codec' ), ( 'filters', 'filter' ), ( 'outcodecs', 'output' ) ]:
- dir = plugindir + '/' + dir
- do_split_packages(d, dir,
- '^lib(.*)\.so$', 'opie-reader-' + type + '-%s',
- 'Opie reader %s ' + type,
- prepend=True)
-
- # input codes are small and should be installed together with opie-reader,
- # flite output pulls in libflite and thus should only be installed if
- # really wanted by the user
- suggests=[]
- recommends=[]
- for package in bb.data.getVar('PACKAGES', d).split():
- if 'flite' in package:
- suggests.append(package)
- else:
- recommends.append(package)
- bb.data.setVar('RRECOMMENDS_opie-reader', " ".join( recommends ), d)
- bb.data.setVar('RSUGGESTS_opie-reader', " ".join( suggests ), d)
-}
diff --git a/packages/opie-recorder/opie-recorder_1.2.0.bb b/packages/opie-recorder/opie-recorder_1.2.1.bb
index a0116f0308..7bc13602bc 100644
--- a/packages/opie-recorder/opie-recorder_1.2.0.bb
+++ b/packages/opie-recorder/opie-recorder_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opierec \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-recorder/opie-recorder_cvs.bb b/packages/opie-recorder/opie-recorder_cvs.bb
index 60e315935c..5546aabe61 100644
--- a/packages/opie-recorder/opie-recorder_cvs.bb
+++ b/packages/opie-recorder/opie-recorder_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opierec \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-remote/opie-remote_1.2.0.bb b/packages/opie-remote/opie-remote_1.2.1.bb
index 93d6feea67..a71e0657aa 100644
--- a/packages/opie-remote/opie-remote_1.2.0.bb
+++ b/packages/opie-remote/opie-remote_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/remote \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-remote/opie-remote_cvs.bb b/packages/opie-remote/opie-remote_cvs.bb
index 8e698b7786..2fd57bfaf0 100644
--- a/packages/opie-remote/opie-remote_cvs.bb
+++ b/packages/opie-remote/opie-remote_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/remote \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-restartapplet/opie-restartapplet2_1.2.0.bb b/packages/opie-restartapplet/opie-restartapplet2_1.2.1.bb
index d38fcba863..d38fcba863 100644
--- a/packages/opie-restartapplet/opie-restartapplet2_1.2.0.bb
+++ b/packages/opie-restartapplet/opie-restartapplet2_1.2.1.bb
diff --git a/packages/opie-restartapplet/opie-restartapplet2_cvs.bb b/packages/opie-restartapplet/opie-restartapplet2_cvs.bb
index f9f2c74b51..7a5324b787 100644
--- a/packages/opie-restartapplet/opie-restartapplet2_cvs.bb
+++ b/packages/opie-restartapplet/opie-restartapplet2_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.2.0+cvs-${CVSDATE}"
+PV = "1.2.1+cvs-${CVSDATE}"
APPNAME = "restartapplet"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet2 \
diff --git a/packages/opie-restartapplet/opie-restartapplet_1.2.0.bb b/packages/opie-restartapplet/opie-restartapplet_1.2.1.bb
index 156d6fbc2e..c4473724bd 100644
--- a/packages/opie-restartapplet/opie-restartapplet_1.2.0.bb
+++ b/packages/opie-restartapplet/opie-restartapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-restartapplet/opie-restartapplet_cvs.bb b/packages/opie-restartapplet/opie-restartapplet_cvs.bb
index 09baa04ef4..70418da4b2 100644
--- a/packages/opie-restartapplet/opie-restartapplet_cvs.bb
+++ b/packages/opie-restartapplet/opie-restartapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-restartapplet2/opie-restartapplet2_1.2.0.bb b/packages/opie-restartapplet2/opie-restartapplet2_1.2.1.bb
index e7a1c89de1..f1bdf5299a 100644
--- a/packages/opie-restartapplet2/opie-restartapplet2_1.2.0.bb
+++ b/packages/opie-restartapplet2/opie-restartapplet2_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet2 \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb b/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb
index bfb431841d..2ae1b1406c 100644
--- a/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb
+++ b/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet2 \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-rotateapplet/opie-rotateapplet_1.2.0.bb b/packages/opie-rotateapplet/opie-rotateapplet_1.2.1.bb
index 6788581883..48674b9dce 100644
--- a/packages/opie-rotateapplet/opie-rotateapplet_1.2.0.bb
+++ b/packages/opie-rotateapplet/opie-rotateapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/rotateapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb b/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb
index f17c413059..6b6c406420 100644
--- a/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb
+++ b/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/rotateapplet \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.0.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb
index a5b527a493..da266ce171 100644
--- a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.0.bb
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/screenshotapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
index 27f7390f56..136739d68c 100644
--- a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/screenshotapplet \
${HANDHELDS_CVS};module=opie/apps \
diff --git a/packages/opie-search/opie-search_1.2.0.bb b/packages/opie-search/opie-search_1.2.1.bb
index 4a1cd725e7..f2682401f0 100644
--- a/packages/opie-search/opie-search_1.2.0.bb
+++ b/packages/opie-search/opie-search_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/osearch \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-search/opie-search_cvs.bb b/packages/opie-search/opie-search_cvs.bb
index abbe9f6a9b..fdd1355d2e 100644
--- a/packages/opie-search/opie-search_cvs.bb
+++ b/packages/opie-search/opie-search_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/osearch \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-security/opie-security_1.2.0.bb b/packages/opie-security/opie-security_1.2.1.bb
index 45c0e711ae..732c6c472e 100644
--- a/packages/opie-security/opie-security_1.2.0.bb
+++ b/packages/opie-security/opie-security_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/security \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-security/opie-security_cvs.bb b/packages/opie-security/opie-security_cvs.bb
index bec4b36e35..a9927e05ce 100644
--- a/packages/opie-security/opie-security_cvs.bb
+++ b/packages/opie-security/opie-security_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/security \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.0.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb
index 85127240ab..85127240ab 100644
--- a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.0.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb
diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb
index a307c5624d..0eb90fc4a0 100644
--- a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
I18N_FILES = "libmultiauthbluepingplugin.ts"
RDEPENDS = "opie-security bluez-utils"
-PV = "1.2.0+cvs-${CVSDATE}"
+PV = "1.2.1+cvs-${CVSDATE}"
APPNAME = "multiauthbluepingplugin"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/blueping \
diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.0.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb
index 825c14ea53..825c14ea53 100644
--- a/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.0.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb
diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb
index d6c82e9bcf..4088c88b37 100644
--- a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
I18N_FILES = "libmultiauthdummyplugin.ts"
RDEPENDS = "opie-security"
-PV = "1.2.0+cvs-${CVSDATE}"
+PV = "1.2.1+cvs-${CVSDATE}"
APPNAME = "multiauthdummyplugin"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/dummy \
diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.0.bb b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb
index b1f11bcf6a..b1f11bcf6a 100644
--- a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.0.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb
diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb
index 3998e15b59..d82d7ce38b 100644
--- a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
I18N_FILES = "libmultiauthnoticeplugin.ts"
RDEPENDS = "opie-security"
-PV = "1.2.0+cvs-${CVSDATE}"
+PV = "1.2.1+cvs-${CVSDATE}"
APPNAME = "multiauthnoticeplugin"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/notice \
diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_1.2.0.bb b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb
index 5a2d03f6d5..5a2d03f6d5 100644
--- a/packages/opie-securityplugins/opie-securityplugin-pin_1.2.0.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb
diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb
index 287771acd0..e7fa0dc301 100644
--- a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb
@@ -8,7 +8,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
I18N_FILES = "libmultiauthpinplugin.ts"
RDEPENDS = "opie-security"
-PV = "1.2.0+cvs-${CVSDATE}"
+PV = "1.2.1+cvs-${CVSDATE}"
APPNAME = "multiauthpinplugin"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/pin \
diff --git a/packages/opie-securityplugins/opie-securityplugins_1.2.0.bb b/packages/opie-securityplugins/opie-securityplugins_1.2.1.bb
index 397746ccb4..c541bc78ed 100644
--- a/packages/opie-securityplugins/opie-securityplugins_1.2.0.bb
+++ b/packages/opie-securityplugins/opie-securityplugins_1.2.1.bb
@@ -1,5 +1,4 @@
include ${PN}.inc
-PR = "r0"
diff --git a/packages/opie-securityplugins/opie-securityplugins_cvs.bb b/packages/opie-securityplugins/opie-securityplugins_cvs.bb
index 127dcb1949..b2feb383cf 100644
--- a/packages/opie-securityplugins/opie-securityplugins_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugins_cvs.bb
@@ -1,5 +1,4 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
diff --git a/packages/opie-sfcave/opie-sfcave_1.2.0.bb b/packages/opie-sfcave/opie-sfcave_1.2.1.bb
index a4ddf00e0e..fda3aae425 100644
--- a/packages/opie-sfcave/opie-sfcave_1.2.0.bb
+++ b/packages/opie-sfcave/opie-sfcave_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/sfcave \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-sfcave/opie-sfcave_cvs.bb b/packages/opie-sfcave/opie-sfcave_cvs.bb
index f17dbfdc58..dbedeafac0 100644
--- a/packages/opie-sfcave/opie-sfcave_cvs.bb
+++ b/packages/opie-sfcave/opie-sfcave_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/sfcave \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-sh-snes/opie-sh-snes_1.2.0.bb b/packages/opie-sh-snes/opie-sh-snes_1.2.1.bb
index 397746ccb4..c541bc78ed 100644
--- a/packages/opie-sh-snes/opie-sh-snes_1.2.0.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_1.2.1.bb
@@ -1,5 +1,4 @@
include ${PN}.inc
-PR = "r0"
diff --git a/packages/opie-sh-snes/opie-sh-snes_cvs.bb b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
index 127dcb1949..b2feb383cf 100644
--- a/packages/opie-sh-snes/opie-sh-snes_cvs.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
@@ -1,5 +1,4 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
diff --git a/packages/opie-sh/opie-sh_1.2.0.bb b/packages/opie-sh/opie-sh_1.2.1.bb
index 8dd8b99dfb..69de686ed0 100644
--- a/packages/opie-sh/opie-sh_1.2.0.bb
+++ b/packages/opie-sh/opie-sh_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/opie-sh \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-sh/opie-sh_cvs.bb b/packages/opie-sh/opie-sh_cvs.bb
index d1361c7ca6..dad51d3eb5 100644
--- a/packages/opie-sh/opie-sh_cvs.bb
+++ b/packages/opie-sh/opie-sh_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r1"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/opie-sh \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-sheet/opie-sheet_1.2.0.bb b/packages/opie-sheet/opie-sheet_1.2.1.bb
index e9f8d9aeff..a231ee9a90 100644
--- a/packages/opie-sheet/opie-sheet_1.2.0.bb
+++ b/packages/opie-sheet/opie-sheet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-sheet \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-sheet/opie-sheet_cvs.bb b/packages/opie-sheet/opie-sheet_cvs.bb
index 883ac7d529..28851e6a20 100644
--- a/packages/opie-sheet/opie-sheet_cvs.bb
+++ b/packages/opie-sheet/opie-sheet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-sheet \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-snake/opie-snake_1.2.0.bb b/packages/opie-snake/opie-snake_1.2.1.bb
index 4ad5ea33ef..9bff0ac043 100644
--- a/packages/opie-snake/opie-snake_1.2.0.bb
+++ b/packages/opie-snake/opie-snake_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/snake \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-snake/opie-snake_cvs.bb b/packages/opie-snake/opie-snake_cvs.bb
index 10de86b0b8..ba8c2070fd 100644
--- a/packages/opie-snake/opie-snake_cvs.bb
+++ b/packages/opie-snake/opie-snake_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/snake \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-solitaire/opie-solitaire_1.2.0.bb b/packages/opie-solitaire/opie-solitaire_1.2.1.bb
index e01772a324..5cd42c8d53 100644
--- a/packages/opie-solitaire/opie-solitaire_1.2.0.bb
+++ b/packages/opie-solitaire/opie-solitaire_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/solitaire \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-solitaire/opie-solitaire_cvs.bb b/packages/opie-solitaire/opie-solitaire_cvs.bb
index dce79d5782..c3d2c4b383 100644
--- a/packages/opie-solitaire/opie-solitaire_cvs.bb
+++ b/packages/opie-solitaire/opie-solitaire_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/solitaire \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-sounds/opie-sounds_1.2.0.bb b/packages/opie-sounds/opie-sounds_1.2.1.bb
index fb00b06c45..8053e4f26e 100644
--- a/packages/opie-sounds/opie-sounds_1.2.0.bb
+++ b/packages/opie-sounds/opie-sounds_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/sounds"
diff --git a/packages/opie-sounds/opie-sounds_cvs.bb b/packages/opie-sounds/opie-sounds_cvs.bb
index 27c1ffc5ec..cea92cd989 100644
--- a/packages/opie-sounds/opie-sounds_cvs.bb
+++ b/packages/opie-sounds/opie-sounds_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/sounds"
diff --git a/packages/opie-sshkeys/opie-sshkeys_1.2.0.bb b/packages/opie-sshkeys/opie-sshkeys_1.2.1.bb
index b126915053..f04ccf5609 100644
--- a/packages/opie-sshkeys/opie-sshkeys_1.2.0.bb
+++ b/packages/opie-sshkeys/opie-sshkeys_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sshkeys \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-sshkeys/opie-sshkeys_cvs.bb b/packages/opie-sshkeys/opie-sshkeys_cvs.bb
index 72d4acf86a..8830d09709 100644
--- a/packages/opie-sshkeys/opie-sshkeys_cvs.bb
+++ b/packages/opie-sshkeys/opie-sshkeys_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sshkeys \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-style-flat/opie-style-flat_1.2.0.bb b/packages/opie-style-flat/opie-style-flat_1.2.1.bb
index 1d2ecbc6d9..5e55870851 100644
--- a/packages/opie-style-flat/opie-style-flat_1.2.0.bb
+++ b/packages/opie-style-flat/opie-style-flat_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/flat "
diff --git a/packages/opie-style-flat/opie-style-flat_cvs.bb b/packages/opie-style-flat/opie-style-flat_cvs.bb
index 91cd99cecf..2c68b64dbf 100644
--- a/packages/opie-style-flat/opie-style-flat_cvs.bb
+++ b/packages/opie-style-flat/opie-style-flat_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/flat "
diff --git a/packages/opie-style-fresh/opie-style-fresh_1.2.0.bb b/packages/opie-style-fresh/opie-style-fresh_1.2.1.bb
index d0a2dc1bb4..9e56bb2750 100644
--- a/packages/opie-style-fresh/opie-style-fresh_1.2.0.bb
+++ b/packages/opie-style-fresh/opie-style-fresh_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/fresh "
diff --git a/packages/opie-style-fresh/opie-style-fresh_cvs.bb b/packages/opie-style-fresh/opie-style-fresh_cvs.bb
index cd375b2ce3..762f17e73f 100644
--- a/packages/opie-style-fresh/opie-style-fresh_cvs.bb
+++ b/packages/opie-style-fresh/opie-style-fresh_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/fresh "
diff --git a/packages/opie-style-liquid/opie-style-liquid_1.2.0.bb b/packages/opie-style-liquid/opie-style-liquid_1.2.1.bb
index d051e66321..fd1e93900f 100644
--- a/packages/opie-style-liquid/opie-style-liquid_1.2.0.bb
+++ b/packages/opie-style-liquid/opie-style-liquid_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/liquid "
diff --git a/packages/opie-style-liquid/opie-style-liquid_cvs.bb b/packages/opie-style-liquid/opie-style-liquid_cvs.bb
index eb053d221c..fedf09e850 100644
--- a/packages/opie-style-liquid/opie-style-liquid_cvs.bb
+++ b/packages/opie-style-liquid/opie-style-liquid_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/liquid "
diff --git a/packages/opie-style-metal/opie-style-metal_1.2.0.bb b/packages/opie-style-metal/opie-style-metal_1.2.1.bb
index ed6ada20fb..014734d8b3 100644
--- a/packages/opie-style-metal/opie-style-metal_1.2.0.bb
+++ b/packages/opie-style-metal/opie-style-metal_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/metal "
diff --git a/packages/opie-style-metal/opie-style-metal_cvs.bb b/packages/opie-style-metal/opie-style-metal_cvs.bb
index 3ff96649f4..d35a3bc08f 100644
--- a/packages/opie-style-metal/opie-style-metal_cvs.bb
+++ b/packages/opie-style-metal/opie-style-metal_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/metal "
diff --git a/packages/opie-style-phase/opie-style-phase_1.2.0.bb b/packages/opie-style-phase/opie-style-phase_1.2.1.bb
index c0574ac531..ee41eb027c 100644
--- a/packages/opie-style-phase/opie-style-phase_1.2.0.bb
+++ b/packages/opie-style-phase/opie-style-phase_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/phase"
diff --git a/packages/opie-style-phase/opie-style-phase_cvs.bb b/packages/opie-style-phase/opie-style-phase_cvs.bb
index b93d6eaeec..5b162ec922 100644
--- a/packages/opie-style-phase/opie-style-phase_cvs.bb
+++ b/packages/opie-style-phase/opie-style-phase_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/phase"
diff --git a/packages/opie-style-web/opie-style-web_1.2.0.bb b/packages/opie-style-web/opie-style-web_1.2.1.bb
index db1b2fc5db..dda9db378c 100644
--- a/packages/opie-style-web/opie-style-web_1.2.0.bb
+++ b/packages/opie-style-web/opie-style-web_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/web"
diff --git a/packages/opie-style-web/opie-style-web_cvs.bb b/packages/opie-style-web/opie-style-web_cvs.bb
index 900eb87d03..a4bc74a778 100644
--- a/packages/opie-style-web/opie-style-web_cvs.bb
+++ b/packages/opie-style-web/opie-style-web_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/web"
diff --git a/packages/opie-suspendapplet/opie-suspendapplet_1.2.0.bb b/packages/opie-suspendapplet/opie-suspendapplet_1.2.1.bb
index 2a044a5f9d..e88f417b7c 100644
--- a/packages/opie-suspendapplet/opie-suspendapplet_1.2.0.bb
+++ b/packages/opie-suspendapplet/opie-suspendapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/suspendapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb b/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb
index 85756f5717..e5eba1627d 100644
--- a/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb
+++ b/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/suspendapplet \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-symlinker/opie-symlinker_1.2.0.bb b/packages/opie-symlinker/opie-symlinker_1.2.1.bb
index 1d4906a630..682493bafd 100644
--- a/packages/opie-symlinker/opie-symlinker_1.2.0.bb
+++ b/packages/opie-symlinker/opie-symlinker_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/symlinker "
diff --git a/packages/opie-symlinker/opie-symlinker_cvs.bb b/packages/opie-symlinker/opie-symlinker_cvs.bb
index cfb0cf074f..cf9b741b71 100644
--- a/packages/opie-symlinker/opie-symlinker_cvs.bb
+++ b/packages/opie-symlinker/opie-symlinker_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/symlinker "
diff --git a/packages/opie-sysinfo/opie-sysinfo_1.2.0.bb b/packages/opie-sysinfo/opie-sysinfo_1.2.1.bb
index 797ab5f1f0..6aa27a6242 100644
--- a/packages/opie-sysinfo/opie-sysinfo_1.2.0.bb
+++ b/packages/opie-sysinfo/opie-sysinfo_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-sysinfo/opie-sysinfo_cvs.bb b/packages/opie-sysinfo/opie-sysinfo_cvs.bb
index 088e6359ab..fde9fa3126 100644
--- a/packages/opie-sysinfo/opie-sysinfo_cvs.bb
+++ b/packages/opie-sysinfo/opie-sysinfo_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sysinfo \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-systemtime/opie-systemtime_1.2.0.bb b/packages/opie-systemtime/opie-systemtime_1.2.1.bb
index f282350e14..97fa149a56 100644
--- a/packages/opie-systemtime/opie-systemtime_1.2.0.bb
+++ b/packages/opie-systemtime/opie-systemtime_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/netsystemtime \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-systemtime/opie-systemtime_cvs.bb b/packages/opie-systemtime/opie-systemtime_cvs.bb
index 5963907e1a..6bb494df56 100644
--- a/packages/opie-systemtime/opie-systemtime_cvs.bb
+++ b/packages/opie-systemtime/opie-systemtime_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/netsystemtime \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-tableviewer/opie-tableviewer_1.2.0.bb b/packages/opie-tableviewer/opie-tableviewer_1.2.1.bb
index 566407aee1..3d9158d616 100644
--- a/packages/opie-tableviewer/opie-tableviewer_1.2.0.bb
+++ b/packages/opie-tableviewer/opie-tableviewer_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tableviewer \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-tableviewer/opie-tableviewer_cvs.bb b/packages/opie-tableviewer/opie-tableviewer_cvs.bb
index fd6e68c7bd..4434dcce2a 100644
--- a/packages/opie-tableviewer/opie-tableviewer_cvs.bb
+++ b/packages/opie-tableviewer/opie-tableviewer_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/tableviewer \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-taskbar/opie-taskbar_1.2.0.bb b/packages/opie-taskbar/opie-taskbar_1.2.1.bb
index 32c8980591..453bc2653c 100644
--- a/packages/opie-taskbar/opie-taskbar_1.2.0.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r3"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 141596a73d..1ee882173c 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r7"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
diff --git a/packages/opie-tetrix/opie-tetrix_1.2.0.bb b/packages/opie-tetrix/opie-tetrix_1.2.1.bb
index 5984a1e426..25435cb30a 100644
--- a/packages/opie-tetrix/opie-tetrix_1.2.0.bb
+++ b/packages/opie-tetrix/opie-tetrix_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/tetrix \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-tetrix/opie-tetrix_cvs.bb b/packages/opie-tetrix/opie-tetrix_cvs.bb
index 9dba18cdae..d985c54cf5 100644
--- a/packages/opie-tetrix/opie-tetrix_cvs.bb
+++ b/packages/opie-tetrix/opie-tetrix_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/tetrix \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-helpbrowser/opie-helpbrowser_1.2.0.bb b/packages/opie-textedit/opie-textedit_1.2.1.bb
index 3ac2657526..f2e144d3ca 100644
--- a/packages/opie-helpbrowser/opie-helpbrowser_1.2.0.bb
+++ b/packages/opie-textedit/opie-textedit_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-textedit/opie-textedit_cvs.bb b/packages/opie-textedit/opie-textedit_cvs.bb
index b404155773..f63eab6eb8 100644
--- a/packages/opie-textedit/opie-textedit_cvs.bb
+++ b/packages/opie-textedit/opie-textedit_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-theme/opie-theme_1.2.0.bb b/packages/opie-theme/opie-theme_1.2.1.bb
index 4d3866f0ef..e79214dc88 100644
--- a/packages/opie-theme/opie-theme_1.2.0.bb
+++ b/packages/opie-theme/opie-theme_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/theme \
${HANDHELDS_CVS};tag=${TAG};module=opie/plugins/styles "
diff --git a/packages/opie-theme/opie-theme_cvs.bb b/packages/opie-theme/opie-theme_cvs.bb
index 19afa76e51..f94d3caffb 100644
--- a/packages/opie-theme/opie-theme_cvs.bb
+++ b/packages/opie-theme/opie-theme_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/theme \
${HANDHELDS_CVS};module=opie/plugins/styles "
diff --git a/packages/opie-tictac/opie-tictac_1.2.0.bb b/packages/opie-tictac/opie-tictac_1.2.1.bb
index 4a571a4434..e8c07ccf64 100644
--- a/packages/opie-tictac/opie-tictac_1.2.0.bb
+++ b/packages/opie-tictac/opie-tictac_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/tictac \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-tictac/opie-tictac_cvs.bb b/packages/opie-tictac/opie-tictac_cvs.bb
index e19578293a..040d8a3ec4 100644
--- a/packages/opie-tictac/opie-tictac_cvs.bb
+++ b/packages/opie-tictac/opie-tictac_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/tictac \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-tinykate/opie-tinykate_1.2.0.bb b/packages/opie-tinykate/opie-tinykate_1.2.1.bb
index 0883018c29..70b03dfdd1 100644
--- a/packages/opie-tinykate/opie-tinykate_1.2.0.bb
+++ b/packages/opie-tinykate/opie-tinykate_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tinykate \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-tinykate/opie-tinykate_cvs.bb b/packages/opie-tinykate/opie-tinykate_cvs.bb
index b6c3e6e0d0..3edc84e468 100644
--- a/packages/opie-tinykate/opie-tinykate_cvs.bb
+++ b/packages/opie-tinykate/opie-tinykate_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/tinykate \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.0.bb b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.1.bb
index 76a2af5e95..5e3bc26ae3 100644
--- a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.0.bb
+++ b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/addressbook "
diff --git a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb
index e92a4d8603..eca8ca9ac5 100644
--- a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb
+++ b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/addressbook "
diff --git a/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.0.bb b/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.1.bb
index dd2b6e4cad..a52ba48ef4 100644
--- a/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.0.bb
+++ b/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/datebook "
diff --git a/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb b/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb
index 79e41934e3..ef042779f5 100644
--- a/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb
+++ b/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/datebook "
diff --git a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.0.bb b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.1.bb
index 62605b57a3..90eec22eca 100644
--- a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.0.bb
+++ b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/fortune "
diff --git a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb
index fbcfffeb24..748617fe02 100644
--- a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb
+++ b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/fortune "
diff --git a/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.0.bb b/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.1.bb
index 15ed92e1fb..d9fa557397 100644
--- a/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.0.bb
+++ b/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/mail "
diff --git a/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb b/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb
index 74d880d046..9fef0fd332 100644
--- a/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb
+++ b/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/mail "
diff --git a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.0.bb b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.1.bb
index 2261da984a..b98d8170a6 100644
--- a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.0.bb
+++ b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/stockticker \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb
index cdc4129546..a541a9359b 100644
--- a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb
+++ b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/stockticker \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.0.bb b/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.1.bb
index a592035953..73bd121a45 100644
--- a/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.0.bb
+++ b/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/todolist "
diff --git a/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb b/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb
index 99b86041ab..9139b1143b 100644
--- a/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb
+++ b/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/todolist "
diff --git a/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.0.bb b/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.1.bb
index 082a78addb..6da83c79dc 100644
--- a/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.0.bb
+++ b/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/weather \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb b/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb
index 94f06b4550..e9446885ab 100644
--- a/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb
+++ b/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/weather \
${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-today/opie-today_1.2.0.bb b/packages/opie-today/opie-today_1.2.1.bb
index 2248b4e221..6200f9e4e8 100644
--- a/packages/opie-today/opie-today_1.2.0.bb
+++ b/packages/opie-today/opie-today_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-today/opie-today_cvs.bb b/packages/opie-today/opie-today_cvs.bb
index 5366103446..fa57d320c6 100644
--- a/packages/opie-today/opie-today_cvs.bb
+++ b/packages/opie-today/opie-today_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-todo/opie-todo_1.2.0.bb b/packages/opie-todo/opie-todo_1.2.1.bb
index f9b46b8631..21151ae14a 100644
--- a/packages/opie-todo/opie-todo_1.2.0.bb
+++ b/packages/opie-todo/opie-todo_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/todo \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-todo/opie-todo_cvs.bb b/packages/opie-todo/opie-todo_cvs.bb
index 371a67ccdd..0d08dc9791 100644
--- a/packages/opie-todo/opie-todo_cvs.bb
+++ b/packages/opie-todo/opie-todo_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/todo \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-tonleiter/opie-tonleiter_1.2.0.bb b/packages/opie-tonleiter/opie-tonleiter_1.2.1.bb
index adf15be4bb..f24f4864d3 100644
--- a/packages/opie-tonleiter/opie-tonleiter_1.2.0.bb
+++ b/packages/opie-tonleiter/opie-tonleiter_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/tonleiter \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-tonleiter/opie-tonleiter_cvs.bb b/packages/opie-tonleiter/opie-tonleiter_cvs.bb
index f8a55dbfd9..52b08647e1 100644
--- a/packages/opie-tonleiter/opie-tonleiter_cvs.bb
+++ b/packages/opie-tonleiter/opie-tonleiter_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/tonleiter \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-unikeyboard/opie-unikeyboard_1.2.0.bb b/packages/opie-unikeyboard/opie-unikeyboard_1.2.1.bb
index 7e39f704e3..d83f21559f 100644
--- a/packages/opie-unikeyboard/opie-unikeyboard_1.2.0.bb
+++ b/packages/opie-unikeyboard/opie-unikeyboard_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/unikeyboard "
diff --git a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb
index 3aabcb6869..8573d2fffe 100644
--- a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb
+++ b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/unikeyboard "
diff --git a/packages/opie-usermanager/opie-usermanager_1.2.0.bb b/packages/opie-usermanager/opie-usermanager_1.2.1.bb
index 689f6e05d7..a37dc07e42 100644
--- a/packages/opie-usermanager/opie-usermanager_1.2.0.bb
+++ b/packages/opie-usermanager/opie-usermanager_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/usermanager \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-usermanager/opie-usermanager_cvs.bb b/packages/opie-usermanager/opie-usermanager_cvs.bb
index 8f59ae4e6b..b676a3e8e2 100644
--- a/packages/opie-usermanager/opie-usermanager_cvs.bb
+++ b/packages/opie-usermanager/opie-usermanager_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/usermanager \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.0.bb b/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.1.bb
index c101bd2d2a..0ae8478846 100644
--- a/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.0.bb
+++ b/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sound \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb b/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb
index fd668d2a9a..675fd15891 100644
--- a/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb
+++ b/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sound \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-vmemo/opie-vmemo_1.2.0.bb b/packages/opie-vmemo/opie-vmemo_1.2.1.bb
index bb86b1f67c..e7a2703c24 100644
--- a/packages/opie-vmemo/opie-vmemo_1.2.0.bb
+++ b/packages/opie-vmemo/opie-vmemo_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vmemo \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-vmemo/opie-vmemo_cvs.bb b/packages/opie-vmemo/opie-vmemo_cvs.bb
index 98b74ab969..5f2ac5d338 100644
--- a/packages/opie-vmemo/opie-vmemo_cvs.bb
+++ b/packages/opie-vmemo/opie-vmemo_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/vmemo \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-volumeapplet/opie-volumeapplet_1.2.0.bb b/packages/opie-volumeapplet/opie-volumeapplet_1.2.1.bb
index 2d9114ea81..96cf720327 100644
--- a/packages/opie-volumeapplet/opie-volumeapplet_1.2.0.bb
+++ b/packages/opie-volumeapplet/opie-volumeapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/volumeapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
index af6482d53c..be79bbd2d3 100644
--- a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
+++ b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/volumeapplet \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-vtapplet/opie-vtapplet_1.2.0.bb b/packages/opie-vtapplet/opie-vtapplet_1.2.1.bb
index 7f4a1cf150..44a61cccd1 100644
--- a/packages/opie-vtapplet/opie-vtapplet_1.2.0.bb
+++ b/packages/opie-vtapplet/opie-vtapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vtapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-vtapplet/opie-vtapplet_cvs.bb b/packages/opie-vtapplet/opie-vtapplet_cvs.bb
index 1f4306a507..137a4af69c 100644
--- a/packages/opie-vtapplet/opie-vtapplet_cvs.bb
+++ b/packages/opie-vtapplet/opie-vtapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/vtapplet \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-wellenreiter/files/we-version.patch b/packages/opie-wellenreiter/files/we-version.patch
deleted file mode 100644
index 9a35368be9..0000000000
--- a/packages/opie-wellenreiter/files/we-version.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- wellenreiter/gui/gui.pro 2004-12-25 09:13:32.000000000 +1300
-+++ wellenreiter/gui/gui.pro 2005-04-24 21:43:30.000000000 +1200
-@@ -33,6 +33,9 @@
- DEPENDPATH += $(OPIEDIR)/include
- INTERFACES = configbase.ui
- TARGET = wellenreiter
-+VERSION = 1.0.5
-+
-+DEFINES += WELLENREITER_VERSION='"$$VERSION (GPL) Opie"'
-
- !contains( platform, x11 ) {
- message( qws )
---- wellenreiter/gui/wellenreiter.cpp 2004-10-29 23:51:08.000000000 +1300
-+++ wellenreiter/gui/wellenreiter.cpp 2005-04-24 21:43:30.000000000 +1200
-@@ -569,7 +569,8 @@
- }
-
- // check if wireless extension version matches
-- if ( ONetwork::wirelessExtensionCompileVersion() != iface->wirelessExtensionDriverVersion() )
-+ if ( ONetwork::wirelessExtensionCompileVersion() != iface->wirelessExtensionDriverVersion()
-+ && ( ONetwork::wirelessExtensionCompileVersion() <= 15 || iface->wirelessExtensionDriverVersion() <= 15 ) )
- {
- QMessageBox::critical( this, "Wellenreiter II", tr( "<p>The Wireless Extension Versions<br>do not match!<p>"
- " Wellenreiter II : WE V%1<br>Interface driver: WE V%2" )
---- wellenreiter/gui/wellenreiterbase.cpp 2004-08-24 23:53:44.000000000 +1200
-+++ wellenreiter/gui/wellenreiterbase.cpp 2005-04-24 21:43:30.000000000 +1200
-@@ -33,8 +33,6 @@
- #include <qtabwidget.h>
- #endif
-
--#define WELLENREITER_VERSION "V1.0.3 (unofficial)"
--
- /*
- * Constructs a WellenreiterBase which is a child of 'parent', with the
- * name 'name' and widget flags set to 'f'
-@@ -111,7 +109,7 @@
- QPainter draw( &logo );
- draw.setPen( Qt::black );
- draw.setFont( QFont( "Fixed", 8 ) );
-- draw.drawText( 30, 10, WELLENREITER_VERSION );
-+ draw.drawText( 5, 10, WELLENREITER_VERSION );
-
- PixmapLabel1_3_2->setPixmap( logo );
- PixmapLabel1_3_2->setScaledContents( TRUE );
diff --git a/packages/opie-wellenreiter/opie-wellenreiter_1.2.0.bb b/packages/opie-wellenreiter/opie-wellenreiter_1.2.0.bb
deleted file mode 100644
index 609d67b54b..0000000000
--- a/packages/opie-wellenreiter/opie-wellenreiter_1.2.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-include ${PN}.inc
-
-PR = "r1"
-
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/wellenreiter \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
- file://we-version.patch;patch=1"
diff --git a/packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb b/packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb
new file mode 100644
index 0000000000..b2e3975f7a
--- /dev/null
+++ b/packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb
@@ -0,0 +1,6 @@
+include ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/wellenreiter \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb b/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb
index da32607b0c..5d2322d913 100644
--- a/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb
+++ b/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/wellenreiter \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.0.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.1.bb
index 433f4e08fc..b20c5f5f73 100644
--- a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.0.bb
+++ b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.1.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/wirelessapplet"
diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb
index 898f33e92f..fa26be1948 100644
--- a/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb
+++ b/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb
@@ -1,6 +1,5 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/wirelessapplet"
diff --git a/packages/opie-wordgame/opie-wordgame_1.2.0.bb b/packages/opie-wordgame/opie-wordgame_1.2.1.bb
index f82ffeeb62..faf4d44ef8 100644
--- a/packages/opie-wordgame/opie-wordgame_1.2.0.bb
+++ b/packages/opie-wordgame/opie-wordgame_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/wordgame \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-wordgame/opie-wordgame_cvs.bb b/packages/opie-wordgame/opie-wordgame_cvs.bb
index c195997e8f..7e795a85d0 100644
--- a/packages/opie-wordgame/opie-wordgame_cvs.bb
+++ b/packages/opie-wordgame/opie-wordgame_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/wordgame \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-write/opie-write_1.2.0.bb b/packages/opie-write/opie-write_1.2.1.bb
index a16cbafe69..8a4cc0ebc5 100644
--- a/packages/opie-write/opie-write_1.2.0.bb
+++ b/packages/opie-write/opie-write_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-write/opie-write_cvs.bb b/packages/opie-write/opie-write_cvs.bb
index f80ec9999b..bf7139ebbd 100644
--- a/packages/opie-write/opie-write_cvs.bb
+++ b/packages/opie-write/opie-write_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-zkbapplet/opie-zkbapplet_1.2.0.bb b/packages/opie-zkbapplet/opie-zkbapplet_1.2.1.bb
index 25a2fb108e..95216c7570 100644
--- a/packages/opie-zkbapplet/opie-zkbapplet_1.2.0.bb
+++ b/packages/opie-zkbapplet/opie-zkbapplet_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/zkbapplet \
${HANDHELDS_CVS};tag=${TAG};module=opie/share \
diff --git a/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb b/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb
index 46f75c3e3c..6a4d7107d0 100644
--- a/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb
+++ b/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/zkbapplet \
${HANDHELDS_CVS};module=opie/share \
diff --git a/packages/opie-zlines/opie-zlines_1.2.0.bb b/packages/opie-zlines/opie-zlines_1.2.1.bb
index 84cb56cd63..8a1ad20373 100644
--- a/packages/opie-zlines/opie-zlines_1.2.0.bb
+++ b/packages/opie-zlines/opie-zlines_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/zlines \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-zlines/opie-zlines_cvs.bb b/packages/opie-zlines/opie-zlines_cvs.bb
index 5cadc492aa..068b0d4231 100644
--- a/packages/opie-zlines/opie-zlines_cvs.bb
+++ b/packages/opie-zlines/opie-zlines_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/zlines \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-zsafe/opie-zsafe_1.2.0.bb b/packages/opie-zsafe/opie-zsafe_1.2.1.bb
index e5338f7840..7e2c2a020b 100644
--- a/packages/opie-zsafe/opie-zsafe_1.2.0.bb
+++ b/packages/opie-zsafe/opie-zsafe_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/zsafe \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-zsafe/opie-zsafe_cvs.bb b/packages/opie-zsafe/opie-zsafe_cvs.bb
index 49a3ca4956..f25a047afe 100644
--- a/packages/opie-zsafe/opie-zsafe_cvs.bb
+++ b/packages/opie-zsafe/opie-zsafe_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/zsafe \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-zsame/opie-zsame_1.2.0.bb b/packages/opie-zsame/opie-zsame_1.2.1.bb
index b56b9b05f4..0c4691b578 100644
--- a/packages/opie-zsame/opie-zsame_1.2.0.bb
+++ b/packages/opie-zsame/opie-zsame_1.2.1.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/zsame \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-zsame/opie-zsame_cvs.bb b/packages/opie-zsame/opie-zsame_cvs.bb
index 01dea22bef..565a68e820 100644
--- a/packages/opie-zsame/opie-zsame_cvs.bb
+++ b/packages/opie-zsame/opie-zsame_cvs.bb
@@ -1,7 +1,6 @@
include ${PN}.inc
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.2.1+cvs-${CVSDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/zsame \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/qt/qt-x11-free_3.3.5.bb b/packages/qt/qt-x11-free_3.3.5.bb
index 1ce8234be8..2bb9453159 100644
--- a/packages/qt/qt-x11-free_3.3.5.bb
+++ b/packages/qt/qt-x11-free_3.3.5.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL QPL"
HOMEPAGE = "http://www.trolltech.com"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
DEPENDS = "uicmoc3-native freetype x11 xft xext libxrender libxrandr libxcursor mysql"
-PROVIDES = "qt3-x11"
+PROVIDES = "qt3x11"
PR = "r10"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
diff --git a/packages/qt/qt-x11-free_4.0.1.bb b/packages/qt/qt-x11-free_4.0.1.bb
index 49c7506c9f..f3b4dd3aa6 100644
--- a/packages/qt/qt-x11-free_4.0.1.bb
+++ b/packages/qt/qt-x11-free_4.0.1.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com"
LICENSE = "GPL QPL"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
DEPENDS = "uicmoc4-native freetype jpeg x11 xft xext libxrender libxrandr libxcursor mysql"
-PROVIDES = "qt4-x11"
+PROVIDES = "qt4x11"
# FIXME: Make it use 'our' qmake
# DEPENDS += "qmake-native-2.00a"
PR = "r1"
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/compile-fix-HACK.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/compile-fix-HACK.patch
deleted file mode 100644
index a8182076d7..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.2/compile-fix-HACK.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- linux-wlan-ng-0.2.2/src/prism2/driver/prism2_cs.c~compile-fix-HACK.patch
-+++ linux-wlan-ng-0.2.2/src/prism2/driver/prism2_cs.c
-@@ -21,15 +21,6 @@
- * is set to and what the CIS
- * says.
- */
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) )
--#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,5))
--static int numlist = 4;
--module_param_array(irq_list, int, numlist, 0444);
--#else
--module_param_array(irq_list, int, NULL, 0444);
--#endif
--module_param( irq_mask, int, 0644);
--#endif
-
- static dev_link_t *dev_list = NULL; /* head of instance list */
-
---- linux-wlan-ng-0.2.2/src/prism2/driver/hfa384x_usb.c~compile-fix-HACK.patch
-+++ linux-wlan-ng-0.2.2/src/prism2/driver/hfa384x_usb.c
-@@ -3240,7 +3240,7 @@
- int result;
- DBFENTER;
-
-- might_sleep();
-+ might_sleep(0);
-
- if (usb_clear_halt(hw->usb, hw->endp_in)) {
- WLAN_LOG_ERROR(
-@@ -3316,7 +3316,7 @@
- int i;
- DBFENTER;
-
-- might_sleep();
-+ might_sleep(0);
-
- /* There's no need for spinlocks here. The USB "disconnect"
- * function sets this "removed" flag and then calls us.
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in
index 5b9b7c780c..69f8ac1db2 100644
--- a/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in
@@ -1,7 +1,7 @@
WLAN_VERSION=0
WLAN_PATCHLEVEL=2
-WLAN_SUBLEVEL=1
-WLAN_EXTRAVERSION=-pre26
+WLAN_SUBLEVEL=2
+WLAN_EXTRAVERSION=
#LINUX_SRC=$(KERNEL_SOURCE)
PCMCIA_SRC=
PREFIX=
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/might-sleep.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/might-sleep.patch
new file mode 100644
index 0000000000..a156229331
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/might-sleep.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linux-wlan-ng-0.2.2/src/include/wlan/wlan_compat.h~might_sleep
++++ linux-wlan-ng-0.2.2/src/include/wlan/wlan_compat.h
+@@ -584,7 +584,7 @@
+ #endif
+
+ #ifndef might_sleep
+-#define might_sleep(a) do { } while (0)
++#define might_sleep() do { } while (0)
+ #endif
+
+ /* Apparently 2.4.2 ethtool is quite different, maybe newer too? */
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/module_param_array.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/module_param_array.patch
new file mode 100644
index 0000000000..a22d39dca2
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/module_param_array.patch
@@ -0,0 +1,19 @@
+--- linux-wlan-ng-0.2.2/src/prism2/driver/prism2_cs.c~ 2005-07-20 19:16:55.000000000 +0200
++++ linux-wlan-ng-0.2.2/src/prism2/driver/prism2_cs.c 2005-09-01 19:02:59.099563318 +0200
+@@ -22,12 +22,16 @@
+ * says.
+ */
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) )
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,5))
+ static int numlist = 4;
+ module_param_array(irq_list, int, numlist, 0444);
+ #else
+ module_param_array(irq_list, int, NULL, 0444);
+ #endif
++#else
++MODULE_PARM( irq_list, "1-4i" );
++#endif
+ module_param( irq_mask, int, 0644);
+ #endif
+
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/more-compat.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/more-compat.patch
new file mode 100644
index 0000000000..4ce8173f93
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/more-compat.patch
@@ -0,0 +1,7 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linux-wlan-ng-0.2.2/wlan_compat.h
++++ /dev/null
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/pcmciasrc.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/pcmciasrc.patch
new file mode 100644
index 0000000000..ea76baa98b
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/pcmciasrc.patch
@@ -0,0 +1,45 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linux-wlan-ng-0.2.2/Configure~pcmciasrc
++++ linux-wlan-ng-0.2.2/Configure
+@@ -358,37 +358,6 @@
+ # kernel PCMCIA.
+
+ if [ $WLAN_KERN_PCMCIA != "y" ] ; then
+- if [ ! "$PCMCIA_SRC" ] ; then
+- if [ -f /sbin/cardctl ] ; then
+- PCMCIA_SRC=`/sbin/cardctl -V 2>&1 | sed -e 's/cardctl version //'`
+- PCMCIA_SRC=/usr/src/pcmcia-cs-$PCMCIA_SRC
+- fi
+- fi
+- ask_str "pcmcia-cs source dir" PCMCIA_SRC
+-
+- if [ ! -f $PCMCIA_SRC/Makefile ] ; then
+- $ECHO "pcmcia-cs source tree $PCMCIA_SRC is incomplete or missing!"
+- $ECHO "The wlan driver for pcmcia cannot be built without "
+- $ECHO "the pcmcia-cs source tree present and configured."
+- fail
+- fi
+- if [ ! -f $PCMCIA_SRC/include/pcmcia/config.h ] ; then
+- $ECHO "The pcmcia-cs source tree does not appear to be configured."
+- $ECHO "The wlan driver for pcmcia cannot be built without "\
+- $ECHO "the pcmcia-cs source tree present and configured."
+- fail
+- fi
+- $ECHO ""
+-
+- # Now we need to generate the module options flags.
+- # It's only relevant if modversions is turned on.
+- grep CONFIG_MODVERSIONS=y < $PCMCIA_SRC/config.mk > /dev/null
+- if [ $? = 0 ] ; then
+- PCMCIA_MODFLAGS="-DMODULE -DMODVERSIONS -include $PCMCIA_SRC/include/linux/modversions.h"
+- else
+- PCMCIA_MODFLAGS="-DMODULE"
+- fi
+-
+ # new versions of pcmcia-cs don't generate their own modversion.h
+ # if they don't have it, use the kernel module flags instead.
+ if [ ! -f $PCMCIA_SRC/include/linux/modversions.h ] ; then
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/scripts-makefile-hostcc.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/scripts-makefile-hostcc.patch
new file mode 100644
index 0000000000..1746b8a359
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.2/scripts-makefile-hostcc.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linux-wlan-ng-0.2.2/scripts/Makefile~scripts-makefile-hostcc
++++ linux-wlan-ng-0.2.2/scripts/Makefile
+@@ -24,7 +24,7 @@
+ exit 1;\
+ fi
+
+- $(CC) -I$(KERNEL_SOURCE)/include get_version.c -o get_version
++ $(BUILD_CC) -I$(KERNEL_SOURCE)/include get_version.c -o get_version
+
+ get_options:
+ $(MAKE) -f $(CURR_DIR)/Makefile.get_options -C $(KERNEL_SOURCE) get_version_target
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.2.bb b/packages/wlan-ng/wlan-ng-modules_0.2.2.bb
index 9a482447c6..e2528a78af 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.2.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.2.bb
@@ -9,8 +9,11 @@ PR = "r1"
SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
file://no-compat.patch;patch=1 \
file://msleep-vs-mdelay.patch;patch=1 \
+ file://might-sleep.patch;patch=1 \
file://only-the-modules.patch;patch=1 \
- file://compile-fix-HACK.patch;patch=1 \
+ file://module_param_array.patch;patch=1 \
+ file://scripts-makefile-hostcc.patch;patch=1 \
+ file://pcmciasrc.patch;patch=1 \
file://config.in"
S = "${WORKDIR}/linux-wlan-ng-${PV}"
@@ -31,6 +34,7 @@ do_configure() {
echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
echo "CC=${KERNEL_CC}" >> config.mk
echo "LD=${KERNEL_LD}" >> config.mk
+ echo "LDFLAGS=" >> config.mk
# Listen closely... sssshhh... can you hear the wlan-ng build system suck?
rm -f ${KERNEL_SOURCE}/../config.mk
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in
index 5b9b7c780c..1fadad5560 100644
--- a/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in
+++ b/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in
@@ -1,9 +1,9 @@
WLAN_VERSION=0
WLAN_PATCHLEVEL=2
-WLAN_SUBLEVEL=1
-WLAN_EXTRAVERSION=-pre26
+WLAN_SUBLEVEL=2
+WLAN_EXTRAVERSION=
#LINUX_SRC=$(KERNEL_SOURCE)
-PCMCIA_SRC=
+PCMCIA_SRC=.
PREFIX=
INST_EXEDIR=/sbin
#TARGET_ROOT_ON_HOST=
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.2.bb b/packages/wlan-ng/wlan-ng-utils_0.2.2.bb
index 7d5ceda29c..17cf3cab83 100644
--- a/packages/wlan-ng/wlan-ng-utils_0.2.2.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.2.bb
@@ -7,6 +7,8 @@ PR = "r0"
SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
file://only-the-utils.patch;patch=1 \
+ file://scripts-makefile-hostcc.patch;patch=1 \
+ file://pcmciasrc.patch;patch=1 \
file://wlan-ng.modutils \
file://wlan.agent \
file://usbctl \
diff --git a/packages/opie-wellenreiter/files/.mtn2git_empty b/packages/xserver-common/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-wellenreiter/files/.mtn2git_empty
+++ b/packages/xserver-common/files/.mtn2git_empty
diff --git a/packages/xserver-common/files/cxk-rotation.patch b/packages/xserver-common/files/cxk-rotation.patch
new file mode 100644
index 0000000000..f29d052d8d
--- /dev/null
+++ b/packages/xserver-common/files/cxk-rotation.patch
@@ -0,0 +1,24 @@
+diff -Nur xserver-common-1.1~/X11/Xinit.d/11zaurus xserver-common-1.1/X11/Xinit.d/11zaurus
+--- xserver-common-1.1~/X11/Xinit.d/11zaurus 2005-08-29 03:52:46.000000000 -0700
++++ xserver-common-1.1/X11/Xinit.d/11zaurus 2005-09-12 11:03:37.000000000 -0700
+@@ -5,8 +5,19 @@
+ exit 0
+ fi
+
++module_id() {
++ # Get model name
++ echo `grep "^Hardware" /proc/cpuinfo | sed -e "s/.*: *//" | tr a-z A-Z`
++}
++
+ chkhinge -e
+ if [ $? = 12 ]; then
+- xrandr -o right
++ case `module_id` in
++ *SPITZ | *AKITA | *BORZOI)
++ DIRECTION="left" ;;
++ default)
++ DIRECTION="right" ;;
++ esac
++ xrandr -o $DIRECTION
+ fi
+
diff --git a/packages/xserver-common/xserver-common_1.1.bb b/packages/xserver-common/xserver-common_1.1.bb
index 70e689c9d8..76bd376365 100644
--- a/packages/xserver-common/xserver-common_1.1.bb
+++ b/packages/xserver-common/xserver-common_1.1.bb
@@ -4,8 +4,9 @@ LICENSE = "GPL"
SECTION = "x11"
DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r2"
+PR = "r3"
# we are using a gpe-style Makefile
inherit gpe
+SRC_URI += "file://cxk-rotation.patch;patch=1" \ No newline at end of file