summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2004-11-13 20:11:32 +0000
committerHolger Freyther <zecke@selfish.org>2004-11-13 20:11:32 +0000
commitbadb3eafc9060609d6a484f1cc2e19925b5825c4 (patch)
tree24d23afd39a315ba7a5d0dae36d5d1c8d2579aaa
parent3d5519e88c30876da6f211f62e226e23a98d3215 (diff)
Merge the conflict
2004/11/13 21:06:11+01:00 handhelds.org!zecke Opie 1.1.7: Remove CVSDATE and PR from the package files 2004/11/13 20:52:18+01:00 handhelds.org!zecke Update packaging of 1.1.7 to match the 'cvs' version of the Opie versions 2004/11/13 20:36:08+01:00 handhelds.org!zecke Upgrade all Opie 1.1.6 files to Opie 1.1.7 in preparation of the next OpenZaurus/Familiar release. Remove all occurrences of Opie1.1.6 in the files BKrev: 41966a744AeMTtlPuskXFPg512ykqQ
-rw-r--r--libmailwrapper/libmailwrapper_1.1.6.oe28
-rw-r--r--libmailwrapper/libmailwrapper_1.1.7.oe (renamed from opie-aboutapplet/opie-aboutapplet_1.1.6.oe)0
-rw-r--r--libopie/libopie2_1.1.6.oe79
-rw-r--r--libopie/libopie2_1.1.7.oe (renamed from opie-addressbook/opie-addressbook_1.1.6.oe)0
-rw-r--r--libopieobex/libopieobex0_1.1.6.oe23
-rw-r--r--libopieobex/libopieobex0_1.1.7.oe (renamed from opie-alarm/opie-alarm_1.1.6.oe)0
-rw-r--r--libopietooth/libopietooth1_1.1.6.oe26
-rw-r--r--libopietooth/libopietooth1_1.1.7.oe (renamed from opie-appearance/opie-appearance_1.1.6.oe)0
-rw-r--r--libqpe/libqpe-opie_1.1.6.oe53
-rw-r--r--libqpe/libqpe-opie_1.1.7.oe (renamed from opie-aqpkg/opie-aqpkg_1.1.6.oe)0
-rw-r--r--opie-aboutapplet/opie-aboutapplet_1.1.7.oe (renamed from opie-autorotateapplet/opie-autorotateapplet_1.1.6.oe)0
-rw-r--r--opie-addressbook/opie-addressbook_1.1.7.oe (renamed from opie-backgammon/opie-backgammon_1.1.6.oe)0
-rw-r--r--opie-advancedfm/opie-advancedfm_1.1.6.oe25
-rw-r--r--opie-advancedfm/opie-advancedfm_1.1.7.oe (renamed from opie-backup/opie-backup_1.1.6.oe)0
-rw-r--r--opie-alarm/opie-alarm_1.1.7.oe (renamed from opie-batteryapplet/opie-batteryapplet_1.1.6.oe)0
-rw-r--r--opie-appearance/opie-appearance_1.1.7.oe (renamed from opie-bluepin/opie-bluepin_1.1.6.oe)0
-rw-r--r--opie-aqpkg/opie-aqpkg_1.1.7.oe (renamed from opie-bluetoothapplet/opie-bluetoothapplet_1.1.6.oe)0
-rw-r--r--opie-autorotateapplet/opie-autorotateapplet_1.1.7.oe (renamed from opie-bluetoothmanager/opie-bluetoothmanager_1.1.6.oe)0
-rw-r--r--opie-backgammon/opie-backgammon_1.1.7.oe (renamed from opie-bounce/opie-bounce_1.1.6.oe)0
-rw-r--r--opie-backup/opie-backup_1.1.7.oe (renamed from opie-brightnessapplet/opie-brightnessapplet_1.1.6.oe)0
-rw-r--r--opie-bartender/opie-bartender_1.1.6.oe26
-rw-r--r--opie-bartender/opie-bartender_1.1.7.oe (renamed from opie-button-settings/opie-button-settings_1.1.6.oe)0
-rw-r--r--opie-batteryapplet/opie-batteryapplet_1.1.7.oe (renamed from opie-buzzword/opie-buzzword_1.1.6.oe)0
-rw-r--r--opie-bluepin/opie-bluepin_1.1.7.oe (renamed from opie-calculator/opie-calculator_1.1.6.oe)0
-rw-r--r--opie-bluetoothapplet/opie-bluetoothapplet_1.1.7.oe (renamed from opie-calibrate/opie-calibrate_1.1.6.oe)0
-rw-r--r--opie-bluetoothmanager/opie-bluetoothmanager_1.1.7.oe (renamed from opie-citytime/opie-citytime_1.1.6.oe)0
-rw-r--r--opie-bounce/opie-bounce_1.1.7.oe (renamed from opie-clipboardapplet/opie-clipboardapplet_1.1.6.oe)0
-rw-r--r--opie-brightnessapplet/opie-brightnessapplet_1.1.7.oe (renamed from opie-clock/opie-clock_1.1.6.oe)0
-rw-r--r--opie-button-settings/opie-button-settings_1.1.7.oe (renamed from opie-clockapplet/opie-clockapplet_1.1.6.oe)0
-rw-r--r--opie-buzzword/opie-buzzword_1.1.7.oe (renamed from opie-confeditor/opie-confeditor_1.1.6.oe)0
-rw-r--r--opie-calculator/opie-calculator_1.1.7.oe (renamed from opie-dasher/opie-dasher_1.1.6.oe)0
-rw-r--r--opie-calibrate/opie-calibrate_1.1.7.oe (renamed from opie-datebook/opie-datebook_1.1.6.oe)0
-rw-r--r--opie-cardmon/opie-cardmon_1.1.6.oe41
-rw-r--r--opie-cardmon/opie-cardmon_1.1.7.oe (renamed from opie-deco-flat/opie-deco-flat_1.1.6.oe)0
-rw-r--r--opie-citytime/opie-citytime_1.1.7.oe (renamed from opie-deco-liquid/opie-deco-liquid_1.1.6.oe)0
-rw-r--r--opie-clipboardapplet/opie-clipboardapplet_1.1.7.oe (renamed from opie-deco-polished/opie-deco-polished_1.1.6.oe)0
-rw-r--r--opie-clock/opie-clock_1.1.7.oe (renamed from opie-doctab/opie-doctab_1.1.6.oe)0
-rw-r--r--opie-clockapplet/opie-clockapplet_1.1.7.oe (renamed from opie-drawpad/opie-drawpad_1.1.6.oe)0
-rw-r--r--opie-confeditor/opie-confeditor_1.1.7.oe (renamed from opie-dvorak/opie-dvorak_1.1.6.oe)0
-rw-r--r--opie-console/opie-console_1.1.6.oe24
-rw-r--r--opie-console/opie-console_1.1.7.oe (renamed from opie-euroconv/opie-euroconv_1.1.6.oe)0
-rw-r--r--opie-dagger/opie-dagger_1.1.6.oe26
-rw-r--r--opie-dagger/opie-dagger_1.1.7.oe (renamed from opie-examples-python/opie-examples-python_1.1.6.oe)0
-rw-r--r--opie-dasher/opie-dasher_1.1.7.oe (renamed from opie-fifteen/opie-fifteen_1.1.6.oe)0
-rw-r--r--opie-datebook/opie-datebook_1.1.7.oe (renamed from opie-formatter/opie-formatter_1.1.6.oe)0
-rw-r--r--opie-deco-flat/opie-deco-flat_1.1.7.oe (renamed from opie-freetype/opie-freetype_1.1.6.oe)0
-rw-r--r--opie-deco-liquid/opie-deco-liquid_1.1.7.oe (renamed from opie-go/opie-go_1.1.6.oe)0
-rw-r--r--opie-deco-polished/opie-deco-polished_1.1.7.oe (renamed from opie-handwriting/opie-handwriting_1.1.6.oe)0
-rw-r--r--opie-doctab/opie-doctab_1.1.7.oe (renamed from opie-helpbrowser/opie-helpbrowser_1.1.6.oe)0
-rw-r--r--opie-drawpad/opie-drawpad_1.1.7.oe (renamed from opie-homeapplet/opie-homeapplet_1.1.6.oe)0
-rw-r--r--opie-dvorak/opie-dvorak_1.1.7.oe (renamed from opie-i18n/opie-lrelease-native_1.1.6.oe)0
-rw-r--r--opie-embeddedkonsole/opie-embeddedkonsole_1.1.6.oe23
-rw-r--r--opie-embeddedkonsole/opie-embeddedkonsole_1.1.7.oe (renamed from opie-i18n/opie-lupdate-native_1.1.6.oe)0
-rw-r--r--opie-euroconv/opie-euroconv_1.1.7.oe (renamed from opie-irdaapplet/opie-irdaapplet_1.1.6.oe)0
-rw-r--r--opie-examples-python/opie-examples-python_1.1.7.oe (renamed from opie-jumpx/opie-jumpx_1.1.6.oe)0
-rw-r--r--opie-eye/opie-eye_1.1.6.oe32
-rw-r--r--opie-eye/opie-eye_1.1.7.oe (renamed from opie-kbill/opie-kbill_1.1.6.oe)0
-rw-r--r--opie-fifteen/opie-fifteen_1.1.7.oe (renamed from opie-kcheckers/opie-kcheckers_1.1.6.oe)0
-rw-r--r--opie-formatter/opie-formatter_1.1.7.oe (renamed from opie-keyboard/opie-keyboard_1.1.6.oe)0
-rw-r--r--opie-freetype/opie-freetype_1.1.7.oe (renamed from opie-keypebble/opie-keypebble_1.1.6.oe)0
-rw-r--r--opie-ftp/opie-ftp_1.1.6.oe26
-rw-r--r--opie-ftp/opie-ftp_1.1.7.oe (renamed from opie-keytabs/opie-keytabs_1.1.6.oe)0
-rw-r--r--opie-ftplib/opie-ftplib_1.1.6.oe27
-rw-r--r--opie-ftplib/opie-ftplib_1.1.7.oe (renamed from opie-keyview/opie-keyview_1.1.6.oe)0
-rw-r--r--opie-go/opie-go_1.1.7.oe (renamed from opie-kjumpx/opie-kjumpx_1.1.6.oe)0
-rw-r--r--opie-gutenbrowser/opie-gutenbrowser_1.1.6.oe27
-rw-r--r--opie-gutenbrowser/opie-gutenbrowser_1.1.7.oe (renamed from opie-kpacman/opie-kpacman_1.1.6.oe)0
-rw-r--r--opie-handwriting/opie-handwriting_1.1.7.oe (renamed from opie-language/opie-language_1.1.6.oe)0
-rw-r--r--opie-help-en/opie-help-en_1.1.6.oe25
-rw-r--r--opie-help-en/opie-help-en_1.1.7.oe (renamed from opie-launcher-settings/opie-launcher-settings_1.1.6.oe)0
-rw-r--r--opie-helpbrowser/opie-helpbrowser_1.1.7.oe (renamed from opie-light-and-power/opie-light-and-power_1.1.6.oe)0
-rw-r--r--opie-homeapplet/opie-homeapplet_1.1.7.oe (renamed from opie-login/opie-login_1.1.6.oe)0
-rw-r--r--opie-i18n/opie-i18n_1.1.6.oe69
-rw-r--r--opie-i18n/opie-i18n_1.1.7.oe (renamed from opie-logoutapplet/opie-logoutapplet_1.1.6.oe)0
-rw-r--r--opie-i18n/opie-lrelease-native_1.1.7.oe (renamed from opie-mailapplet/opie-mailapplet_1.1.6.oe)0
-rw-r--r--opie-i18n/opie-lupdate-native_1.1.7.oe (renamed from opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.1.6.oe)0
-rw-r--r--opie-irc/opie-irc_1.1.6.oe29
-rw-r--r--opie-irc/opie-irc_1.1.7.oe (renamed from opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.1.6.oe)0
-rw-r--r--opie-irdaapplet/opie-irdaapplet_1.1.7.oe (renamed from opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.1.6.oe)0
-rw-r--r--opie-jumpx/opie-jumpx_1.1.7.oe (renamed from opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.1.6.oe)0
-rw-r--r--opie-kbill/opie-kbill_1.1.7.oe (renamed from opie-mediaplayer1/opie-mediaplayer1_1.1.6.oe)0
-rw-r--r--opie-kcheckers/opie-kcheckers_1.1.7.oe (renamed from opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.6.oe)0
-rw-r--r--opie-keyboard/opie-keyboard_1.1.7.oe (renamed from opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.6.oe)0
-rw-r--r--opie-keypebble/opie-keypebble_1.1.7.oe (renamed from opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.6.oe)0
-rw-r--r--opie-keytabs/opie-keytabs_1.1.7.oe (renamed from opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.6.oe)0
-rw-r--r--opie-keyview/opie-keyview_1.1.7.oe (renamed from opie-mediummount/opie-mediummount_1.1.6.oe)0
-rw-r--r--opie-kjumpx/opie-kjumpx_1.1.7.oe (renamed from opie-memoryapplet/opie-memoryapplet_1.1.6.oe)0
-rw-r--r--opie-kpacman/opie-kpacman_1.1.7.oe (renamed from opie-mindbreaker/opie-mindbreaker_1.1.6.oe)0
-rw-r--r--opie-language/opie-language_1.1.7.oe (renamed from opie-minesweep/opie-minesweep_1.1.6.oe)0
-rw-r--r--opie-launcher-settings/opie-launcher-settings_1.1.7.oe (renamed from opie-multikey/opie-multikey_1.1.6.oe)0
-rw-r--r--opie-libqrsync/opie-libqrsync_1.1.6.oe18
-rw-r--r--opie-libqrsync/opie-libqrsync_1.1.7.oe (renamed from opie-multikeyapplet/opie-multikeyapplet_1.1.6.oe)0
-rw-r--r--opie-light-and-power/opie-light-and-power_1.1.7.oe (renamed from opie-networkapplet/opie-networkapplet_1.1.6.oe)0
-rw-r--r--opie-login/opie-login_1.1.7.oe (renamed from opie-notesapplet/opie-notesapplet_1.1.6.oe)0
-rw-r--r--opie-logoutapplet/opie-logoutapplet_1.1.7.oe (renamed from opie-odict/opie-odict_1.1.6.oe)0
-rw-r--r--opie-mail/opie-mail_1.1.6.oe28
-rw-r--r--opie-mail/opie-mail_1.1.7.oe (renamed from opie-oyatzee/opie-oyatzee_1.1.6.oe)0
-rw-r--r--opie-mailapplet/opie-mailapplet_1.1.7.oe (renamed from opie-packagemanager/opie-packagemanager_1.1.6.oe)0
-rw-r--r--opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.1.7.oe (renamed from opie-parashoot/opie-parashoot_1.1.6.oe)0
-rw-r--r--opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.1.7.oe (renamed from opie-performance/opie-performance_1.1.6.oe)0
-rw-r--r--opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.1.7.oe (renamed from opie-pickboard/opie-pickboard_1.1.6.oe)0
-rw-r--r--opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.1.7.oe (renamed from opie-powerchord/opie-powerchord_1.1.6.oe)0
-rw-r--r--opie-mediaplayer1/opie-mediaplayer1_1.1.7.oe (renamed from opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.1.6.oe)0
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.7.oe (renamed from opie-qasteroids/opie-qasteroids_1.1.6.oe)0
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.7.oe (renamed from opie-quicklauncher/opie-quicklauncher_1.1.6.oe)0
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.7.oe (renamed from opie-reader/opie-reader_1.1.6.oe)0
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.7.oe (renamed from opie-recorder/opie-recorder_1.1.6.oe)0
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2_1.1.6.oe27
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe (renamed from opie-remote/opie-remote_1.1.6.oe)0
-rw-r--r--opie-mediummount/opie-mediummount_1.1.7.oe (renamed from opie-restartapplet/opie-restartapplet2_1.1.6.oe)0
-rw-r--r--opie-memoryapplet/opie-memoryapplet_1.1.7.oe (renamed from opie-restartapplet/opie-restartapplet_1.1.6.oe)0
-rw-r--r--opie-mindbreaker/opie-mindbreaker_1.1.7.oe (renamed from opie-rotateapplet/opie-rotateapplet_1.1.6.oe)0
-rw-r--r--opie-minesweep/opie-minesweep_1.1.7.oe (renamed from opie-screenshotapplet/opie-screenshotapplet_1.1.6.oe)0
-rw-r--r--opie-mobilemsg/opie-mobilemsg_1.1.6.oe30
-rw-r--r--opie-mobilemsg/opie-mobilemsg_1.1.7.oe (renamed from opie-search/opie-search_1.1.6.oe)0
-rw-r--r--opie-multikey/opie-multikey_1.1.7.oe (renamed from opie-security/opie-security_1.1.6.oe)0
-rw-r--r--opie-multikeyapplet/opie-multikeyapplet_1.1.7.oe (renamed from opie-sfcave/opie-sfcave_1.1.6.oe)0
-rw-r--r--opie-networkapplet/opie-networkapplet_1.1.7.oe (renamed from opie-sh/opie-sh_1.1.6.oe)0
-rw-r--r--opie-networksettings/opie-networksettings_1.1.6.oe37
-rw-r--r--