summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libmailwrapper/libmailwrapper_cvs.oe4
-rw-r--r--libopie/libopie2_cvs.oe5
-rw-r--r--libopieobex/libopieobex0_cvs.oe2
-rw-r--r--libopietooth/libopietooth1_cvs.oe4
-rw-r--r--libqpe/libqpe-opie_cvs.oe3
-rw-r--r--libqtaux/libqtaux2_cvs.oe2
-rw-r--r--manufacturers/manufacturers_cvs.oe2
-rw-r--r--opie-aboutapplet/opie-aboutapplet_cvs.oe2
-rw-r--r--opie-addressbook/opie-addressbook_cvs.oe2
-rw-r--r--opie-advancedfm/opie-advancedfm_cvs.oe3
-rw-r--r--opie-alarm/opie-alarm_cvs.oe2
-rw-r--r--opie-appearance/opie-appearance_cvs.oe6
-rw-r--r--opie-aqpkg/opie-aqpkg_cvs.oe2
-rw-r--r--opie-autorotateapplet/opie-autorotateapplet_cvs.oe2
-rw-r--r--opie-backgammon/opie-backgammon_cvs.oe2
-rw-r--r--opie-backup/opie-backup_cvs.oe2
-rw-r--r--opie-bartender/opie-bartender_cvs.oe2
-rw-r--r--opie-batteryapplet/opie-batteryapplet_cvs.oe2
-rw-r--r--opie-bluepin/opie-bluepin_cvs.oe2
-rw-r--r--opie-bluetoothapplet/opie-bluetoothapplet_cvs.oe2
-rw-r--r--opie-bluetoothmanager/opie-bluetoothmanager_cvs.oe2
-rw-r--r--opie-bounce/opie-bounce_cvs.oe2
-rw-r--r--opie-brightnessapplet/opie-brightnessapplet_cvs.oe3
-rw-r--r--opie-button-settings/opie-button-settings_cvs.oe3
-rw-r--r--opie-buzzword/opie-buzzword_cvs.oe2
-rw-r--r--opie-calculator/opie-calculator_cvs.oe2
-rw-r--r--opie-calibrate/opie-calibrate_cvs.oe2
-rw-r--r--opie-camera/opie-camera_cvs.oe3
-rw-r--r--opie-cardmon/opie-cardmon_cvs.oe2
-rw-r--r--opie-citytime/opie-citytime_cvs.oe2
-rw-r--r--opie-clipboardapplet/opie-clipboardapplet_cvs.oe2
-rw-r--r--opie-clock/opie-clock_cvs.oe2
-rw-r--r--opie-clockapplet/opie-clockapplet_cvs.oe2
-rw-r--r--opie-confeditor/opie-confeditor_cvs.oe2
-rw-r--r--opie-console/opie-console_cvs.oe3
-rw-r--r--opie-dagger/opie-dagger_cvs.oe3
-rw-r--r--opie-dasher/opie-dasher_cvs.oe2
-rw-r--r--opie-datebook/opie-datebook_cvs.oe2
-rw-r--r--opie-deco-flat/opie-deco-flat_cvs.oe2
-rw-r--r--opie-deco-liquid/opie-deco-liquid_cvs.oe2
-rw-r--r--opie-deco-polished/opie-deco-polished_cvs.oe2
-rw-r--r--opie-doctab/opie-doctab_cvs.oe3
-rw-r--r--opie-drawpad/opie-drawpad_cvs.oe2
-rw-r--r--opie-dvorak/opie-dvorak_cvs.oe3
-rw-r--r--opie-embeddedkonsole/opie-embeddedkonsole_cvs.oe3
-rw-r--r--opie-euroconv/opie-euroconv_cvs.oe2
-rw-r--r--opie-examples-python/opie-examples-python_cvs.oe2
-rw-r--r--opie-eye/opie-eye_cvs.oe3
-rw-r--r--opie-fifteen/opie-fifteen_cvs.oe2
-rw-r--r--opie-formatter/opie-formatter_cvs.oe2
-rw-r--r--opie-freetype/opie-freetype_cvs.oe2
-rw-r--r--opie-ftp/opie-ftp_cvs.oe2
-rw-r--r--opie-ftplib/opie-ftplib_cvs.oe2
-rw-r--r--opie-go/opie-go_cvs.oe2
-rw-r--r--opie-gutenbrowser/opie-gutenbrowser_cvs.oe2
-rw-r--r--opie-handwriting/opie-handwriting_cvs.oe3
-rw-r--r--opie-help-en/opie-help-en_cvs.oe2
-rw-r--r--opie-helpbrowser/opie-helpbrowser_cvs.oe2
-rw-r--r--opie-homeapplet/opie-homeapplet_cvs.oe2
-rw-r--r--opie-i18n/opie-i18n_cvs.oe5
-rw-r--r--opie-i18n/opie-lrelease-native_cvs.oe2
-rw-r--r--opie-i18n/opie-lupdate-native_cvs.oe3
-rw-r--r--opie-irc/opie-irc_cvs.oe2
-rw-r--r--opie-irdaapplet/opie-irdaapplet_cvs.oe2
-rw-r--r--opie-jumpx/opie-jumpx_cvs.oe2
-rw-r--r--opie-kbill/opie-kbill_cvs.oe3
-rw-r--r--opie-kcheckers/opie-kcheckers_cvs.oe2
-rw-r--r--opie-keyboard/opie-keyboard_cvs.oe3
-rw-r--r--opie-keypebble/opie-keypebble_cvs.oe2
-rw-r--r--opie-keytabs/opie-keytabs_cvs.oe2
-rw-r--r--opie-keyview/opie-keyview_cvs.oe2
-rw-r--r--opie-kjumpx/opie-kjumpx_cvs.oe2
-rw-r--r--opie-kpacman/opie-kpacman_cvs.oe3
-rw-r--r--opie-language/opie-language_cvs.oe2
-rw-r--r--opie-launcher-settings/opie-launcher-settings_cvs.oe2
-rw-r--r--opie-libqrsync/opie-libqrsync_cvs.oe2
-rw-r--r--opie-light-and-power/opie-light-and-power_cvs.oe2
-rw-r--r--opie-login/opie-login_cvs.oe2
-rw-r--r--opie-logoutapplet/opie-logoutapplet_cvs.oe2
-rw-r--r--opie-mail/opie-mail_cvs.oe2
-rw-r--r--opie-mailapplet/opie-mailapplet_cvs.oe2
-rw-r--r--opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe2
-rw-r--r--opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.oe2
-rw-r--r--opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.oe2
-rw-r--r--opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.oe2
-rw-r--r--opie-mediaplayer1/opie-mediaplayer1_cvs.oe2
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.oe6
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.oe6
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.oe6
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.oe6
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2_cvs.oe5
-rw-r--r--opie-mediummount/opie-mediummount_cvs.oe2
-rw-r--r--opie-memoryapplet/opie-memoryapplet_cvs.oe2
-rw-r--r--opie-mindbreaker/opie-mindbreaker_cvs.oe2
-rw-r--r--opie-minesweep/opie-minesweep_cvs.oe2
-rw-r--r--opie-mobilemsg/opie-mobilemsg_cvs.oe2
-rw-r--r--opie-multikey/opie-multikey_cvs.oe3
-rw-r--r--opie-multikeyapplet/opie-multikeyapplet_cvs.oe2
-rw-r--r--opie-networkapplet/opie-networkapplet_cvs.oe2
-rw-r--r--opie-networksettings/opie-networksettings_cvs.oe3
-rw-r--r--opie-notesapplet/opie-notesapplet_cvs.oe2
-rw-r--r--opie-odict/opie-odict_cvs.oe2
-rw-r--r--opie-oxygen/opie-oxygen_cvs.oe2
-rw-r--r--opie-oyatzee/opie-oyatzee_cvs.oe2
-rw-r--r--opie-packagemanager/opie-packagemanager_cvs.oe2
-rw-r--r--opie-parashoot/opie-parashoot_cvs.oe2
-rw-r--r--opie-performance/opie-performance_cvs.oe2
-rw-r--r--opie-pickboard/opie-pickboard_cvs.oe2
-rw-r--r--opie-pics/opie-pics_cvs.oe4
-rw-r--r--opie-pimconverter/opie-pimconverter_cvs.oe2
-rw-r--r--opie-powerchord/opie-powerchord_cvs.oe2
-rw-r--r--opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.oe2
-rw-r--r--opie-qashmoney/opie-qashmoney_cvs.oe2
-rw-r--r--opie-qasteroids/opie-qasteroids_cvs.oe2
-rw-r--r--opie-qcop/opie-qcop_cvs.oe2
-rw-r--r--opie-quicklauncher/opie-quicklauncher_cvs.oe2
-rw-r--r--opie-rdesktop/opie-rdesktop_cvs.oe2
-rw-r--r--opie-reader/opie-reader_cvs.oe2
-rw-r--r--opie-recorder/opie-recorder_cvs.oe2
-rw-r--r--opie-remote/opie-remote_cvs.oe2
-rw-r--r--opie-restartapplet/opie-restartapplet2_cvs.oe2
-rw-r--r--opie-restartapplet/opie-restartapplet_cvs.oe2
-rw-r--r--opie-restartapplet2/opie-restartapplet2_cvs.oe2
-rw-r--r--opie-rotateapplet/opie-rotateapplet_cvs.oe2
-rw-r--r--opie-screenshotapplet/opie-screenshotapplet_cvs.oe2
-rw-r--r--opie-search/opie-search_cvs.oe2
-rw-r--r--opie-security/opie-security_cvs.oe2
-rw-r--r--opie-securityplugins/opie-securityplugin-blueping_cvs.oe2
-rw-r--r--opie-securityplugins/opie-securityplugin-dummy_cvs.oe2
-rw-r--r--opie-securityplugins/opie-securityplugin-notice_cvs.oe2
-rw-r--r--opie-securityplugins/opie-securityplugin-pin_cvs.oe2
-rw-r--r--opie-sfcave/opie-sfcave_cvs.oe2
-rw-r--r--opie-sh/opie-sh_cvs.oe3
-rw-r--r--opie-sheet/opie-sheet_cvs.oe2
-rw-r--r--opie-showimg/opie-showimg_cvs.oe2
-rw-r--r--opie-snake/opie-snake_cvs.oe2
-rw-r--r--opie-solitaire/opie-solitaire_cvs.oe2
-rw-r--r--opie-sshkeys/opie-sshkeys_cvs.oe2
-rw-r--r--opie-style-flat/opie-style-flat_cvs.oe2
-rw-r--r--opie-style-fresh/opie-style-fresh_cvs.oe2
-rw-r--r--opie-style-liquid/opie-style-liquid_cvs.oe2
-rw-r--r--opie-style-metal/opie-style-metal_cvs.oe2
-rw-r--r--opie-style-phase/opie-style-phase_cvs.oe2
-rw-r--r--opie-style-web/opie-style-web_cvs.oe2
-rw-r--r--opie-suspendapplet/opie-suspendapplet_cvs.oe2
-rw-r--r--opie-symlinker/opie-symlinker_cvs.oe2
-rw-r--r--opie-sysinfo/opie-sysinfo_cvs.oe3
-rw-r--r--opie-systemtime/opie-systemtime_cvs.oe2
-rw-r--r--opie-tableviewer/opie-tableviewer_cvs.oe2
-rw-r--r--opie-tabmanager/opie-tabmanager_cvs.oe2
-rw-r--r--opie-taskbar/opie-taskbar_cvs.oe3
-rw-r--r--opie-tetrix/opie-tetrix_cvs.oe2
-rw-r--r--opie-textedit/opie-textedit_cvs.oe2
-rw-r--r--opie-theme/opie-theme_cvs.oe2
-rw-r--r--opie-tictac/opie-tictac_cvs.oe2
-rw-r--r--opie-tinykate/opie-tinykate_cvs.oe2
-rw-r--r--opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.oe4
-rw-r--r--opie-today-datebookplugin/opie-today-datebookplugin_cvs.oe2
-rw-r--r--opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.oe2
-rw-r--r--opie-today-mailplugin/opie-today-mailplugin_cvs.oe2
-rw-r--r--opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.oe2
-rw-r--r--opie-today-todolistplugin/opie-today-todolistplugin_cvs.oe2
-rw-r--r--opie-today-weatherplugin/opie-today-weatherplugin_cvs.oe2
-rw-r--r--opie-today/opie-today_cvs.oe2
-rw-r--r--opie-todo/opie-todo_cvs.oe2
-rw-r--r--opie-tonleiter/opie-tonleiter_cvs.oe2
-rw-r--r--opie-ubrowser/opie-ubrowser_cvs.oe2
-rw-r--r--opie-unikeyboard/opie-unikeyboard_cvs.oe2
-rw-r--r--opie-usermanager/opie-usermanager_cvs.oe2
-rw-r--r--opie-vmemo-settings/opie-vmemo-settings_cvs.oe2
-rw-r--r--opie-vmemo/opie-vmemo_cvs.oe2
-rw-r--r--opie-volumeapplet/opie-volumeapplet_cvs.oe2
-rw-r--r--opie-vtapplet/opie-vtapplet_cvs.oe2
-rw-r--r--opie-wellenreiter/opie-wellenreiter_cvs.oe3
-rw-r--r--opie-wirelessapplet/opie-wirelessapplet_cvs.oe2
-rw-r--r--opie-wordgame/opie-wordgame_cvs.oe3
-rw-r--r--opie-write/opie-write_cvs.oe2
-rw-r--r--opie-zkbapplet/opie-zkbapplet_cvs.oe3
-rw-r--r--opie-zlines/opie-zlines_cvs.oe2
-rw-r--r--opie-zsafe/opie-zsafe_cvs.oe2
-rw-r--r--opie-zsame/opie-zsame_cvs.oe2
-rw-r--r--timezones/timezones_cvs.oe8
182 files changed, 201 insertions, 230 deletions
diff --git a/libmailwrapper/libmailwrapper_cvs.oe b/libmailwrapper/libmailwrapper_cvs.oe
index c96bb5e3f0..5fb1b6ee24 100644
--- a/libmailwrapper/libmailwrapper_cvs.oe
+++ b/libmailwrapper/libmailwrapper_cvs.oe
@@ -1,10 +1,10 @@
-DESCRIPTION = "Qt-based class wrapper of libetpan."
+DESCRIPTION = "Qt-based class wrapper of libetpan"
SECTION = "opie/libs"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "LGPL"
DEPENDS = "libetpan"
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/mail/libmailwrapper "
S = "${WORKDIR}/libmailwrapper"
diff --git a/libopie/libopie2_cvs.oe b/libopie/libopie2_cvs.oe
index b5c8a71810..6974045264 100644
--- a/libopie/libopie2_cvs.oe
+++ b/libopie/libopie2_cvs.oe
@@ -4,9 +4,8 @@ SECTION = "opie/libs"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "LGPL"
DEPENDS = "libqpe-opie sqlite libpcap-0.7.2 virtual/kernel"
-PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2 "
-PV = "1.1.6-cvs-${CVSDATE}"
-PR = "r2"
+PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2"
+PV = "1.1.6+cvs-${CVSDATE}"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/libopie2 \
file://include.pro"
diff --git a/libopieobex/libopieobex0_cvs.oe b/libopieobex/libopieobex0_cvs.oe
index 71aae1f4cf..9673aa87d4 100644
--- a/libopieobex/libopieobex0_cvs.oe
+++ b/libopieobex/libopieobex0_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "LGPL"
DEPENDS = "opie-taskbar openobex"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "obex"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/obex \
diff --git a/libopietooth/libopietooth1_cvs.oe b/libopietooth/libopietooth1_cvs.oe
index 1fe18d23f2..c38f2bc20f 100644
--- a/libopietooth/libopietooth1_cvs.oe
+++ b/libopietooth/libopietooth1_cvs.oe
@@ -2,9 +2,9 @@ DESCRIPTION = "Opie Bluetooth library"
SECTION = "opie/libs"
PRIORITY = "optional"
DEPENDS = "libopie2"
-MAINTAINER = "Team Opie <opie@handhelds.org>
+MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "LGPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
inherit opie
diff --git a/libqpe/libqpe-opie_cvs.oe b/libqpe/libqpe-opie_cvs.oe
index ba2532b918..8999324431 100644
--- a/libqpe/libqpe-opie_cvs.oe
+++ b/libqpe/libqpe-opie_cvs.oe
@@ -5,8 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
DEPENDS = "uicmoc-native qte-for-opie"
PROVIDES = "virtual/libqpe"
-PV = "1.1.6-cvs-${CVSDATE}"
-PR = "r1"
+PV = "1.1.6+cvs-${CVSDATE}"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/library"
S = "${WORKDIR}/library"
diff --git a/libqtaux/libqtaux2_cvs.oe b/libqtaux/libqtaux2_cvs.oe
index 862bbc9f87..92d8e10ed8 100644
--- a/libqtaux/libqtaux2_cvs.oe
+++ b/libqtaux/libqtaux2_cvs.oe
@@ -4,7 +4,7 @@ SECTION = "opie/libs"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/libqtaux"
S = "${WORKDIR}/libqtaux"
diff --git a/manufacturers/manufacturers_cvs.oe b/manufacturers/manufacturers_cvs.oe
index 5e3ab9ad07..cf1a6d0b58 100644
--- a/manufacturers/manufacturers_cvs.oe
+++ b/manufacturers/manufacturers_cvs.oe
@@ -1,6 +1,6 @@
SECTION = "base"
DESCRIPTION = "Ethernet manufacturer database"
-MAINTAINER = "Michael 'Mickey' Lauer"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/etc"
S = "${WORKDIR}/etc"
diff --git a/opie-aboutapplet/opie-aboutapplet_cvs.oe b/opie-aboutapplet/opie-aboutapplet_cvs.oe
index 143e690604..155e47b109 100644
--- a/opie-aboutapplet/opie-aboutapplet_cvs.oe
+++ b/opie-aboutapplet/opie-aboutapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Rajko Albrecht <alwin@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "aboutapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/aboutapplet"
diff --git a/opie-addressbook/opie-addressbook_cvs.oe b/opie-addressbook/opie-addressbook_cvs.oe
index 979dd84252..e6ccfcc5c6 100644
--- a/opie-addressbook/opie-addressbook_cvs.oe
+++ b/opie-addressbook/opie-addressbook_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
RDEPENDS = "opie-pics"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "addressbook"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/addressbook \
diff --git a/opie-advancedfm/opie-advancedfm_cvs.oe b/opie-advancedfm/opie-advancedfm_cvs.oe
index 5fbeb34ccc..42e01b7d9d 100644
--- a/opie-advancedfm/opie-advancedfm_cvs.oe
+++ b/opie-advancedfm/opie-advancedfm_cvs.oe
@@ -3,10 +3,9 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "advancedfm"
RDEPENDS = "opie-advancedfm-pics"
-PR = "r1"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/${APPNAME} \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
diff --git a/opie-alarm/opie-alarm_cvs.oe b/opie-alarm/opie-alarm_cvs.oe
index 74ee496b72..ee0007d6a5 100644
--- a/opie-alarm/opie-alarm_cvs.oe
+++ b/opie-alarm/opie-alarm_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/base"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
RDEPENDS = "apmd"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/opiealarm \
diff --git a/opie-appearance/opie-appearance_cvs.oe b/opie-appearance/opie-appearance_cvs.oe
index 7216f7b8ee..26a2478648 100644
--- a/opie-appearance/opie-appearance_cvs.oe
+++ b/opie-appearance/opie-appearance_cvs.oe
@@ -1,10 +1,10 @@
-DESCRIPTION = "Appearance settings dialog for the Opie environment."
+DESCRIPTION = "Appearance settings dialog for the Opie environment"
SECTION = "opie/settings"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-DEPENDS = "libqtaux2 "
-PV = "1.1.6-cvs-${CVSDATE}"
+DEPENDS = "libqtaux2"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "appearance"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/appearance2 \
diff --git a/opie-aqpkg/opie-aqpkg_cvs.oe b/opie-aqpkg/opie-aqpkg_cvs.oe
index 30608bce0f..83e54491e2 100644
--- a/opie-aqpkg/opie-aqpkg_cvs.oe
+++ b/opie-aqpkg/opie-aqpkg_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "aqpkg"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/aqpkg \
diff --git a/opie-autorotateapplet/opie-autorotateapplet_cvs.oe b/opie-autorotateapplet/opie-autorotateapplet_cvs.oe
index 9a462dcc80..07ac3d161e 100644
--- a/opie-autorotateapplet/opie-autorotateapplet_cvs.oe
+++ b/opie-autorotateapplet/opie-autorotateapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "autorotateapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/autorotateapplet \
diff --git a/opie-backgammon/opie-backgammon_cvs.oe b/opie-backgammon/opie-backgammon_cvs.oe
index 7631878975..31bc66939b 100644
--- a/opie-backgammon/opie-backgammon_cvs.oe
+++ b/opie-backgammon/opie-backgammon_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "backgammon"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/backgammon \
diff --git a/opie-backup/opie-backup_cvs.oe b/opie-backup/opie-backup_cvs.oe
index 9a9a7bd108..1dce197115 100644
--- a/opie-backup/opie-backup_cvs.oe
+++ b/opie-backup/opie-backup_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "backup"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/backup \
diff --git a/opie-bartender/opie-bartender_cvs.oe b/opie-bartender/opie-bartender_cvs.oe
index 246b9be883..1a9e6a774f 100644
--- a/opie-bartender/opie-bartender_cvs.oe
+++ b/opie-bartender/opie-bartender_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "bartender"
APPTYPE = "binary"
diff --git a/opie-batteryapplet/opie-batteryapplet_cvs.oe b/opie-batteryapplet/opie-batteryapplet_cvs.oe
index 020b4bec31..400e0a5e7f 100644
--- a/opie-batteryapplet/opie-batteryapplet_cvs.oe
+++ b/opie-batteryapplet/opie-batteryapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "batteryapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/batteryapplet \
diff --git a/opie-bluepin/opie-bluepin_cvs.oe b/opie-bluepin/opie-bluepin_cvs.oe
index e652945378..d3e8804b80 100644
--- a/opie-bluepin/opie-bluepin_cvs.oe
+++ b/opie-bluepin/opie-bluepin_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
DEPENDS = "libopietooth1"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "bluepin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/opietooth/blue-pin"
diff --git a/opie-bluetoothapplet/opie-bluetoothapplet_cvs.oe b/opie-bluetoothapplet/opie-bluetoothapplet_cvs.oe
index f8f0d1ead2..e747c64bbe 100644
--- a/opie-bluetoothapplet/opie-bluetoothapplet_cvs.oe
+++ b/opie-bluetoothapplet/opie-bluetoothapplet_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "libopietooth1"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "bluetoothapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/opietooth/applet \
diff --git a/opie-bluetoothmanager/opie-bluetoothmanager_cvs.oe b/opie-bluetoothmanager/opie-bluetoothmanager_cvs.oe
index 72a6dc37ca..e127ff048a 100644
--- a/opie-bluetoothmanager/opie-bluetoothmanager_cvs.oe
+++ b/opie-bluetoothmanager/opie-bluetoothmanager_cvs.oe
@@ -5,7 +5,7 @@ DEPENDS = "libopietooth1"
RDEPENDS = "opie-bluepin"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "bluetooth-manager"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/opietooth/manager \
diff --git a/opie-bounce/opie-bounce_cvs.oe b/opie-bounce/opie-bounce_cvs.oe
index 83f7ddc3f8..16ad74a93d 100644
--- a/opie-bounce/opie-bounce_cvs.oe
+++ b/opie-bounce/opie-bounce_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "bounce"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/bounce \
diff --git a/opie-brightnessapplet/opie-brightnessapplet_cvs.oe b/opie-brightnessapplet/opie-brightnessapplet_cvs.oe
index 5239b54fe1..488ca39b0f 100644
--- a/opie-brightnessapplet/opie-brightnessapplet_cvs.oe
+++ b/opie-brightnessapplet/opie-brightnessapplet_cvs.oe
@@ -6,9 +6,8 @@ LICENSE = "GPL"
CVSDATE = "20041001"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "brightnessapplet"
-PR = "r1"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/brightnessapplet \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
diff --git a/opie-button-settings/opie-button-settings_cvs.oe b/opie-button-settings/opie-button-settings_cvs.oe
index bb9200aec0..a7d7cec923 100644
--- a/opie-button-settings/opie-button-settings_cvs.oe
+++ b/opie-button-settings/opie-button-settings_cvs.oe
@@ -4,8 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
RDEPENDS = "opie-button-settings-pics"
-PV = "1.1.6-cvs-${CVSDATE}"
-PR = "r1"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "buttonsettings"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/settings/button \
diff --git a/opie-buzzword/opie-buzzword_cvs.oe b/opie-buzzword/opie-buzzword_cvs.oe
index f0bf5e5f28..cbdaa7777d 100644
--- a/opie-buzzword/opie-buzzword_cvs.oe
+++ b/opie-buzzword/opie-buzzword_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "buzzword"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/buzzword \
diff --git a/opie-calculator/opie-calculator_cvs.oe b/opie-calculator/opie-calculator_cvs.oe
index c7fd199ae2..a5d05f7269 100644
--- a/opie-calculator/opie-calculator_cvs.oe
+++ b/opie-calculator/opie-calculator_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "calculator"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/tools/calculator \
diff --git a/opie-calibrate/opie-calibrate_cvs.oe b/opie-calibrate/opie-calibrate_cvs.oe
index 4e5e42116c..3e594ceb9e 100644
--- a/opie-calibrate/opie-calibrate_cvs.oe
+++ b/opie-calibrate/opie-calibrate_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/base"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/calibrate"
S = "${WORKDIR}/calibrate"
diff --git a/opie-camera/opie-camera_cvs.oe b/opie-camera/opie-camera_cvs.oe
index 3b8a9645f0..6718260a28 100644
--- a/opie-camera/opie-camera_cvs.oe
+++ b/opie-camera/opie-camera_cvs.oe
@@ -6,8 +6,7 @@ LICENSE = "GPL"
RDEPENDS = "sharp-camera-support"
APPNAME = "camera"
APPTYPE = "binary"
-PV = "1.0.3-cvs-${CVSDATE}"
-PR = "r1"
+PV = "1.0.3+cvs-${CVSDATE}"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/multimedia/${APPNAME} \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
diff --git a/opie-cardmon/opie-cardmon_cvs.oe b/opie-cardmon/opie-cardmon_cvs.oe
index 110cf7ad04..259c3597e8 100644
--- a/opie-cardmon/opie-cardmon_cvs.oe
+++ b/opie-cardmon/opie-cardmon_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "cardmonapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/cardmon \
diff --git a/opie-citytime/opie-citytime_cvs.oe b/opie-citytime/opie-citytime_cvs.oe
index 1b2c524a9e..dcbebe4c0d 100644
--- a/opie-citytime/opie-citytime_cvs.oe
+++ b/opie-citytime/opie-citytime_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
RRECOMMENDS = "timezones"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "citytime"
diff --git a/opie-clipboardapplet/opie-clipboardapplet_cvs.oe b/opie-clipboardapplet/opie-clipboardapplet_cvs.oe
index 212f20306b..867b49c8a4 100644
--- a/opie-clipboardapplet/opie-clipboardapplet_cvs.oe
+++ b/opie-clipboardapplet/opie-clipboardapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "clipboardapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/clipboardapplet \
diff --git a/opie-clock/opie-clock_cvs.oe b/opie-clock/opie-clock_cvs.oe
index 1296fa915d..033c68dfa3 100644
--- a/opie-clock/opie-clock_cvs.oe
+++ b/opie-clock/opie-clock_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "clock"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/tools/clock \
diff --git a/opie-clockapplet/opie-clockapplet_cvs.oe b/opie-clockapplet/opie-clockapplet_cvs.oe
index 9bc9468e76..f0863405d2 100644
--- a/opie-clockapplet/opie-clockapplet_cvs.oe
+++ b/opie-clockapplet/opie-clockapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "clockapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/clockapplet \
diff --git a/opie-confeditor/opie-confeditor_cvs.oe b/opie-confeditor/opie-confeditor_cvs.oe
index 3794e149b0..b25b395e76 100644
--- a/opie-confeditor/opie-confeditor_cvs.oe
+++ b/opie-confeditor/opie-confeditor_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "confedit"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/confedit \
diff --git a/opie-console/opie-console_cvs.oe b/opie-console/opie-console_cvs.oe
index 4c83dcf034..ec6863490a 100644
--- a/opie-console/opie-console_cvs.oe
+++ b/opie-console/opie-console_cvs.oe
@@ -3,11 +3,10 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
RDEPENDS = "opie-keytabs qte-font-fixed"
APPNAME = "opie-console"
APPTYPE = binary
-PR = "r1"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/${APPNAME} \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
diff --git a/opie-dagger/opie-dagger_cvs.oe b/opie-dagger/opie-dagger_cvs.oe
index 48bb2e5fb9..580dbabe78 100644
--- a/opie-dagger/opie-dagger_cvs.oe
+++ b/opie-dagger/opie-dagger_cvs.oe
@@ -4,9 +4,8 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "libopiecore2 libopieui2 sword"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "dagger"
-PR = "r2"
EXTRA_QMAKEVARS_PRE = "LIBSWORD_INC_DIR=${STAGING_INCDIR}/sword"
diff --git a/opie-dasher/opie-dasher_cvs.oe b/opie-dasher/opie-dasher_cvs.oe
index 4bbaba8736..39b40280a2 100644
--- a/opie-dasher/opie-dasher_cvs.oe
+++ b/opie-dasher/opie-dasher_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/inputmethods"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "qdasher"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/dasher \
diff --git a/opie-datebook/opie-datebook_cvs.oe b/opie-datebook/opie-datebook_cvs.oe
index e7424dc649..6b4c9085b9 100644
--- a/opie-datebook/opie-datebook_cvs.oe
+++ b/opie-datebook/opie-datebook_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
RDEPENDS = "opie-pics"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "datebook"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/datebook \
diff --git a/opie-deco-flat/opie-deco-flat_cvs.oe b/opie-deco-flat/opie-deco-flat_cvs.oe
index c32db315bd..d0d55a60c9 100644
--- a/opie-deco-flat/opie-deco-flat_cvs.oe
+++ b/opie-deco-flat/opie-deco-flat_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/decorations"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "flat"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/decorations/flat "
diff --git a/opie-deco-liquid/opie-deco-liquid_cvs.oe b/opie-deco-liquid/opie-deco-liquid_cvs.oe
index 74b5489f11..fc38047a04 100644
--- a/opie-deco-liquid/opie-deco-liquid_cvs.oe
+++ b/opie-deco-liquid/opie-deco-liquid_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "libqtaux2"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "liquid"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/decorations/liquid "
diff --git a/opie-deco-polished/opie-deco-polished_cvs.oe b/opie-deco-polished/opie-deco-polished_cvs.oe
index d8e4b42864..eeb805cda4 100644
--- a/opie-deco-polished/opie-deco-polished_cvs.oe
+++ b/opie-deco-polished/opie-deco-polished_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/decorations"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "polished"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/decorations/polished "
diff --git a/opie-doctab/opie-doctab_cvs.oe b/opie-doctab/opie-doctab_cvs.oe
index 508ebf8137..d09783c7bf 100644
--- a/opie-doctab/opie-doctab_cvs.oe
+++ b/opie-doctab/opie-doctab_cvs.oe
@@ -3,9 +3,8 @@ SECTION = "opie/settings"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "doctab"
-PR = "r1"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/doctab \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps \
diff --git a/opie-drawpad/opie-drawpad_cvs.oe b/opie-drawpad/opie-drawpad_cvs.oe
index 6ec1c4a173..fb954e72d9 100644
--- a/opie-drawpad/opie-drawpad_cvs.oe
+++ b/opie-drawpad/opie-drawpad_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "libopiecore2 libopieui2 libqtaux2"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "drawpad"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/graphics/drawpad \
diff --git a/opie-dvorak/opie-dvorak_cvs.oe b/opie-dvorak/opie-dvorak_cvs.oe
index ef54a1b183..a087aa18d7 100644
--- a/opie-dvorak/opie-dvorak_cvs.oe
+++ b/opie-dvorak/opie-dvorak_cvs.oe
@@ -5,8 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "opie-pickboard"
RDEPENDS = "opie-pickboard"
-PV = "1.1.6-cvs-${CVSDATE}"
-PR = "r1"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "qdvorak"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/dvorak \
diff --git a/opie-embeddedkonsole/opie-embeddedkonsole_cvs.oe b/opie-embeddedkonsole/opie-embeddedkonsole_cvs.oe
index 5dc21494c5..c2a8019736 100644
--- a/opie-embeddedkonsole/opie-embeddedkonsole_cvs.oe
+++ b/opie-embeddedkonsole/opie-embeddedkonsole_cvs.oe
@@ -4,10 +4,9 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = " libqtaux2"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "embeddedkonsole"
RDEPENDS = "qte-font-fixed"
-PR = "r1"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/${APPNAME} \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
diff --git a/opie-euroconv/opie-euroconv_cvs.oe b/opie-euroconv/opie-euroconv_cvs.oe
index 1e4ba9fd9f..384bd0fb08 100644
--- a/opie-euroconv/opie-euroconv_cvs.oe
+++ b/opie-euroconv/opie-euroconv_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "euroconv"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/tools/euroconv \
diff --git a/opie-examples-python/opie-examples-python_cvs.oe b/opie-examples-python/opie-examples-python_cvs.oe
index 5602884ab4..f78b66ca7f 100644
--- a/opie-examples-python/opie-examples-python_cvs.oe
+++ b/opie-examples-python/opie-examples-python_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
RDEPENDS = "python-pyqt opie-pyquicklauncher"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "python"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/examples/python \
diff --git a/opie-eye/opie-eye_cvs.oe b/opie-eye/opie-eye_cvs.oe
index 59a243192d..0370df1f41 100644
--- a/opie-eye/opie-eye_cvs.oe
+++ b/opie-eye/opie-eye_cvs.oe
@@ -5,9 +5,8 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "libopiecore2 libopieui2 libopiemm2"
RDEPENDS = "opie-advancedfm-pics"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "opie-eye"
-PR = "r2"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/graphics/opie-eye \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
diff --git a/opie-fifteen/opie-fifteen_cvs.oe b/opie-fifteen/opie-fifteen_cvs.oe
index df5fe3186d..dba3fd2576 100644
--- a/opie-fifteen/opie-fifteen_cvs.oe
+++ b/opie-fifteen/opie-fifteen_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "fifteen"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/fifteen \
diff --git a/opie-formatter/opie-formatter_cvs.oe b/opie-formatter/opie-formatter_cvs.oe
index dae2b7012b..84f72cbd39 100644
--- a/opie-formatter/opie-formatter_cvs.oe
+++ b/opie-formatter/opie-formatter_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "formatter"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/tools/formatter \
diff --git a/opie-freetype/opie-freetype_cvs.oe b/opie-freetype/opie-freetype_cvs.oe
index bf31559953..0c0ed9d214 100644
--- a/opie-freetype/opie-freetype_cvs.oe
+++ b/opie-freetype/opie-freetype_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "freetype"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "freetypefactory"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/freetype \
diff --git a/opie-ftp/opie-ftp_cvs.oe b/opie-ftp/opie-ftp_cvs.oe
index 08b0067a6c..167f1fa8eb 100644
--- a/opie-ftp/opie-ftp_cvs.oe
+++ b/opie-ftp/opie-ftp_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "libopiecore2 opie-ftplib"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "opieftp"
APPTYPE = "binary"
diff --git a/opie-ftplib/opie-ftplib_cvs.oe b/opie-ftplib/opie-ftplib_cvs.oe
index d2acb33915..a4287147e1 100644
--- a/opie-ftplib/opie-ftplib_cvs.oe
+++ b/opie-ftplib/opie-ftplib_cvs.oe
@@ -4,7 +4,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
PRIORITY = "optional"
LICENSE = "GPL"
PROVIDES = "libftplib1"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/ftplib"
S = "${WORKDIR}/ftplib"
diff --git a/opie-go/opie-go_cvs.oe b/opie-go/opie-go_cvs.oe
index 3dae3910dc..dd53384993 100644
--- a/opie-go/opie-go_cvs.oe
+++ b/opie-go/opie-go_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "go"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/go \
diff --git a/opie-gutenbrowser/opie-gutenbrowser_cvs.oe b/opie-gutenbrowser/opie-gutenbrowser_cvs.oe
index 323cd9f795..fd73e68cc9 100644
--- a/opie-gutenbrowser/opie-gutenbrowser_cvs.oe
+++ b/opie-gutenbrowser/opie-gutenbrowser_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = " opie-ftplib"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "gutenbrowser"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/opie-gutenbrowser \
diff --git a/opie-handwriting/opie-handwriting_cvs.oe b/opie-handwriting/opie-handwriting_cvs.oe
index 6b6d775fca..f1bbb276be 100644
--- a/opie-handwriting/opie-handwriting_cvs.oe
+++ b/opie-handwriting/opie-handwriting_cvs.oe
@@ -3,9 +3,8 @@ SECTION = "opie/inputmethods"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "qhandwriting"
-PR = "2"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/handwriting \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/etc/qimpen"
diff --git a/opie-help-en/opie-help-en_cvs.oe b/opie-help-en/opie-help-en_cvs.oe
index 7569a97287..43b84944e6 100644
--- a/opie-help-en/opie-help-en_cvs.oe
+++ b/opie-help-en/opie-help-en_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = " "
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "opie-help-en"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/help/en/html "
diff --git a/opie-helpbrowser/opie-helpbrowser_cvs.oe b/opie-helpbrowser/opie-helpbrowser_cvs.oe
index 8c533149ea..8c851e7ed9 100644
--- a/opie-helpbrowser/opie-helpbrowser_cvs.oe
+++ b/opie-helpbrowser/opie-helpbrowser_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "helpbrowser"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/${APPNAME} \
diff --git a/opie-homeapplet/opie-homeapplet_cvs.oe b/opie-homeapplet/opie-homeapplet_cvs.oe
index 5fcee13ddd..9243b8ca76 100644
--- a/opie-homeapplet/opie-homeapplet_cvs.oe
+++ b/opie-homeapplet/opie-homeapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "homeapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/homeapplet \
diff --git a/opie-i18n/opie-i18n_cvs.oe b/opie-i18n/opie-i18n_cvs.oe
index 49484299b9..02f6aea500 100644
--- a/opie-i18n/opie-i18n_cvs.oe
+++ b/opie-i18n/opie-i18n_cvs.oe
@@ -1,11 +1,10 @@
DESCRIPTION = "Opie i18n files"
SECTION = "opie/base"
PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>
+MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "opie-lrelease-native"
-PV = "1.1.6-cvs-${CVSDATE}"
-PR = "r2"
+PV = "1.1.6+cvs-${CVSDATE}"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/i18n \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/etc/dict"
diff --git a/opie-i18n/opie-lrelease-native_cvs.oe b/opie-i18n/opie-lrelease-native_cvs.oe
index db46a3d4a8..db30965bc8 100644
--- a/opie-i18n/opie-lrelease-native_cvs.oe
+++ b/opie-i18n/opie-lrelease-native_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "uicmoc3-native"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/translation/opie-lrelease \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/translation/shared"
diff --git a/opie-i18n/opie-lupdate-native_cvs.oe b/opie-i18n/opie-lupdate-native_cvs.oe
index 8bf4f54512..0f114608ff 100644
--- a/opie-i18n/opie-lupdate-native_cvs.oe
+++ b/opie-i18n/opie-lupdate-native_cvs.oe
@@ -4,8 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "uicmoc3-native"
-PV = "1.1.6-cvs-${CVSDATE}"
-PR = "2"
+PV = "1.1.6+cvs-${CVSDATE}"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/translation/opie-lupdate \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/translation/shared"
diff --git a/opie-irc/opie-irc_cvs.oe b/opie-irc/opie-irc_cvs.oe
index caeb1a2a24..cb2c2ac94a 100644
--- a/opie-irc/opie-irc_cvs.oe
+++ b/opie-irc/opie-irc_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "libqtaux2"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "opieirc"
#APPTYPE = "binary"
diff --git a/opie-irdaapplet/opie-irdaapplet_cvs.oe b/opie-irdaapplet/opie-irdaapplet_cvs.oe
index c7467bac71..9320eb427c 100644
--- a/opie-irdaapplet/opie-irdaapplet_cvs.oe
+++ b/opie-irdaapplet/opie-irdaapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "irdaapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/irdaapplet \
diff --git a/opie-jumpx/opie-jumpx_cvs.oe b/opie-jumpx/opie-jumpx_cvs.oe
index 856ab4d549..8815097b3f 100644
--- a/opie-jumpx/opie-jumpx_cvs.oe
+++ b/opie-jumpx/opie-jumpx_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/inputmethods"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "qjumpx"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/jumpx \
diff --git a/opie-kbill/opie-kbill_cvs.oe b/opie-kbill/opie-kbill_cvs.oe
index 8ab95653c5..1a9844ce9e 100644
--- a/opie-kbill/opie-kbill_cvs.oe
+++ b/opie-kbill/opie-kbill_cvs.oe
@@ -3,10 +3,9 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "kbill"
APPTYPE = "binary"
-PR = "r1"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/kbill \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
diff --git a/opie-kcheckers/opie-kcheckers_cvs.oe b/opie-kcheckers/opie-kcheckers_cvs.oe
index 94d43f243b..d1cf94de33 100644
--- a/opie-kcheckers/opie-kcheckers_cvs.oe
+++ b/opie-kcheckers/opie-kcheckers_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "kcheckers"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/kcheckers \
diff --git a/opie-keyboard/opie-keyboard_cvs.oe b/opie-keyboard/opie-keyboard_cvs.oe
index 377f04546f..ab80b56464 100644
--- a/opie-keyboard/opie-keyboard_cvs.oe
+++ b/opie-keyboard/opie-keyboard_cvs.oe
@@ -5,8 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "opie-pickboard"
RDEPENDS = "opie-pickboard"
-PV = "1.1.6-cvs-${CVSDATE}"
-PR = "r1"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "qkeyboard"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/keyboard "
diff --git a/opie-keypebble/opie-keypebble_cvs.oe b/opie-keypebble/opie-keypebble_cvs.oe
index 3acfc9db2c..e94a003382 100644
--- a/opie-keypebble/opie-keypebble_cvs.oe
+++ b/opie-keypebble/opie-keypebble_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "keypebble"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/comm/${APPNAME} \
diff --git a/opie-keytabs/opie-keytabs_cvs.oe b/opie-keytabs/opie-keytabs_cvs.oe
index c71151e138..509b85ae67 100644
--- a/opie-keytabs/opie-keytabs_cvs.oe
+++ b/opie-keytabs/opie-keytabs_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/base"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "virtual/libqpe"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPTYPE = "binary"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/etc "
diff --git a/opie-keyview/opie-keyview_cvs.oe b/opie-keyview/opie-keyview_cvs.oe
index 3d73394619..dd98977fa2 100644
--- a/opie-keyview/opie-keyview_cvs.oe
+++ b/opie-keyview/opie-keyview_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/inputmethods"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "virtual/libqpe"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "keyview"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/keyview "
diff --git a/opie-kjumpx/opie-kjumpx_cvs.oe b/opie-kjumpx/opie-kjumpx_cvs.oe
index d6d60a06d2..1b93e2758c 100644
--- a/opie-kjumpx/opie-kjumpx_cvs.oe
+++ b/opie-kjumpx/opie-kjumpx_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
RDEPENDS = "opie-pics"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "qkjumpx"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/kjumpx \
diff --git a/opie-kpacman/opie-kpacman_cvs.oe b/opie-kpacman/opie-kpacman_cvs.oe
index 0bc20632b2..5757fc263a 100644
--- a/opie-kpacman/opie-kpacman_cvs.oe
+++ b/opie-kpacman/opie-kpacman_cvs.oe
@@ -3,10 +3,9 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "kpacman"
APPTYPE = "binary"
-PR = "r1"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/kpacman \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
diff --git a/opie-language/opie-language_cvs.oe b/opie-language/opie-language_cvs.oe
index 6f3ca3aceb..ae4e44fd10 100644
--- a/opie-language/opie-language_cvs.oe
+++ b/opie-language/opie-language_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "language"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/language \
diff --git a/opie-launcher-settings/opie-launcher-settings_cvs.oe b/opie-launcher-settings/opie-launcher-settings_cvs.oe
index 825a210994..036051e40b 100644
--- a/opie-launcher-settings/opie-launcher-settings_cvs.oe
+++ b/opie-launcher-settings/opie-launcher-settings_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "libqtaux2"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "launchersettings"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/settings/launcher \
diff --git a/opie-libqrsync/opie-libqrsync_cvs.oe b/opie-libqrsync/opie-libqrsync_cvs.oe
index 116ff74524..be0dab4112 100644
--- a/opie-libqrsync/opie-libqrsync_cvs.oe
+++ b/opie-libqrsync/opie-libqrsync_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/base"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/rsync"
S = "${WORKDIR}/rsync"
diff --git a/opie-light-and-power/opie-light-and-power_cvs.oe b/opie-light-and-power/opie-light-and-power_cvs.oe
index 8d281ea2bf..4c60f6c662 100644
--- a/opie-light-and-power/opie-light-and-power_cvs.oe
+++ b/opie-light-and-power/opie-light-and-power_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "light-and-power"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/settings/light-and-power \
diff --git a/opie-login/opie-login_cvs.oe b/opie-login/opie-login_cvs.oe
index 1dc0d6fe01..222e7c99f1 100644
--- a/opie-login/opie-login_cvs.oe
+++ b/opie-login/opie-login_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/base"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "opie-login"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/${APPNAME} \
diff --git a/opie-logoutapplet/opie-logoutapplet_cvs.oe b/opie-logoutapplet/opie-logoutapplet_cvs.oe
index a95f5635b5..e8fa28a381 100644
--- a/opie-logoutapplet/opie-logoutapplet_cvs.oe
+++ b/opie-logoutapplet/opie-logoutapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "logoutapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/logoutapplet \
diff --git a/opie-mail/opie-mail_cvs.oe b/opie-mail/opie-mail_cvs.oe
index 3bde6c6482..9a96c52984 100644
--- a/opie-mail/opie-mail_cvs.oe
+++ b/opie-mail/opie-mail_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "libmailwrapper libetpan"
RDEPENDS = "opie-pics"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "opiemail"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/mail \
diff --git a/opie-mailapplet/opie-mailapplet_cvs.oe b/opie-mailapplet/opie-mailapplet_cvs.oe
index f9e5d17c56..cf1cdf27c8 100644
--- a/opie-mailapplet/opie-mailapplet_cvs.oe
+++ b/opie-mailapplet/opie-mailapplet_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "libmailwrapper"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "mailapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/mail/taskbarapplet \
diff --git a/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe b/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe
index 4e9f60ede0..c0bfb0d8bc 100644
--- a/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe
+++ b/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "opie-mediaplayer1 libmad"
RDEPENDS = "opie-mediaplayer1"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "madplugin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/multimedia/opieplayer \
diff --git a/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.oe b/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.oe
index 4f5b9029ce..cbd1f9d93c 100644
--- a/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.oe
+++ b/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "opie-mediaplayer1"
RDEPENDS = "opie-mediaplayer1"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "modplugin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/multimedia/opieplayer "
diff --git a/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.oe b/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.oe
index 1d89596999..fac5df0c8e 100644
--- a/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.oe
+++ b/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "opie-mediaplayer1 tremor"
RDEPENDS = "opie-mediaplayer1"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "tremorplugin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/multimedia/opieplayer \
diff --git a/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.oe b/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.oe
index fcfee926da..2f18339bf3 100644
--- a/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.oe
+++ b/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "opie-mediaplayer1"
RDEPENDS = "opie-mediaplayer1"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "wavplugin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/multimedia/opieplayer "
diff --git a/opie-mediaplayer1/opie-mediaplayer1_cvs.oe b/opie-mediaplayer1/opie-mediaplayer1_cvs.oe
index a47d7816b1..b7497bfea4 100644
--- a/opie-mediaplayer1/opie-mediaplayer1_cvs.oe
+++ b/opie-mediaplayer1/opie-mediaplayer1_cvs.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "The classic Opie media player"
SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "opieplayer"
APPTYPE = "binary"
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.oe
index cf8ca10e43..b92d4cb532 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.oe
@@ -2,10 +2,10 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
-APPNAME="opieplayer2"
+PV = "1.1.6+cvs-${CVSDATE}"
+APPNAME = "opieplayer2"
-RPROVIDES="opie-mediaplayer2-skin"
+RPROVIDES = "opie-mediaplayer2-skin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.oe
index 6064b09484..ed10f43b35 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.oe
@@ -2,10 +2,10 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
-APPNAME="opieplayer2"
+PV = "1.1.6+cvs-${CVSDATE}"
+APPNAME = "opieplayer2"
-RPROVIDES="opie-mediaplayer2-skin"
+RPROVIDES = "opie-mediaplayer2-skin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.oe
index 1c0efb218c..a39d82d54c 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.oe
@@ -2,10 +2,10 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
-APPNAME="opieplayer2"
+PV = "1.1.6+cvs-${CVSDATE}"
+APPNAME = "opieplayer2"
-RPROVIDES="opie-mediaplayer2-skin"
+RPROVIDES = "opie-mediaplayer2-skin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.oe
index c11b821505..1e168132f9 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.oe
@@ -2,10 +2,10 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
-APPNAME="opieplayer2"
+PV = "1.1.6+cvs-${CVSDATE}"
+APPNAME = "opieplayer2"
-RPROVIDES="opie-mediaplayer2-skin"
+RPROVIDES = "opie-mediaplayer2-skin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
diff --git a/opie-mediaplayer2/opie-mediaplayer2_cvs.oe b/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
index 58eb9f268a..afee0ad8ca 100644
--- a/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
@@ -3,12 +3,11 @@ It plays mp3, mpeg, wav, ogg, quicktime, divx, etc. and is capable of streaming.
SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>
-PV = "1.1.6-cvs-${CVSDATE}"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+PV = "1.1.6+cvs-${CVSDATE}"
DEPENDS = "libxine-1.0.0-rc6a"
RDEPENDS = "opie-mediaplayer2-skin"
APPNAME = "opieplayer2"
-PR = "r2"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/multimedia/opieplayer2 \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
diff --git a/opie-mediummount/opie-mediummount_cvs.oe b/opie-mediummount/opie-mediummount_cvs.oe
index 74193684b6..0e6977f970 100644
--- a/opie-mediummount/opie-mediummount_cvs.oe
+++ b/opie-mediummount/opie-mediummount_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "mediummount"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/mediummount \
diff --git a/opie-memoryapplet/opie-memoryapplet_cvs.oe b/opie-memoryapplet/opie-memoryapplet_cvs.oe
index 287eb37164..8b0d41a58c 100644
--- a/opie-memoryapplet/opie-memoryapplet_cvs.oe
+++ b/opie-memoryapplet/opie-memoryapplet_cvs.oe
@@ -3,7 +3,7 @@ This applet displays the amount of free memory and manages the swap partition"
SECTION = "opie/applets"
PRIORITY = "optional"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "memoryapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/memoryapplet \
diff --git a/opie-mindbreaker/opie-mindbreaker_cvs.oe b/opie-mindbreaker/opie-mindbreaker_cvs.oe
index 85eb65eaf7..cb632bb41e 100644
--- a/opie-mindbreaker/opie-mindbreaker_cvs.oe
+++ b/opie-mindbreaker/opie-mindbreaker_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "mindbreaker"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/mindbreaker \
diff --git a/opie-minesweep/opie-minesweep_cvs.oe b/opie-minesweep/opie-minesweep_cvs.oe
index c58ef9cdf4..444e80d32e 100644
--- a/opie-minesweep/opie-minesweep_cvs.oe
+++ b/opie-minesweep/opie-minesweep_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "minesweep"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/minesweep \
diff --git a/opie-mobilemsg/opie-mobilemsg_cvs.oe b/opie-mobilemsg/opie-mobilemsg_cvs.oe
index d2a4bff7fb..482b07387a 100644
--- a/opie-mobilemsg/opie-mobilemsg_cvs.oe
+++ b/opie-mobilemsg/opie-mobilemsg_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "mobilemsg"
APPTYPE = "binary"
diff --git a/opie-multikey/opie-multikey_cvs.oe b/opie-multikey/opie-multikey_cvs.oe
index 9a0447d542..7ba46cb4c7 100644
--- a/opie-multikey/opie-multikey_cvs.oe
+++ b/opie-multikey/opie-multikey_cvs.oe
@@ -5,8 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "libqtaux2 opie-pickboard"
RDEPENDS = "opie-pics opie-pickboard"
-PV = "1.1.6-cvs-${CVSDATE}"
-PR = "r2"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "qmultikey"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/multikey \
diff --git a/opie-multikeyapplet/opie-multikeyapplet_cvs.oe b/opie-multikeyapplet/opie-multikeyapplet_cvs.oe
index 2c1884c309..75a23d966a 100644
--- a/opie-multikeyapplet/opie-multikeyapplet_cvs.oe
+++ b/opie-multikeyapplet/opie-multikeyapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "multikeyapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/multikeyapplet \
diff --git a/opie-networkapplet/opie-networkapplet_cvs.oe b/opie-networkapplet/opie-networkapplet_cvs.oe
index ffbfad686a..49a3cc3bc4 100644
--- a/opie-networkapplet/opie-networkapplet_cvs.oe
+++ b/opie-networkapplet/opie-networkapplet_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
RDEPENDS = "opie-networksettings"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "networkapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/networkapplet \
diff --git a/opie-networksettings/opie-networksettings_cvs.oe b/opie-networksettings/opie-networksettings_cvs.oe
index 7eeb6b44b0..cd5a0e0158 100644
--- a/opie-networksettings/opie-networksettings_cvs.oe
+++ b/opie-networksettings/opie-networksettings_cvs.oe
@@ -4,8 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin"
-PV = "1.1.6-${CVSDATE}"
-PR = "r2"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "networksettings"
diff --git a/opie-notesapplet/opie-notesapplet_cvs.oe b/opie-notesapplet/opie-notesapplet_cvs.oe
index 9afbf404cd..65637679c7 100644
--- a/opie-notesapplet/opie-notesapplet_cvs.oe
+++ b/opie-notesapplet/opie-notesapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "notesapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/notesapplet"
diff --git a/opie-odict/opie-odict_cvs.oe b/opie-odict/opie-odict_cvs.oe
index a44a692261..c2b443f30a 100644
--- a/opie-odict/opie-odict_cvs.oe
+++ b/opie-odict/opie-odict_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "odict"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/odict \
diff --git a/opie-oxygen/opie-oxygen_cvs.oe b/opie-oxygen/opie-oxygen_cvs.oe
index c767969b7c..4c9087185f 100644
--- a/opie-oxygen/opie-oxygen_cvs.oe
+++ b/opie-oxygen/opie-oxygen_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "oxygen"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/${APPNAME} \
diff --git a/opie-oyatzee/opie-oyatzee_cvs.oe b/opie-oyatzee/opie-oyatzee_cvs.oe
index ac54ac77fb..a097e50f8b 100644
--- a/opie-oyatzee/opie-oyatzee_cvs.oe
+++ b/opie-oyatzee/opie-oyatzee_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "oyatzee"
APPTYPE = "binary"
diff --git a/opie-packagemanager/opie-packagemanager_cvs.oe b/opie-packagemanager/opie-packagemanager_cvs.oe
index ec0fc68f8c..579948807c 100644
--- a/opie-packagemanager/opie-packagemanager_cvs.oe
+++ b/opie-packagemanager/opie-packagemanager_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "libipkg "
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "packagemanager"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/${APPNAME};cvsdate=${CVSDATE} \
diff --git a/opie-parashoot/opie-parashoot_cvs.oe b/opie-parashoot/opie-parashoot_cvs.oe
index 7f98a2ec26..e1cc7baaf7 100644
--- a/opie-parashoot/opie-parashoot_cvs.oe
+++ b/opie-parashoot/opie-parashoot_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "parashoot"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/parashoot \
diff --git a/opie-performance/opie-performance_cvs.oe b/opie-performance/opie-performance_cvs.oe
index 96e5158df4..3edf1480c2 100644
--- a/opie-performance/opie-performance_cvs.oe
+++ b/opie-performance/opie-performance_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "performance"
APPTYPE = "binary"
diff --git a/opie-pickboard/opie-pickboard_cvs.oe b/opie-pickboard/opie-pickboard_cvs.oe
index 0bcc543bfd..a9ebf12449 100644
--- a/opie-pickboard/opie-pickboard_cvs.oe
+++ b/opie-pickboard/opie-pickboard_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/inputmethods"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "qpickboard"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/pickboard"
diff --git a/opie-pics/opie-pics_cvs.oe b/opie-pics/opie-pics_cvs.oe
index 9d081b9efe..aa042056d9 100644
--- a/opie-pics/opie-pics_cvs.oe
+++ b/opie-pics/opie-pics_cvs.oe
@@ -1,9 +1,9 @@
DESCRIPTION = "Common Opie pictures usable from all applications"
SECTION = "opie/base"
PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>
+MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics"
S = "${WORKDIR}/pics"
diff --git a/opie-pimconverter/opie-pimconverter_cvs.oe b/opie-pimconverter/opie-pimconverter_cvs.oe
index 5872f1cda2..fe1868aeaf 100644
--- a/opie-pimconverter/opie-pimconverter_cvs.oe
+++ b/opie-pimconverter/opie-pimconverter_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "sqlite"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "opimconverter"
APPTYPE = "binary"
diff --git a/opie-powerchord/opie-powerchord_cvs.oe b/opie-powerchord/opie-powerchord_cvs.oe
index 3adbeaae1f..89cb82cca4 100644
--- a/opie-powerchord/opie-powerchord_cvs.oe
+++ b/opie-powerchord/opie-powerchord_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/multimedia"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "powerchord"
APPTYPE = "binary"
diff --git a/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.oe b/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.oe
index 3173d5139b..69d629aec4 100644
--- a/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.oe
+++ b/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.oe
@@ -1,7 +1,7 @@
DESCRIPTION = "Python Quicklaunch Applet"
SECTION = "opie/applets"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "pyquicklaunch"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/pyquicklaunch \
diff --git a/opie-qashmoney/opie-qashmoney_cvs.oe b/opie-qashmoney/opie-qashmoney_cvs.oe
index 25cfad6602..b8af94c86c 100644
--- a/opie-qashmoney/opie-qashmoney_cvs.oe
+++ b/opie-qashmoney/opie-qashmoney_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "qashmoney"
APPTYPE = "binary"
diff --git a/opie-qasteroids/opie-qasteroids_cvs.oe b/opie-qasteroids/opie-qasteroids_cvs.oe
index 8814607cfd..c6b6d6626b 100644
--- a/opie-qasteroids/opie-qasteroids_cvs.oe
+++ b/opie-qasteroids/opie-qasteroids_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "qasteroids"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/qasteroids \
diff --git a/opie-qcop/opie-qcop_cvs.oe b/opie-qcop/opie-qcop_cvs.oe
index ea0c07e519..89835c6a93 100644
--- a/opie-qcop/opie-qcop_cvs.oe
+++ b/opie-qcop/opie-qcop_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/base"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.0.0-cvs-${CVSDATE}"
+PV = "1.0.0+cvs-${CVSDATE}"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/qcop"
S = "${WORKDIR}/qcop"
diff --git a/opie-quicklauncher/opie-quicklauncher_cvs.oe b/opie-quicklauncher/opie-quicklauncher_cvs.oe
index fe299a84bc..06bb9b35ab 100644
--- a/opie-quicklauncher/opie-quicklauncher_cvs.oe
+++ b/opie-quicklauncher/opie-quicklauncher_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/base"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/tools/quicklauncher"
S = "${WORKDIR}/quicklauncher"
diff --git a/opie-rdesktop/opie-rdesktop_cvs.oe b/opie-rdesktop/opie-rdesktop_cvs.oe
index 63d0ff94a2..d6285f1fce 100644
--- a/opie-rdesktop/opie-rdesktop_cvs.oe
+++ b/opie-rdesktop/opie-rdesktop_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "openssl"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "ordesktop"
APPTYPE = "binary"
diff --git a/opie-reader/opie-reader_cvs.oe b/opie-reader/opie-reader_cvs.oe
index 69d6b327eb..c94b36ed78 100644
--- a/opie-reader/opie-reader_cvs.oe
+++ b/opie-reader/opie-reader_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "opie-reader"
APPTYPE = "binary"
diff --git a/opie-recorder/opie-recorder_cvs.oe b/opie-recorder/opie-recorder_cvs.oe
index 401561606c..9e7edf8625 100644
--- a/opie-recorder/opie-recorder_cvs.oe
+++ b/opie-recorder/opie-recorder_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/multimedia"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "opierec"
APPTYPE = "binary"
diff --git a/opie-remote/opie-remote_cvs.oe b/opie-remote/opie-remote_cvs.oe
index 957567737b..1057b39f94 100644
--- a/opie-remote/opie-remote_cvs.oe
+++ b/opie-remote/opie-remote_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
RDEPENDS = "lirc"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "remote"
APPTYPE = "binary"
diff --git a/opie-restartapplet/opie-restartapplet2_cvs.oe b/opie-restartapplet/opie-restartapplet2_cvs.oe
index 566993ac63..31fc75a987 100644
--- a/opie-restartapplet/opie-restartapplet2_cvs.oe
+++ b/opie-restartapplet/opie-restartapplet2_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "restartapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/restartapplet2 \
diff --git a/opie-restartapplet/opie-restartapplet_cvs.oe b/opie-restartapplet/opie-restartapplet_cvs.oe
index ad4bfac5e5..8247012943 100644
--- a/opie-restartapplet/opie-restartapplet_cvs.oe
+++ b/opie-restartapplet/opie-restartapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "restartapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/restartapplet \
diff --git a/opie-restartapplet2/opie-restartapplet2_cvs.oe b/opie-restartapplet2/opie-restartapplet2_cvs.oe
index 566993ac63..31fc75a987 100644
--- a/opie-restartapplet2/opie-restartapplet2_cvs.oe
+++ b/opie-restartapplet2/opie-restartapplet2_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "restartapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/restartapplet2 \
diff --git a/opie-rotateapplet/opie-rotateapplet_cvs.oe b/opie-rotateapplet/opie-rotateapplet_cvs.oe
index 55fb8bcc59..424c872735 100644
--- a/opie-rotateapplet/opie-rotateapplet_cvs.oe
+++ b/opie-rotateapplet/opie-rotateapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "rotateapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/rotateapplet \
diff --git a/opie-screenshotapplet/opie-screenshotapplet_cvs.oe b/opie-screenshotapplet/opie-screenshotapplet_cvs.oe
index 5b2ffb5cd5..3b5c3f99d5 100644
--- a/opie-screenshotapplet/opie-screenshotapplet_cvs.oe
+++ b/opie-screenshotapplet/opie-screenshotapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "screenshotapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/screenshotapplet \
diff --git a/opie-search/opie-search_cvs.oe b/opie-search/opie-search_cvs.oe
index 1a6315cc56..bb04b9fc63 100644
--- a/opie-search/opie-search_cvs.oe
+++ b/opie-search/opie-search_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/pim"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "osearch"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/osearch \
diff --git a/opie-security/opie-security_cvs.oe b/opie-security/opie-security_cvs.oe
index 2e112383f9..f55975c8ee 100644
--- a/opie-security/opie-security_cvs.oe
+++ b/opie-security/opie-security_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "security"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/settings/security \
diff --git a/opie-securityplugins/opie-securityplugin-blueping_cvs.oe b/opie-securityplugins/opie-securityplugin-blueping_cvs.oe
index ed2318f865..e43e46e29c 100644
--- a/opie-securityplugins/opie-securityplugin-blueping_cvs.oe
+++ b/opie-securityplugins/opie-securityplugin-blueping_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
PRIORITY = "optional"
LICENSE = "GPL"
RDEPENDS = "opie-security bluez-utils"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "multiauthbluepingplugin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/securityplugins/blueping \
diff --git a/opie-securityplugins/opie-securityplugin-dummy_cvs.oe b/opie-securityplugins/opie-securityplugin-dummy_cvs.oe
index 5972d7fed5..ce0160089b 100644
--- a/opie-securityplugins/opie-securityplugin-dummy_cvs.oe
+++ b/opie-securityplugins/opie-securityplugin-dummy_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
PRIORITY = "optional"
LICENSE = "GPL"
RDEPENDS = "opie-security"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "multiauthdummyplugin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/securityplugins/dummy \
diff --git a/opie-securityplugins/opie-securityplugin-notice_cvs.oe b/opie-securityplugins/opie-securityplugin-notice_cvs.oe
index 116f2ae420..af1e6bf5d9 100644
--- a/opie-securityplugins/opie-securityplugin-notice_cvs.oe
+++ b/opie-securityplugins/opie-securityplugin-notice_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
PRIORITY = "optional"
LICENSE = "GPL"
RDEPENDS = "opie-security"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "multiauthnoticeplugin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/securityplugins/notice \
diff --git a/opie-securityplugins/opie-securityplugin-pin_cvs.oe b/opie-securityplugins/opie-securityplugin-pin_cvs.oe
index 46438c818c..e8d19d8dc1 100644
--- a/opie-securityplugins/opie-securityplugin-pin_cvs.oe
+++ b/opie-securityplugins/opie-securityplugin-pin_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
PRIORITY = "optional"
LICENSE = "GPL"
RDEPENDS = "opie-security"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "multiauthpinplugin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/securityplugins/pin \
diff --git a/opie-sfcave/opie-sfcave_cvs.oe b/opie-sfcave/opie-sfcave_cvs.oe
index 1c478179ce..4f2c20157f 100644
--- a/opie-sfcave/opie-sfcave_cvs.oe
+++ b/opie-sfcave/opie-sfcave_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "sfcave"
APPTYPE = "binary"
diff --git a/opie-sh/opie-sh_cvs.oe b/opie-sh/opie-sh_cvs.oe
index c08ce71022..5854721b15 100644
--- a/opie-sh/opie-sh_cvs.oe
+++ b/opie-sh/opie-sh_cvs.oe
@@ -3,10 +3,9 @@ SECTION = "opie/Shell"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "opie-sh"
APPTYPE = "binary"
-PR = "r1"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/tools/opie-sh \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
diff --git a/opie-sheet/opie-sheet_cvs.oe b/opie-sheet/opie-sheet_cvs.oe
index 38fceb4944..0632ca6bd0 100644
--- a/opie-sheet/opie-sheet_cvs.oe
+++ b/opie-sheet/opie-sheet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "opie-sheet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/opie-sheet \
diff --git a/opie-showimg/opie-showimg_cvs.oe b/opie-showimg/opie-showimg_cvs.oe
index d4aab6fd06..07a5740ecd 100644
--- a/opie-showimg/opie-showimg_cvs.oe
+++ b/opie-showimg/opie-showimg_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "showimg"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/multimedia/showimg \
diff --git a/opie-snake/opie-snake_cvs.oe b/opie-snake/opie-snake_cvs.oe
index 668957fc1c..f0db20c1c3 100644
--- a/opie-snake/opie-snake_cvs.oe
+++ b/opie-snake/opie-snake_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "snake"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/snake \
diff --git a/opie-solitaire/opie-solitaire_cvs.oe b/opie-solitaire/opie-solitaire_cvs.oe
index a4143bc1ef..ec8c05bb29 100644
--- a/opie-solitaire/opie-solitaire_cvs.oe
+++ b/opie-solitaire/opie-solitaire_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "patience"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/solitaire \
diff --git a/opie-sshkeys/opie-sshkeys_cvs.oe b/opie-sshkeys/opie-sshkeys_cvs.oe
index 14384ee968..d01cb74ea6 100644
--- a/opie-sshkeys/opie-sshkeys_cvs.oe
+++ b/opie-sshkeys/opie-sshkeys_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
RDEPENDS = "ssh opie-sh-ssh-askpass"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "sshkeys"
APPTYPE = "binary"
diff --git a/opie-style-flat/opie-style-flat_cvs.oe b/opie-style-flat/opie-style-flat_cvs.oe
index b3a7e81324..77fbe90f3f 100644
--- a/opie-style-flat/opie-style-flat_cvs.oe
+++ b/opie-style-flat/opie-style-flat_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/styles"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "flatstyle"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/styles/flat "
diff --git a/opie-style-fresh/opie-style-fresh_cvs.oe b/opie-style-fresh/opie-style-fresh_cvs.oe
index b3e59f2915..47a48a0013 100644
--- a/opie-style-fresh/opie-style-fresh_cvs.oe
+++ b/opie-style-fresh/opie-style-fresh_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/styles"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "freshstyle"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/styles/fresh "
diff --git a/opie-style-liquid/opie-style-liquid_cvs.oe b/opie-style-liquid/opie-style-liquid_cvs.oe
index d86d354d34..43b5de83ec 100644
--- a/opie-style-liquid/opie-style-liquid_cvs.oe
+++ b/opie-style-liquid/opie-style-liquid_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = " libqtaux2"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "liquid"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/styles/liquid "
diff --git a/opie-style-metal/opie-style-metal_cvs.oe b/opie-style-metal/opie-style-metal_cvs.oe
index f4cf06fa8d..c2efd8409e 100644
--- a/opie-style-metal/opie-style-metal_cvs.oe
+++ b/opie-style-metal/opie-style-metal_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/styles"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "metal"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/styles/metal "
diff --git a/opie-style-phase/opie-style-phase_cvs.oe b/opie-style-phase/opie-style-phase_cvs.oe
index 392750b649..e777c8d7b7 100644
--- a/opie-style-phase/opie-style-phase_cvs.oe
+++ b/opie-style-phase/opie-style-phase_cvs.oe
@@ -3,7 +3,7 @@ It is based on http://www.usermode.org/code.html Phase 0.4."
SECTION = "opie/styles"
PRIORITY = "optional"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "phasestyle"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/styles/phase"
diff --git a/opie-style-web/opie-style-web_cvs.oe b/opie-style-web/opie-style-web_cvs.oe
index a1319675dd..9110be2d69 100644
--- a/opie-style-web/opie-style-web_cvs.oe
+++ b/opie-style-web/opie-style-web_cvs.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "A flatter widget style than flat :)"
SECTION = "opie/styles"
PRIORITY = "optional"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "webstyle"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/styles/web"
diff --git a/opie-suspendapplet/opie-suspendapplet_cvs.oe b/opie-suspendapplet/opie-suspendapplet_cvs.oe
index aed32edfa9..02cd60ecae 100644
--- a/opie-suspendapplet/opie-suspendapplet_cvs.oe
+++ b/opie-suspendapplet/opie-suspendapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "suspendapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/suspendapplet \
diff --git a/opie-symlinker/opie-symlinker_cvs.oe b/opie-symlinker/opie-symlinker_cvs.oe
index 671b564d06..95edf64bc4 100644
--- a/opie-symlinker/opie-symlinker_cvs.oe
+++ b/opie-symlinker/opie-symlinker_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/base"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "opie-update-symlinks"
APPTYPE = "binary"
diff --git a/opie-sysinfo/opie-sysinfo_cvs.oe b/opie-sysinfo/opie-sysinfo_cvs.oe
index 1523215075..c1fb418176 100644
--- a/opie-sysinfo/opie-sysinfo_cvs.oe
+++ b/opie-sysinfo/opie-sysinfo_cvs.oe
@@ -3,8 +3,7 @@ SECTION = "opie/settings"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
-PR = "r1"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "sysinfo"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/sysinfo \
diff --git a/opie-systemtime/opie-systemtime_cvs.oe b/opie-systemtime/opie-systemtime_cvs.oe
index 3e233f915c..fe02ef0ef0 100644
--- a/opie-systemtime/opie-systemtime_cvs.oe
+++ b/opie-systemtime/opie-systemtime_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
RRECOMMENDS = "ntpdate"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "systemtime"
diff --git a/opie-tableviewer/opie-tableviewer_cvs.oe b/opie-tableviewer/opie-tableviewer_cvs.oe
index 25613056ab..877e1d661d 100644
--- a/opie-tableviewer/opie-tableviewer_cvs.oe
+++ b/opie-tableviewer/opie-tableviewer_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "tableviewer"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/tableviewer \
diff --git a/opie-tabmanager/opie-tabmanager_cvs.oe b/opie-tabmanager/opie-tabmanager_cvs.oe
index 00a77497e0..4a053569dc 100644
--- a/opie-tabmanager/opie-tabmanager_cvs.oe
+++ b/opie-tabmanager/opie-tabmanager_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "tabmanager"
APPTYPE = "binary"
diff --git a/opie-taskbar/opie-taskbar_cvs.oe b/opie-taskbar/opie-taskbar_cvs.oe
index 876a9ef91c..a0cdb2392d 100644
--- a/opie-taskbar/opie-taskbar_cvs.oe
+++ b/opie-taskbar/opie-taskbar_cvs.oe
@@ -4,9 +4,8 @@ PRIORITY = "optional"
LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>"
DEPENDS = "opie-libqrsync"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "qpe"
-PR = "r17"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/calibrate \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/mediummount \
diff --git a/opie-tetrix/opie-tetrix_cvs.oe b/opie-tetrix/opie-tetrix_cvs.oe
index b12cec4b71..3b6786ccdb 100644
--- a/opie-tetrix/opie-tetrix_cvs.oe
+++ b/opie-tetrix/opie-tetrix_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "tetrix"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/tetrix \
diff --git a/opie-textedit/opie-textedit_cvs.oe b/opie-textedit/opie-textedit_cvs.oe
index 9086742659..9caee76615 100644
--- a/opie-textedit/opie-textedit_cvs.oe
+++ b/opie-textedit/opie-textedit_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/pim"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "textedit"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/${APPNAME} \
diff --git a/opie-theme/opie-theme_cvs.oe b/opie-theme/opie-theme_cvs.oe
index 8a5d8567b7..56ed4cd993 100644
--- a/opie-theme/opie-theme_cvs.oe
+++ b/opie-theme/opie-theme_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/styles"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "theme"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/styles/theme \
diff --git a/opie-tictac/opie-tictac_cvs.oe b/opie-tictac/opie-tictac_cvs.oe
index 966c2118f3..23c6f9d7c1 100644
--- a/opie-tictac/opie-tictac_cvs.oe
+++ b/opie-tictac/opie-tictac_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "tictac"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/tictac \
diff --git a/opie-tinykate/opie-tinykate_cvs.oe b/opie-tinykate/opie-tinykate_cvs.oe
index d8642048b9..43e959ebef 100644
--- a/opie-tinykate/opie-tinykate_cvs.oe
+++ b/opie-tinykate/opie-tinykate_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "libqtaux2"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "tinykate"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/tinykate \
diff --git a/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.oe b/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.oe
index ab123fda82..8a53594530 100644
--- a/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.oe
+++ b/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.oe
@@ -3,8 +3,8 @@ SECTION = "opie/today"
PRIORITY = "optional"
LICENSE = "GPL"
RDEPENDS = "opie-today"
-PV = "1.1.6-cvs-${CVSDATE}"
-APPNAME="todayaddressbookplugin"
+PV = "1.1.6+cvs-${CVSDATE}"
+APPNAME = "todayaddressbookplugin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/today/plugins/addressbook "
diff --git a/opie-today-datebookplugin/opie-today-datebookplugin_cvs.oe b/opie-today-datebookplugin/opie-today-datebookplugin_cvs.oe
index 3d6028404e..5a452a6726 100644
--- a/opie-today-datebookplugin/opie-today-datebookplugin_cvs.oe
+++ b/opie-today-datebookplugin/opie-today-datebookplugin_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/today"
PRIORITY = "optional"
LICENSE = "GPL"
RDEPENDS = "opie-today"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "todaydatebookplugin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/today/plugins/datebook "
diff --git a/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.oe b/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.oe
index 9a0be10cdf..4997987695 100644
--- a/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.oe
+++ b/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "opie-today libqtaux2"
RDEPENDS = "fortune-mod opie-today"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "todayfortuneplugin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/todayplugins/fortune "
diff --git a/opie-today-mailplugin/opie-today-mailplugin_cvs.oe b/opie-today-mailplugin/opie-today-mailplugin_cvs.oe
index 99200021c2..d87d88c2f5 100644
--- a/opie-today-mailplugin/opie-today-mailplugin_cvs.oe
+++ b/opie-today-mailplugin/opie-today-mailplugin_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "opie-today opie-mailapplet"
RDEPENDS = "opie-today opie-mailapplet"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "todaymailplugin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/today/plugins/mail "
diff --git a/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.oe b/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.oe
index 4f51d80e2c..5ba80d7eb2 100644
--- a/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.oe
+++ b/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "opie-today libqtaux2"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "todaystocktickerplugin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/todayplugins/stockticker \
diff --git a/opie-today-todolistplugin/opie-today-todolistplugin_cvs.oe b/opie-today-todolistplugin/opie-today-todolistplugin_cvs.oe
index 8e9c0bc129..b00e14a80a 100644
--- a/opie-today-todolistplugin/opie-today-todolistplugin_cvs.oe
+++ b/opie-today-todolistplugin/opie-today-todolistplugin_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
RDEPENDS = "opie-today"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "todaytodolistplugin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/today/plugins/todolist "
diff --git a/opie-today-weatherplugin/opie-today-weatherplugin_cvs.oe b/opie-today-weatherplugin/opie-today-weatherplugin_cvs.oe
index 378e21caba..5577c9d27a 100644
--- a/opie-today-weatherplugin/opie-today-weatherplugin_cvs.oe
+++ b/opie-today-weatherplugin/opie-today-weatherplugin_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
DEPENDS = "libopiecore2 libopiepim2"
RDEPENDS = "opie-today"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "todayweatherplugin"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/todayplugins/weather \
diff --git a/opie-today/opie-today_cvs.oe b/opie-today/opie-today_cvs.oe
index ddefdb0f27..0dc7fa344f 100644
--- a/opie-today/opie-today_cvs.oe
+++ b/opie-today/opie-today_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/pim"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "today"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/today \
diff --git a/opie-todo/opie-todo_cvs.oe b/opie-todo/opie-todo_cvs.oe
index d11dce03f5..58361c5c88 100644
--- a/opie-todo/opie-todo_cvs.oe
+++ b/opie-todo/opie-todo_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
RDEPENDS = "opie-pics"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "todolist"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/todo \
diff --git a/opie-tonleiter/opie-tonleiter_cvs.oe b/opie-tonleiter/opie-tonleiter_cvs.oe
index b45d16bc0b..b11ef53416 100644
--- a/opie-tonleiter/opie-tonleiter_cvs.oe
+++ b/opie-tonleiter/opie-tonleiter_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/multimedia"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "tonleiter"
APPTYPE = "binary"
diff --git a/opie-ubrowser/opie-ubrowser_cvs.oe b/opie-ubrowser/opie-ubrowser_cvs.oe
index 35f393a07d..1c377eebb1 100644
--- a/opie-ubrowser/opie-ubrowser_cvs.oe
+++ b/opie-ubrowser/opie-ubrowser_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "ubrowser"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/ubrowser \
diff --git a/opie-unikeyboard/opie-unikeyboard_cvs.oe b/opie-unikeyboard/opie-unikeyboard_cvs.oe
index 95b5886aba..521b408ccf 100644
--- a/opie-unikeyboard/opie-unikeyboard_cvs.oe
+++ b/opie-unikeyboard/opie-unikeyboard_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/inputmethods"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "qunikeyboard"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/unikeyboard "
diff --git a/opie-usermanager/opie-usermanager_cvs.oe b/opie-usermanager/opie-usermanager_cvs.oe
index 4bed2c859a..7a479920aa 100644
--- a/opie-usermanager/opie-usermanager_cvs.oe
+++ b/opie-usermanager/opie-usermanager_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "usermanager"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/usermanager \
diff --git a/opie-vmemo-settings/opie-vmemo-settings_cvs.oe b/opie-vmemo-settings/opie-vmemo-settings_cvs.oe
index c8f326c5b5..74f5e9564a 100644
--- a/opie-vmemo-settings/opie-vmemo-settings_cvs.oe
+++ b/opie-vmemo-settings/opie-vmemo-settings_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "sound"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/sound \
diff --git a/opie-vmemo/opie-vmemo_cvs.oe b/opie-vmemo/opie-vmemo_cvs.oe
index a575a9a2ec..b928575407 100644
--- a/opie-vmemo/opie-vmemo_cvs.oe
+++ b/opie-vmemo/opie-vmemo_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
RDEPENDS = "opie-vmemo-settings"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "vmemoapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/vmemo \
diff --git a/opie-volumeapplet/opie-volumeapplet_cvs.oe b/opie-volumeapplet/opie-volumeapplet_cvs.oe
index 80b63c2e4b..b7fb0a5171 100644
--- a/opie-volumeapplet/opie-volumeapplet_cvs.oe
+++ b/opie-volumeapplet/opie-volumeapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "volumeapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/volumeapplet \
diff --git a/opie-vtapplet/opie-vtapplet_cvs.oe b/opie-vtapplet/opie-vtapplet_cvs.oe
index 087ed67a3b..4b3d2d6be6 100644
--- a/opie-vtapplet/opie-vtapplet_cvs.oe
+++ b/opie-vtapplet/opie-vtapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "vtapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/vtapplet \
diff --git a/opie-wellenreiter/opie-wellenreiter_cvs.oe b/opie-wellenreiter/opie-wellenreiter_cvs.oe
index b4eceda299..7781030ac7 100644
--- a/opie-wellenreiter/opie-wellenreiter_cvs.oe
+++ b/opie-wellenreiter/opie-wellenreiter_cvs.oe
@@ -4,8 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
RRECOMMENDS = "manufacturers"
-PV = "1.0.3-cvs-${CVSDATE}"
-PR = "r0"
+PV = "1.0.3+cvs-${CVSDATE}"
APPNAME = "wellenreiter"
APPTYPE = "binary"
diff --git a/opie-wirelessapplet/opie-wirelessapplet_cvs.oe b/opie-wirelessapplet/opie-wirelessapplet_cvs.oe
index 428c5f9948..537a6a7461 100644
--- a/opie-wirelessapplet/opie-wirelessapplet_cvs.oe
+++ b/opie-wirelessapplet/opie-wirelessapplet_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "wirelessapplet"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/wirelessapplet"
diff --git a/opie-wordgame/opie-wordgame_cvs.oe b/opie-wordgame/opie-wordgame_cvs.oe
index 2a7f45158f..2fdbf1fca3 100644
--- a/opie-wordgame/opie-wordgame_cvs.oe
+++ b/opie-wordgame/opie-wordgame_cvs.oe
@@ -3,9 +3,8 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "wordgame"
-PR = "r1"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/wordgame \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
diff --git a/opie-write/opie-write_cvs.oe b/opie-write/opie-write_cvs.oe
index 0fcd88c1de..1c6908b1ef 100644
--- a/opie-write/opie-write_cvs.oe
+++ b/opie-write/opie-write_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "opie-write"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/${APPNAME} \
diff --git a/opie-zkbapplet/opie-zkbapplet_cvs.oe b/opie-zkbapplet/opie-zkbapplet_cvs.oe
index 57eb28007c..a88265145c 100644
--- a/opie-zkbapplet/opie-zkbapplet_cvs.oe
+++ b/opie-zkbapplet/opie-zkbapplet_cvs.oe
@@ -3,10 +3,9 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "zkbapplet"
RDEPENDS = "opie-pics"
-PR = "r1"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/zkbapplet \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/share \
diff --git a/opie-zlines/opie-zlines_cvs.oe b/opie-zlines/opie-zlines_cvs.oe
index 7bb3a4ee09..928e427f25 100644
--- a/opie-zlines/opie-zlines_cvs.oe
+++ b/opie-zlines/opie-zlines_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "zlines"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/zlines \
diff --git a/opie-zsafe/opie-zsafe_cvs.oe b/opie-zsafe/opie-zsafe_cvs.oe
index c28bd29642..74565b0e5a 100644
--- a/opie-zsafe/opie-zsafe_cvs.oe
+++ b/opie-zsafe/opie-zsafe_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "zsafe"
APPTYPE = "binary"
diff --git a/opie-zsame/opie-zsame_cvs.oe b/opie-zsame/opie-zsame_cvs.oe
index 9a7a74d784..e17ee695f1 100644
--- a/opie-zsame/opie-zsame_cvs.oe
+++ b/opie-zsame/opie-zsame_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/games"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
+PV = "1.1.6+cvs-${CVSDATE}"
APPNAME = "zsame"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/games/zsame \
diff --git a/timezones/timezones_cvs.oe b/timezones/timezones_cvs.oe
index 58f078f248..c47f423306 100644
--- a/timezones/timezones_cvs.oe
+++ b/timezones/timezones_cvs.oe
@@ -1,11 +1,9 @@
DESCRIPTION = "Timezone data"
SECTION = "base"
PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>
+MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.1.6-cvs-${CVSDATE}"
-
-PR = "r1"
+PV = "1.1.6+cvs-${CVSDATE}"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/root"
S = "${WORKDIR}/root"
@@ -23,4 +21,4 @@ do_install() {
done
}
-FILES_${PN} = usr/share/zoneinfo/[A-Z]*
+FILES_${PN} = "usr/share/zoneinfo/[A-Z]*"