summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-01-12 22:21:23 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-12 22:21:23 +0000
commit6bb85d3aeddb8a248cbab1e57efdc221fff15082 (patch)
tree686efa0b66a2e67053a139754c10c03ea874719f
parent4f542541f9f486922375d1ea299642c22c1f08b2 (diff)
parent990bc95f725a7da3a74a7ea86f2ef11ba143aa1c (diff)
merge of 1af98528cc819da70e3ec70148b0697072cec68a
and dbca6f4c143066fafe7af7445da627277276ea33
-rw-r--r--classes/opie.bbclass5
-rw-r--r--packages/git/git.bb3
-rw-r--r--packages/libopie/libopie2_cvs.bb2
-rw-r--r--packages/libopieobex/libopieobex0_cvs.bb2
-rw-r--r--packages/libopietooth/libopietooth1_cvs.bb2
-rw-r--r--packages/libqpe/libqpe-opie_cvs.bb5
-rw-r--r--packages/opie-aboutapplet/opie-aboutapplet_cvs.bb2
-rw-r--r--packages/opie-addressbook/opie-addressbook_cvs.bb2
-rw-r--r--packages/opie-advancedfm/opie-advancedfm_cvs.bb2
-rw-r--r--packages/opie-alarm/opie-alarm_cvs.bb2
-rw-r--r--packages/opie-appearance/opie-appearance_cvs.bb2
-rw-r--r--packages/opie-aqpkg/opie-aqpkg_cvs.bb2
-rw-r--r--packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb2
-rw-r--r--packages/opie-backgammon/opie-backgammon_cvs.bb2
-rw-r--r--packages/opie-backup/opie-backup_cvs.bb2
-rw-r--r--packages/opie-bartender/opie-bartender_cvs.bb2
-rw-r--r--packages/opie-batteryapplet/opie-batteryapplet_cvs.bb2
-rw-r--r--packages/opie-bluepin/opie-bluepin_cvs.bb2
-rw-r--r--packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb2
-rw-r--r--packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb2
-rw-r--r--packages/opie-bounce/opie-bounce_cvs.bb2
-rw-r--r--packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb2
-rw-r--r--packages/opie-button-settings/opie-button-settings_cvs.bb2
-rw-r--r--packages/opie-buzzword/opie-buzzword_cvs.bb2
-rw-r--r--packages/opie-calculator/opie-calculator_cvs.bb2
-rw-r--r--packages/opie-calibrate/opie-calibrate_cvs.bb2
-rw-r--r--packages/opie-camera/opie-camera_cvs.bb2
-rw-r--r--packages/opie-cardmon/opie-cardmon_cvs.bb2
-rw-r--r--packages/opie-checkbook/opie-checkbook_cvs.bb2
-rw-r--r--packages/opie-citytime/opie-citytime_cvs.bb2
-rw-r--r--packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb2
-rw-r--r--packages/opie-clock/opie-clock_cvs.bb2
-rw-r--r--packages/opie-clockapplet/opie-clockapplet_cvs.bb2
-rw-r--r--packages/opie-confeditor/opie-confeditor_cvs.bb2
-rw-r--r--packages/opie-console/opie-console_cvs.bb2
-rw-r--r--packages/opie-dagger/opie-dagger_cvs.bb2
-rw-r--r--packages/opie-dasher/opie-dasher_cvs.bb2
-rw-r--r--packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb2
-rw-r--r--packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb2
-rw-r--r--packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb2
-rw-r--r--packages/opie-datebook/opie-datebook_cvs.bb2
-rw-r--r--packages/opie-deco-flat/opie-deco-flat_cvs.bb2
-rw-r--r--packages/opie-deco-liquid/opie-deco-liquid_cvs.bb2
-rw-r--r--packages/opie-deco-polished/opie-deco-polished_cvs.bb2
-rw-r--r--packages/opie-doctab/opie-doctab_cvs.bb2
-rw-r--r--packages/opie-drawpad/opie-drawpad_cvs.bb2
-rw-r--r--packages/opie-dvorak/opie-dvorak_cvs.bb2
-rw-r--r--packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb2
-rw-r--r--packages/opie-euroconv/opie-euroconv_cvs.bb2
-rw-r--r--packages/opie-examples-python/opie-examples-python_cvs.bb2
-rw-r--r--packages/opie-examples/opie-examples_cvs.bb2
-rw-r--r--packages/opie-eye/opie-eye_cvs.bb2
-rw-r--r--packages/opie-fifteen/opie-fifteen_cvs.bb2
-rw-r--r--packages/opie-formatter/opie-formatter_cvs.bb2
-rw-r--r--packages/opie-freetype/opie-freetype_cvs.bb2
-rw-r--r--packages/opie-ftp/opie-ftp_cvs.bb2
-rw-r--r--packages/opie-ftplib/opie-ftplib_cvs.bb2
-rw-r--r--packages/opie-go/opie-go_cvs.bb2
-rw-r--r--packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb2
-rw-r--r--packages/opie-handwriting/opie-handwriting_cvs.bb2
-rw-r--r--packages/opie-help-en/opie-help-en_cvs.bb2
-rw-r--r--packages/opie-helpbrowser/opie-helpbrowser_cvs.bb2
-rw-r--r--packages/opie-homeapplet/opie-homeapplet_cvs.bb2
-rw-r--r--packages/opie-i18n/opie-i18n_cvs.bb2
-rw-r--r--packages/opie-i18n/opie-lrelease-native_cvs.bb2
-rw-r--r--packages/opie-i18n/opie-lupdate-native_cvs.bb2
-rw-r--r--packages/opie-icon-reload/opie-icon-reload/reload.pngbin1996 -> 1997 bytes
-rw-r--r--packages/opie-icon-reload/opie-icon-reload_cvs.bb5
-rw-r--r--packages/opie-irc/opie-irc_cvs.bb2
-rw-r--r--packages/opie-irdaapplet/opie-irdaapplet_cvs.bb2
-rw-r--r--packages/opie-jumpx/opie-jumpx_cvs.bb2
-rw-r--r--packages/opie-kbill/opie-kbill_cvs.bb2
-rw-r--r--packages/opie-kcheckers/opie-kcheckers_cvs.bb2
-rw-r--r--packages/opie-keyboard/opie-keyboard_cvs.bb2
-rw-r--r--packages/opie-keypebble/opie-keypebble_cvs.bb2
-rw-r--r--packages/opie-keytabs/opie-keytabs_cvs.bb2
-rw-r--r--packages/opie-keyview/opie-keyview_cvs.bb2
-rw-r--r--packages/opie-kjumpx/opie-kjumpx_cvs.bb2
-rw-r--r--packages/opie-kpacman/opie-kpacman_cvs.bb2
-rw-r--r--packages/opie-language/opie-language_cvs.bb2
-rw-r--r--packages/opie-launcher-settings/opie-launcher-settings_cvs.bb2
-rw-r--r--packages/opie-libqrsync/opie-libqrsync_cvs.bb2
-rw-r--r--packages/opie-light-and-power/opie-light-and-power_cvs.bb2
-rw-r--r--packages/opie-lockapplet/opie-lockapplet_cvs.bb2
-rw-r--r--packages/opie-login/opie-login_cvs.bb2
-rw-r--r--packages/opie-logoutapplet/opie-logoutapplet_cvs.bb2
-rw-r--r--packages/opie-mail/opie-mail_cvs.bb2
-rw-r--r--packages/opie-mailapplet/opie-mailapplet_cvs.bb2
-rw-r--r--packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb2
-rw-r--r--packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb2
-rw-r--r--packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb2
-rw-r--r--packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb2
-rw-r--r--packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb2
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb2
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb2
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb2
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb2
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb2
-rw-r--r--packages/opie-mediummount/opie-mediummount_cvs.bb2
-rw-r--r--packages/opie-memoryapplet/opie-memoryapplet_cvs.bb2
-rw-r--r--packages/opie-mindbreaker/opie-mindbreaker_cvs.bb2
-rw-r--r--packages/opie-minesweep/opie-minesweep_cvs.bb2
-rw-r--r--packages/opie-multikey/opie-multikey_cvs.bb2
-rw-r--r--packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb2
-rw-r--r--packages/opie-networkapplet/opie-networkapplet_cvs.bb2
-rw-r--r--packages/opie-networksettings/opie-networksettings_cvs.bb2
-rw-r--r--packages/opie-notesapplet/opie-notesapplet_cvs.bb2
-rw-r--r--packages/opie-odict/opie-odict_cvs.bb2
-rw-r--r--packages/opie-oxygen/opie-oxygen_cvs.bb2
-rw-r--r--packages/opie-oyatzee/opie-oyatzee_cvs.bb2
-rw-r--r--packages/opie-packagemanager/opie-packagemanager_cvs.bb2
-rw-r--r--packages/opie-parashoot/opie-parashoot_cvs.bb2
-rw-r--r--packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb2
-rw-r--r--packages/opie-pickboard/opie-pickboard_cvs.bb2
-rw-r--r--packages/opie-pics/opie-pics_cvs.bb2
-rw-r--r--packages/opie-pimconverter/opie-pimconverter_cvs.bb2
-rw-r--r--packages/opie-powerchord/opie-powerchord_cvs.bb2
-rw-r--r--packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb2
-rw-r--r--packages/opie-qasteroids/opie-qasteroids_cvs.bb2
-rw-r--r--packages/opie-qcop/opie-qcop_cvs.bb2
-rw-r--r--packages/opie-qss/opie-qss_cvs.bb2
-rw-r--r--packages/opie-quicklauncher/opie-quicklauncher_cvs.bb2
-rw-r--r--packages/opie-rdesktop/opie-rdesktop_cvs.bb2
-rw-r--r--packages/opie-reader/opie-reader_cvs.bb2
-rw-r--r--packages/opie-recorder/opie-recorder_cvs.bb2
-rw-r--r--packages/opie-remote/opie-remote_cvs.bb2
-rw-r--r--packages/opie-restartapplet/opie-restartapplet2_cvs.bb2
-rw-r--r--packages/opie-restartapplet/opie-restartapplet_cvs.bb2
-rw-r--r--packages/opie-restartapplet2/opie-restartapplet2_cvs.bb2
-rw-r--r--packages/opie-rotateapplet/opie-rotateapplet_cvs.bb2
-rw-r--r--packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb2
-rw-r--r--packages/opie-search/opie-search_cvs.bb2
-rw-r--r--packages/opie-security/opie-security_cvs.bb2
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb2
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb2
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb2
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb2
-rw-r--r--packages/opie-securityplugins/opie-securityplugins_cvs.bb2
-rw-r--r--packages/opie-sfcave/opie-sfcave_cvs.bb2
-rw-r--r--packages/opie-sh-snes/files/snes.pngbin2307 -> 2308 bytes
-rw-r--r--packages/opie-sh-snes/opie-sh-snes_cvs.bb5
-rw-r--r--packages/opie-sh/opie-sh_cvs.bb2
-rw-r--r--packages/opie-sheet/opie-sheet_cvs.bb2
-rw-r--r--packages/opie-snake/opie-snake_cvs.bb2
-rw-r--r--packages/opie-solitaire/opie-solitaire_cvs.bb2
-rw-r--r--packages/opie-sounds/opie-sounds_cvs.bb2
-rw-r--r--packages/opie-sshkeys/opie-sshkeys_cvs.bb2
-rw-r--r--packages/opie-stumbler/files/opiestumbler.pngbin2647 -> 2648 bytes
-rw-r--r--packages/opie-stumbler/opie-stumbler_cvs.bb2
-rw-r--r--packages/opie-style-flat/opie-style-flat_cvs.bb2
-rw-r--r--packages/opie-style-fresh/opie-style-fresh_cvs.bb2
-rw-r--r--packages/opie-style-liquid/opie-style-liquid_cvs.bb2
-rw-r--r--packages/opie-style-metal/opie-style-metal_cvs.bb2
-rw-r--r--packages/opie-style-phase/opie-style-phase_cvs.bb2
-rw-r--r--packages/opie-style-web/opie-style-web_cvs.bb2
-rw-r--r--packages/opie-suspendapplet/opie-suspendapplet_cvs.bb2
-rw-r--r--packages/opie-symlinker/opie-symlinker_cvs.bb2
-rw-r--r--packages/opie-sysinfo/opie-sysinfo_cvs.bb2
-rw-r--r--packages/opie-systemtime/opie-systemtime_cvs.bb2
-rw-r--r--packages/opie-tableviewer/opie-tableviewer_cvs.bb2
-rw-r--r--packages/opie-taskbar/opie-taskbar_cvs.bb2
-rw-r--r--packages/opie-tetrix/opie-tetrix_cvs.bb2
-rw-r--r--packages/opie-textedit/opie-textedit_cvs.bb2
-rw-r--r--packages/opie-theme/opie-theme_cvs.bb2
-rw-r--r--packages/opie-tictac/opie-tictac_cvs.bb2
-rw-r--r--packages/opie-tinykate/opie-tinykate_cvs.bb2
-rw-r--r--packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb2
-rw-r--r--packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb2
-rw-r--r--packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb2
-rw-r--r--packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb2
-rw-r--r--packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb2
-rw-r--r--packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb2
-rw-r--r--packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb2
-rw-r--r--packages/opie-today/opie-today_cvs.bb2
-rw-r--r--packages/opie-todo/opie-todo_cvs.bb2
-rw-r--r--packages/opie-tonleiter/opie-tonleiter_cvs.bb2
-rw-r--r--packages/opie-unikeyboard/opie-unikeyboard_cvs.bb2
-rw-r--r--packages/opie-usermanager/opie-usermanager_cvs.bb2
-rw-r--r--packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb2
-rw-r--r--packages/opie-vmemo/opie-vmemo_cvs.bb2
-rw-r--r--packages/opie-volumeapplet/opie-volumeapplet_cvs.bb2
-rw-r--r--packages/opie-vtapplet/opie-vtapplet_cvs.bb2
-rw-r--r--packages/opie-wellenreiter/opie-wellenreiter_cvs.bb2
-rw-r--r--packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb2
-rw-r--r--packages/opie-wordgame/opie-wordgame_cvs.bb2
-rw-r--r--packages/opie-write/opie-write_cvs.bb2
-rw-r--r--packages/opie-zkbapplet/opie-zkbapplet_cvs.bb2
-rw-r--r--packages/opie-zlines/opie-zlines_cvs.bb2
-rw-r--r--packages/opie-zsafe/opie-zsafe_cvs.bb2
-rw-r--r--packages/opie-zsame/opie-zsame_cvs.bb2
190 files changed, 197 insertions, 190 deletions
diff --git a/classes/opie.bbclass b/classes/opie.bbclass
index 7326128d98..c00f7e19a9 100644
--- a/classes/opie.bbclass
+++ b/classes/opie.bbclass
@@ -15,6 +15,11 @@
inherit palmtop
+# Note that when CVS changes to 1.2.2, the dash
+# should be removed from OPIE_CVS_PV to convert
+# to the standardised version format
+OPIE_CVS_PV = "1.2.1+cvs-${SRCDATE}"
+
DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2')]}"
# to be consistent, put all targets into workdir
diff --git a/packages/git/git.bb b/packages/git/git.bb
index 3a1228d621..0bd00f8c93 100644
--- a/packages/git/git.bb
+++ b/packages/git/git.bb
@@ -6,8 +6,7 @@ MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>"
PKGDATE = "${@time.strftime('%Y-%m-%d',time.gmtime())}"
-SRC_URI = "http://www.codemonkey.org.uk/projects/git-snapshots/git/git-${PKGDATE}.tar.gz \
- file://Makefile.patch;patch=1"
+SRC_URI = "http://www.codemonkey.org.uk/projects/git-snapshots/git/git-${PKGDATE}.tar.gz"
S = "${WORKDIR}/git-snapshot-${DATE}"
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index d9b16ff4e3..8d5ff7486b 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
file://include.pro"
diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb
index cde3fb5859..c51ca8ecc6 100644
--- a/packages/libopieobex/libopieobex0_cvs.bb
+++ b/packages/libopieobex/libopieobex0_cvs.bb
@@ -1,5 +1,5 @@
include libopieobex0.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
diff --git a/packages/libopietooth/libopietooth1_cvs.bb b/packages/libopietooth/libopietooth1_cvs.bb
index e259dcb8c7..4d1a66acd6 100644
--- a/packages/libopietooth/libopietooth1_cvs.bb
+++ b/packages/libopietooth/libopietooth1_cvs.bb
@@ -1,4 +1,4 @@
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/lib"
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
include libopietooth1.inc
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index db32c0e121..8e0278daa1 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -1,6 +1,7 @@
include ${PN}.inc
-
-PV = "1.2.1+cvs${SRCDATE}"
+
+# Remove the dash below when 1.2.1 changes
+PV = "1.2.1+cvs-${SRCDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/library \
file://fix-titleheight.patch;patch=1"
diff --git a/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb b/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb
index f242613c50..fb4bf05e8a 100644
--- a/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb
+++ b/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/aboutapplet"
diff --git a/packages/opie-addressbook/opie-addressbook_cvs.bb b/packages/opie-addressbook/opie-addressbook_cvs.bb
index 309aedc55d..fe99e83d5e 100644
--- a/packages/opie-addressbook/opie-addressbook_cvs.bb
+++ b/packages/opie-addressbook/opie-addressbook_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/addressbook \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-advancedfm/opie-advancedfm_cvs.bb b/packages/opie-advancedfm/opie-advancedfm_cvs.bb
index c93125bf51..b552bf6152 100644
--- a/packages/opie-advancedfm/opie-advancedfm_cvs.bb
+++ b/packages/opie-advancedfm/opie-advancedfm_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-alarm/opie-alarm_cvs.bb b/packages/opie-alarm/opie-alarm_cvs.bb
index eb50f5ab4d..e44a4c7049 100644
--- a/packages/opie-alarm/opie-alarm_cvs.bb
+++ b/packages/opie-alarm/opie-alarm_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
file://01opiealarm "
diff --git a/packages/opie-appearance/opie-appearance_cvs.bb b/packages/opie-appearance/opie-appearance_cvs.bb
index a31f2ab3eb..de78ccb83a 100644
--- a/packages/opie-appearance/opie-appearance_cvs.bb
+++ b/packages/opie-appearance/opie-appearance_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/appearance2 \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-aqpkg/opie-aqpkg_cvs.bb b/packages/opie-aqpkg/opie-aqpkg_cvs.bb
index dd4b17fbad..0316ba2aeb 100644
--- a/packages/opie-aqpkg/opie-aqpkg_cvs.bb
+++ b/packages/opie-aqpkg/opie-aqpkg_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/aqpkg \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb
index 55b28db27f..52a63b4135 100644
--- a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb
+++ b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/autorotateapplet \
${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-backgammon/opie-backgammon_cvs.bb b/packages/opie-backgammon/opie-backgammon_cvs.bb
index 6ba16adde6..8cc6e52bfd 100644
--- a/packages/opie-backgammon/opie-backgammon_cvs.bb
+++ b/packages/opie-backgammon/opie-backgammon_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/backgammon \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-backup/opie-backup_cvs.bb b/packages/opie-backup/opie-backup_cvs.bb
index aaf2af8950..b609b09b07 100644
--- a/packages/opie-backup/opie-backup_cvs.bb
+++ b/packages/opie-backup/opie-backup_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/backup \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-bartender/opie-bartender_cvs.bb b/packages/opie-bartender/opie-bartender_cvs.bb
index 01f1daf94c..79cc45e64c 100644
--- a/packages/opie-bartender/opie-bartender_cvs.bb
+++ b/packages/opie-bartender/opie-bartender_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-bartender \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb
index 97b2056a74..f7148388a2 100644
--- a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb
+++ b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/batteryapplet \
diff --git a/packages/opie-bluepin/opie-bluepin_cvs.bb b/packages/opie-bluepin/opie-bluepin_cvs.bb
index 765dc35d93..d29e0a0db3 100644
--- a/packages/opie-bluepin/opie-bluepin_cvs.bb
+++ b/packages/opie-bluepin/opie-bluepin_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/blue-pin"
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
index 513968608f..aab0257453 100644
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \
${HANDHELDS_CVS};module=opie/pics/bluetoothapplet"
diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb
index 42ea7f54eb..f6040cfdd1 100644
--- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb
+++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/manager \
${HANDHELDS_CVS};module=opie/apps \
diff --git a/packages/opie-bounce/opie-bounce_cvs.bb b/packages/opie-bounce/opie-bounce_cvs.bb
index 01f6c96cb2..500931029f 100644
--- a/packages/opie-bounce/opie-bounce_cvs.bb
+++ b/packages/opie-bounce/opie-bounce_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/bounce \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
index 7102e405bf..2a34e2534a 100644
--- a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/brightnessapplet \
${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-button-settings/opie-button-settings_cvs.bb b/packages/opie-button-settings/opie-button-settings_cvs.bb
index c25796d83d..31afa66235 100644
--- a/packages/opie-button-settings/opie-button-settings_cvs.bb
+++ b/packages/opie-button-settings/opie-button-settings_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/button \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-buzzword/opie-buzzword_cvs.bb b/packages/opie-buzzword/opie-buzzword_cvs.bb
index e33a0da77b..751643df29 100644
--- a/packages/opie-buzzword/opie-buzzword_cvs.bb
+++ b/packages/opie-buzzword/opie-buzzword_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/buzzword \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-calculator/opie-calculator_cvs.bb b/packages/opie-calculator/opie-calculator_cvs.bb
index 8b78452789..5c86dd0e65 100644
--- a/packages/opie-calculator/opie-calculator_cvs.bb
+++ b/packages/opie-calculator/opie-calculator_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/calculator \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-calibrate/opie-calibrate_cvs.bb b/packages/opie-calibrate/opie-calibrate_cvs.bb
index 42e28331a5..b4d39b9a15 100644
--- a/packages/opie-calibrate/opie-calibrate_cvs.bb
+++ b/packages/opie-calibrate/opie-calibrate_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate"
diff --git a/packages/opie-camera/opie-camera_cvs.bb b/packages/opie-camera/opie-camera_cvs.bb
index afae32fb8e..b6cc271caa 100644
--- a/packages/opie-camera/opie-camera_cvs.bb
+++ b/packages/opie-camera/opie-camera_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-cardmon/opie-cardmon_cvs.bb b/packages/opie-cardmon/opie-cardmon_cvs.bb
index d9255760cc..25cbf6cce1 100644
--- a/packages/opie-cardmon/opie-cardmon_cvs.bb
+++ b/packages/opie-cardmon/opie-cardmon_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/cardmon \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-checkbook/opie-checkbook_cvs.bb b/packages/opie-checkbook/opie-checkbook_cvs.bb
index c93125bf51..b552bf6152 100644
--- a/packages/opie-checkbook/opie-checkbook_cvs.bb
+++ b/packages/opie-checkbook/opie-checkbook_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-citytime/opie-citytime_cvs.bb b/packages/opie-citytime/opie-citytime_cvs.bb
index 7e77ab149a..de2ab19bf4 100644
--- a/packages/opie-citytime/opie-citytime_cvs.bb
+++ b/packages/opie-citytime/opie-citytime_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/citytime \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb
index 06b5814bc2..b0ba1ba507 100644
--- a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb
+++ b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clipboardapplet \
diff --git a/packages/opie-clock/opie-clock_cvs.bb b/packages/opie-clock/opie-clock_cvs.bb
index 19567838c2..6bff77d83f 100644
--- a/packages/opie-clock/opie-clock_cvs.bb
+++ b/packages/opie-clock/opie-clock_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/clock \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-clockapplet/opie-clockapplet_cvs.bb b/packages/opie-clockapplet/opie-clockapplet_cvs.bb
index 609b2a7f7c..52276b64c3 100644
--- a/packages/opie-clockapplet/opie-clockapplet_cvs.bb
+++ b/packages/opie-clockapplet/opie-clockapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clockapplet \
diff --git a/packages/opie-confeditor/opie-confeditor_cvs.bb b/packages/opie-confeditor/opie-confeditor_cvs.bb
index 773d64833a..7b1e721310 100644
--- a/packages/opie-confeditor/opie-confeditor_cvs.bb
+++ b/packages/opie-confeditor/opie-confeditor_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/confedit \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-console/opie-console_cvs.bb b/packages/opie-console/opie-console_cvs.bb
index 606915dff7..1103e1f285 100644
--- a/packages/opie-console/opie-console_cvs.bb
+++ b/packages/opie-console/opie-console_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-dagger/opie-dagger_cvs.bb b/packages/opie-dagger/opie-dagger_cvs.bb
index f7d353cd81..7d3730cb10 100644
--- a/packages/opie-dagger/opie-dagger_cvs.bb
+++ b/packages/opie-dagger/opie-dagger_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/dagger \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-dasher/opie-dasher_cvs.bb b/packages/opie-dasher/opie-dasher_cvs.bb
index b22d4b6664..cd9c7488c4 100644
--- a/packages/opie-dasher/opie-dasher_cvs.bb
+++ b/packages/opie-dasher/opie-dasher_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dasher \
${HANDHELDS_CVS};module=opie/share "
diff --git a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb
index afb8cfad87..6277c5651a 100644
--- a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb
+++ b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/birthday "
diff --git a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb
index 36bfd6e5e1..98e5ae4c0f 100644
--- a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb
+++ b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/christian "
diff --git a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb
index e69f6128fd..84178aae18 100644
--- a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb
+++ b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/national \
${HANDHELDS_CVS};module=opie/etc/nationaldays "
diff --git a/packages/opie-datebook/opie-datebook_cvs.bb b/packages/opie-datebook/opie-datebook_cvs.bb
index 9b7fca26b7..d4f8a6717a 100644
--- a/packages/opie-datebook/opie-datebook_cvs.bb
+++ b/packages/opie-datebook/opie-datebook_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-deco-flat/opie-deco-flat_cvs.bb b/packages/opie-deco-flat/opie-deco-flat_cvs.bb
index 824f49eb23..6920cac224 100644
--- a/packages/opie-deco-flat/opie-deco-flat_cvs.bb
+++ b/packages/opie-deco-flat/opie-deco-flat_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/flat "
diff --git a/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb b/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb
index 6652b7da1e..c957dd3a94 100644
--- a/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb
+++ b/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/liquid "
diff --git a/packages/opie-deco-polished/opie-deco-polished_cvs.bb b/packages/opie-deco-polished/opie-deco-polished_cvs.bb
index d13b22cbaa..cbc595a76d 100644
--- a/packages/opie-deco-polished/opie-deco-polished_cvs.bb
+++ b/packages/opie-deco-polished/opie-deco-polished_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/polished "
diff --git a/packages/opie-doctab/opie-doctab_cvs.bb b/packages/opie-doctab/opie-doctab_cvs.bb
index b0ba81aea5..b318842596 100644
--- a/packages/opie-doctab/opie-doctab_cvs.bb
+++ b/packages/opie-doctab/opie-doctab_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/doctab \
${HANDHELDS_CVS};module=opie/apps \
diff --git a/packages/opie-drawpad/opie-drawpad_cvs.bb b/packages/opie-drawpad/opie-drawpad_cvs.bb
index dd0fc890d5..c2c8e6c8a5 100644
--- a/packages/opie-drawpad/opie-drawpad_cvs.bb
+++ b/packages/opie-drawpad/opie-drawpad_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/drawpad \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-dvorak/opie-dvorak_cvs.bb b/packages/opie-dvorak/opie-dvorak_cvs.bb
index 9416c5721c..aabac9b928 100644
--- a/packages/opie-dvorak/opie-dvorak_cvs.bb
+++ b/packages/opie-dvorak/opie-dvorak_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dvorak \
${HANDHELDS_CVS};module=opie/inputmethods/pickboard"
diff --git a/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb b/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb
index 6b87647a00..98b0ecd0ef 100644
--- a/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb
+++ b/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-euroconv/opie-euroconv_cvs.bb b/packages/opie-euroconv/opie-euroconv_cvs.bb
index c9fc45a974..bb59d3028b 100644
--- a/packages/opie-euroconv/opie-euroconv_cvs.bb
+++ b/packages/opie-euroconv/opie-euroconv_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/euroconv \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-examples-python/opie-examples-python_cvs.bb b/packages/opie-examples-python/opie-examples-python_cvs.bb
index e561bf0be0..75a52cb7a7 100644
--- a/packages/opie-examples-python/opie-examples-python_cvs.bb
+++ b/packages/opie-examples-python/opie-examples-python_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/examples/python \
diff --git a/packages/opie-examples/opie-examples_cvs.bb b/packages/opie-examples/opie-examples_cvs.bb
index 2af54daeef..795b813608 100644
--- a/packages/opie-examples/opie-examples_cvs.bb
+++ b/packages/opie-examples/opie-examples_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/examples \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-eye/opie-eye_cvs.bb b/packages/opie-eye/opie-eye_cvs.bb
index 0a02210f82..ffe7e770ff 100644
--- a/packages/opie-eye/opie-eye_cvs.bb
+++ b/packages/opie-eye/opie-eye_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/opie-eye \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-fifteen/opie-fifteen_cvs.bb b/packages/opie-fifteen/opie-fifteen_cvs.bb
index f533d68c82..e342fa69c3 100644
--- a/packages/opie-fifteen/opie-fifteen_cvs.bb
+++ b/packages/opie-fifteen/opie-fifteen_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/fifteen \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-formatter/opie-formatter_cvs.bb b/packages/opie-formatter/opie-formatter_cvs.bb
index caca62089f..99af13112a 100644
--- a/packages/opie-formatter/opie-formatter_cvs.bb
+++ b/packages/opie-formatter/opie-formatter_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/formatter \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-freetype/opie-freetype_cvs.bb b/packages/opie-freetype/opie-freetype_cvs.bb
index 0384318f22..4788f044e9 100644
--- a/packages/opie-freetype/opie-freetype_cvs.bb
+++ b/packages/opie-freetype/opie-freetype_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/freetype"
diff --git a/packages/opie-ftp/opie-ftp_cvs.bb b/packages/opie-ftp/opie-ftp_cvs.bb
index d9380ad7f8..d8ce8c7334 100644
--- a/packages/opie-ftp/opie-ftp_cvs.bb
+++ b/packages/opie-ftp/opie-ftp_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieftp \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-ftplib/opie-ftplib_cvs.bb b/packages/opie-ftplib/opie-ftplib_cvs.bb
index fe4033e8ac..2025ea084c 100644
--- a/packages/opie-ftplib/opie-ftplib_cvs.bb
+++ b/packages/opie-ftplib/opie-ftplib_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/ftplib"
diff --git a/packages/opie-go/opie-go_cvs.bb b/packages/opie-go/opie-go_cvs.bb
index 05187dc365..3985f619cf 100644
--- a/packages/opie-go/opie-go_cvs.bb
+++ b/packages/opie-go/opie-go_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/go \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb b/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb
index c476a66243..3cb2c37810 100644
--- a/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb
+++ b/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-gutenbrowser \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-handwriting/opie-handwriting_cvs.bb b/packages/opie-handwriting/opie-handwriting_cvs.bb
index b1488be209..ada35ece86 100644
--- a/packages/opie-handwriting/opie-handwriting_cvs.bb
+++ b/packages/opie-handwriting/opie-handwriting_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/handwriting \
${HANDHELDS_CVS};module=opie/etc/qimpen"
diff --git a/packages/opie-help-en/opie-help-en_cvs.bb b/packages/opie-help-en/opie-help-en_cvs.bb
index 3a9f76e508..d52e38a584 100644
--- a/packages/opie-help-en/opie-help-en_cvs.bb
+++ b/packages/opie-help-en/opie-help-en_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/help/en/html "
diff --git a/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb b/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb
index ad29b882fc..5e4bdd9eb0 100644
--- a/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb
+++ b/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-homeapplet/opie-homeapplet_cvs.bb b/packages/opie-homeapplet/opie-homeapplet_cvs.bb
index 785cb0b329..120f4bbab8 100644
--- a/packages/opie-homeapplet/opie-homeapplet_cvs.bb
+++ b/packages/opie-homeapplet/opie-homeapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/homeapplet \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-i18n/opie-i18n_cvs.bb b/packages/opie-i18n/opie-i18n_cvs.bb
index e1cce42445..15bddc3651 100644
--- a/packages/opie-i18n/opie-i18n_cvs.bb
+++ b/packages/opie-i18n/opie-i18n_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/i18n \
${HANDHELDS_CVS};module=opie/etc/dict"
diff --git a/packages/opie-i18n/opie-lrelease-native_cvs.bb b/packages/opie-i18n/opie-lrelease-native_cvs.bb
index 67a69dda20..03a08cd570 100644
--- a/packages/opie-i18n/opie-lrelease-native_cvs.bb
+++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lrelease \
${HANDHELDS_CVS};module=opie/development/translation/shared"
diff --git a/packages/opie-i18n/opie-lupdate-native_cvs.bb b/packages/opie-i18n/opie-lupdate-native_cvs.bb
index 717d8a3769..46b3ceb5e4 100644
--- a/packages/opie-i18n/opie-lupdate-native_cvs.bb
+++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lupdate \
${HANDHELDS_CVS};module=opie/development/translation/shared"
diff --git a/packages/opie-icon-reload/opie-icon-reload/reload.png b/packages/opie-icon-reload/opie-icon-reload/reload.png
index 9cec49322c..d520167614 100644
--- a/packages/opie-icon-reload/opie-icon-reload/reload.png
+++ b/packages/opie-icon-reload/opie-icon-reload/reload.png
Binary files differ
diff --git a/packages/opie-icon-reload/opie-icon-reload_cvs.bb b/packages/opie-icon-reload/opie-icon-reload_cvs.bb
index f8c47a5c4f..0ce2a6b704 100644
--- a/packages/opie-icon-reload/opie-icon-reload_cvs.bb
+++ b/packages/opie-icon-reload/opie-icon-reload_cvs.bb
@@ -1,4 +1,5 @@
include ${PN}.inc
-
-PV = "1.2.1+cvs${SRCDATE}"
+
+#Remove the dash below when 1.2.1 changes
+PV = "1.2.1+cvs-${SRCDATE}"
diff --git a/packages/opie-irc/opie-irc_cvs.bb b/packages/opie-irc/opie-irc_cvs.bb
index 63d0243d54..feabe89d68 100644
--- a/packages/opie-irc/opie-irc_cvs.bb
+++ b/packages/opie-irc/opie-irc_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieirc \
${HANDHELDS_CVS};module=opie/help \
diff --git a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
index db6c62e7e9..836c6dfeef 100644
--- a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
+++ b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/irdaapplet \
diff --git a/packages/opie-jumpx/opie-jumpx_cvs.bb b/packages/opie-jumpx/opie-jumpx_cvs.bb
index ed12b6f80d..cd5a25c39a 100644
--- a/packages/opie-jumpx/opie-jumpx_cvs.bb
+++ b/packages/opie-jumpx/opie-jumpx_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/jumpx \
${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-kbill/opie-kbill_cvs.bb b/packages/opie-kbill/opie-kbill_cvs.bb
index cd8074bfff..20522f3968 100644
--- a/packages/opie-kbill/opie-kbill_cvs.bb
+++ b/packages/opie-kbill/opie-kbill_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kbill \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-kcheckers/opie-kcheckers_cvs.bb b/packages/opie-kcheckers/opie-kcheckers_cvs.bb
index 13a1c4a493..445ad42970 100644
--- a/packages/opie-kcheckers/opie-kcheckers_cvs.bb
+++ b/packages/opie-kcheckers/opie-kcheckers_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kcheckers \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-keyboard/opie-keyboard_cvs.bb b/packages/opie-keyboard/opie-keyboard_cvs.bb
index 400c29670a..2ec7441ce2 100644
--- a/packages/opie-keyboard/opie-keyboard_cvs.bb
+++ b/packages/opie-keyboard/opie-keyboard_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/keyboard "
diff --git a/packages/opie-keypebble/opie-keypebble_cvs.bb b/packages/opie-keypebble/opie-keypebble_cvs.bb
index fd141e1b9c..37e32da01c 100644
--- a/packages/opie-keypebble/opie-keypebble_cvs.bb
+++ b/packages/opie-keypebble/opie-keypebble_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/comm/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-keytabs/opie-keytabs_cvs.bb b/packages/opie-keytabs/opie-keytabs_cvs.bb
index 4d9c11c529..c0388822b0 100644
--- a/packages/opie-keytabs/opie-keytabs_cvs.bb
+++ b/packages/opie-keytabs/opie-keytabs_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/etc"
diff --git a/packages/opie-keyview/opie-keyview_cvs.bb b/packages/opie-keyview/opie-keyview_cvs.bb
index 17249dde4c..d819cd45da 100644
--- a/packages/opie-keyview/opie-keyview_cvs.bb
+++ b/packages/opie-keyview/opie-keyview_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/development/keyview "
diff --git a/packages/opie-kjumpx/opie-kjumpx_cvs.bb b/packages/opie-kjumpx/opie-kjumpx_cvs.bb
index c3b8ad585f..1ac78ad3fd 100644
--- a/packages/opie-kjumpx/opie-kjumpx_cvs.bb
+++ b/packages/opie-kjumpx/opie-kjumpx_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/kjumpx \
${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-kpacman/opie-kpacman_cvs.bb b/packages/opie-kpacman/opie-kpacman_cvs.bb
index 976a7e0d3c..f48122d5ea 100644
--- a/packages/opie-kpacman/opie-kpacman_cvs.bb
+++ b/packages/opie-kpacman/opie-kpacman_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kpacman \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-language/opie-language_cvs.bb b/packages/opie-language/opie-language_cvs.bb
index 9cec4e7915..77af7c1b68 100644
--- a/packages/opie-language/opie-language_cvs.bb
+++ b/packages/opie-language/opie-language_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/language \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb b/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb
index 0ebac4c2aa..8b8f30b77d 100644
--- a/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb
+++ b/packages/opie-launcher-settings/opie-launcher-settings_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/launcher \
${HANDHELDS_CVS};module=opie/apps \
diff --git a/packages/opie-libqrsync/opie-libqrsync_cvs.bb b/packages/opie-libqrsync/opie-libqrsync_cvs.bb
index 525301ee57..cd5c0573c5 100644
--- a/packages/opie-libqrsync/opie-libqrsync_cvs.bb
+++ b/packages/opie-libqrsync/opie-libqrsync_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/rsync"
diff --git a/packages/opie-light-and-power/opie-light-and-power_cvs.bb b/packages/opie-light-and-power/opie-light-and-power_cvs.bb
index f5eb7bed33..5d0222401a 100644
--- a/packages/opie-light-and-power/opie-light-and-power_cvs.bb
+++ b/packages/opie-light-and-power/opie-light-and-power_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/light-and-power \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-lockapplet/opie-lockapplet_cvs.bb b/packages/opie-lockapplet/opie-lockapplet_cvs.bb
index 7f539b4f0b..4a67fc8558 100644
--- a/packages/opie-lockapplet/opie-lockapplet_cvs.bb
+++ b/packages/opie-lockapplet/opie-lockapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/lockapplet \
diff --git a/packages/opie-login/opie-login_cvs.bb b/packages/opie-login/opie-login_cvs.bb
index e9911a76ee..a5141716e7 100644
--- a/packages/opie-login/opie-login_cvs.bb
+++ b/packages/opie-login/opie-login_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/${APPNAME} \
${HANDHELDS_CVS};module=opie/core/apps/calibrate \
diff --git a/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb b/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb
index 8ef5777cbd..5e12de96fa 100644
--- a/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb
+++ b/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/logoutapplet \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-mail/opie-mail_cvs.bb b/packages/opie-mail/opie-mail_cvs.bb
index e0fa33633b..026970805a 100644
--- a/packages/opie-mail/opie-mail_cvs.bb
+++ b/packages/opie-mail/opie-mail_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail \
${HANDHELDS_CVS};module=opie/apps \
diff --git a/packages/opie-mailapplet/opie-mailapplet_cvs.bb b/packages/opie-mailapplet/opie-mailapplet_cvs.bb
index 74120f4cd9..e906bf2058 100644
--- a/packages/opie-mailapplet/opie-mailapplet_cvs.bb
+++ b/packages/opie-mailapplet/opie-mailapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail/taskbarapplet \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
index 2b51e65298..0ca2b3fd39 100644
--- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
file://libmadplugin.pro"
diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb
index 2f84c397cb..618d3b6a59 100644
--- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
index 75a87a2dbf..01141f2eac 100644
--- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
file://vorbis.pro "
diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
index 2f84c397cb..618d3b6a59 100644
--- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb
index ea0bb39217..d182973f87 100644
--- a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
index caa4eb7992..c234343731 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>"
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
APPNAME = "opieplayer2"
RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
index 7e349f9e7b..08842dc9c4 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>"
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
APPNAME = "opieplayer2"
RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
index 3d5072a8a4..361813db00 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>"
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
APPNAME = "opieplayer2"
RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
index 8b648dd79e..f18952dbd9 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>"
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
APPNAME = "opieplayer2"
RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
index 093aa74c1d..44fe55161b 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \
diff --git a/packages/opie-mediummount/opie-mediummount_cvs.bb b/packages/opie-mediummount/opie-mediummount_cvs.bb
index 1456365045..51d7a1fc77 100644
--- a/packages/opie-mediummount/opie-mediummount_cvs.bb
+++ b/packages/opie-mediummount/opie-mediummount_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
index 1b1eadb6ac..e219cf59bb 100644
--- a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
+++ b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/memoryapplet \
diff --git a/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb b/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb
index 22d538aaaa..0ccb32b59e 100644
--- a/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb
+++ b/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/mindbreaker \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-minesweep/opie-minesweep_cvs.bb b/packages/opie-minesweep/opie-minesweep_cvs.bb
index 961f3f536b..e7315a5a60 100644
--- a/packages/opie-minesweep/opie-minesweep_cvs.bb
+++ b/packages/opie-minesweep/opie-minesweep_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/minesweep \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb
index da8c6ce221..9bd8b3ca36 100644
--- a/packages/opie-multikey/opie-multikey_cvs.bb
+++ b/packages/opie-multikey/opie-multikey_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \
${HANDHELDS_CVS};module=opie/share"
diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
index 76497ef7e9..be6a1ed2d6 100644
--- a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
+++ b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/multikeyapplet \
diff --git a/packages/opie-networkapplet/opie-networkapplet_cvs.bb b/packages/opie-networkapplet/opie-networkapplet_cvs.bb
index 45d1c75c19..f1bc9b2ceb 100644
--- a/packages/opie-networkapplet/opie-networkapplet_cvs.bb
+++ b/packages/opie-networkapplet/opie-networkapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/networkapplet \
${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-networksettings/opie-networksettings_cvs.bb b/packages/opie-networksettings/opie-networksettings_cvs.bb
index 41fe8fead7..c14f18881b 100644
--- a/packages/opie-networksettings/opie-networksettings_cvs.bb
+++ b/packages/opie-networksettings/opie-networksettings_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-notesapplet/opie-notesapplet_cvs.bb b/packages/opie-notesapplet/opie-notesapplet_cvs.bb
index 8b67613ccd..73f5b6e9d4 100644
--- a/packages/opie-notesapplet/opie-notesapplet_cvs.bb
+++ b/packages/opie-notesapplet/opie-notesapplet_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/notesapplet"
diff --git a/packages/opie-odict/opie-odict_cvs.bb b/packages/opie-odict/opie-odict_cvs.bb
index d2b2fd25d9..d21ab62be3 100644
--- a/packages/opie-odict/opie-odict_cvs.bb
+++ b/packages/opie-odict/opie-odict_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/odict \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-oxygen/opie-oxygen_cvs.bb b/packages/opie-oxygen/opie-oxygen_cvs.bb
index 198df08f1f..147aff9c73 100644
--- a/packages/opie-oxygen/opie-oxygen_cvs.bb
+++ b/packages/opie-oxygen/opie-oxygen_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-oyatzee/opie-oyatzee_cvs.bb b/packages/opie-oyatzee/opie-oyatzee_cvs.bb
index 87e65aa9ca..ef624083ba 100644
--- a/packages/opie-oyatzee/opie-oyatzee_cvs.bb
+++ b/packages/opie-oyatzee/opie-oyatzee_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/oyatzee \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-packagemanager/opie-packagemanager_cvs.bb b/packages/opie-packagemanager/opie-packagemanager_cvs.bb
index cacdb5541d..f376326bf2 100644
--- a/packages/opie-packagemanager/opie-packagemanager_cvs.bb
+++ b/packages/opie-packagemanager/opie-packagemanager_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \
${HANDHELDS_CVS};module=opie/pics;cvsdate=${SRCDATE} \
diff --git a/packages/opie-parashoot/opie-parashoot_cvs.bb b/packages/opie-parashoot/opie-parashoot_cvs.bb
index b7439af955..ad2164a50b 100644
--- a/packages/opie-parashoot/opie-parashoot_cvs.bb
+++ b/packages/opie-parashoot/opie-parashoot_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/parashoot \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
index e329b2411a..95c80f47e5 100644
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pcmcia \
${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-pickboard/opie-pickboard_cvs.bb b/packages/opie-pickboard/opie-pickboard_cvs.bb
index c3ee83e592..4b940922d2 100644
--- a/packages/opie-pickboard/opie-pickboard_cvs.bb
+++ b/packages/opie-pickboard/opie-pickboard_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/pickboard"
diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb
index 5252da4c92..944678ded9 100644
--- a/packages/opie-pics/opie-pics_cvs.bb
+++ b/packages/opie-pics/opie-pics_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/pics \
${HANDHELDS_CVS};module=opie/pics-hires"
diff --git a/packages/opie-pimconverter/opie-pimconverter_cvs.bb b/packages/opie-pimconverter/opie-pimconverter_cvs.bb
index 692420bbfc..736ecca4aa 100644
--- a/packages/opie-pimconverter/opie-pimconverter_cvs.bb
+++ b/packages/opie-pimconverter/opie-pimconverter_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/pimconverter \
diff --git a/packages/opie-powerchord/opie-powerchord_cvs.bb b/packages/opie-powerchord/opie-powerchord_cvs.bb
index a4b7f2122d..bb20df9975 100644
--- a/packages/opie-powerchord/opie-powerchord_cvs.bb
+++ b/packages/opie-powerchord/opie-powerchord_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/powerchord \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb
index a209c4864f..c0e9c777e5 100644
--- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb
+++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pyquicklaunch \
diff --git a/packages/opie-qasteroids/opie-qasteroids_cvs.bb b/packages/opie-qasteroids/opie-qasteroids_cvs.bb
index 82730437d1..d2d783e432 100644
--- a/packages/opie-qasteroids/opie-qasteroids_cvs.bb
+++ b/packages/opie-qasteroids/opie-qasteroids_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/qasteroids \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-qcop/opie-qcop_cvs.bb b/packages/opie-qcop/opie-qcop_cvs.bb
index be1ec45a67..b240e74d0f 100644
--- a/packages/opie-qcop/opie-qcop_cvs.bb
+++ b/packages/opie-qcop/opie-qcop_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop"
diff --git a/packages/opie-qss/opie-qss_cvs.bb b/packages/opie-qss/opie-qss_cvs.bb
index ac9cfc697f..014f5fb451 100644
--- a/packages/opie-qss/opie-qss_cvs.bb
+++ b/packages/opie-qss/opie-qss_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qss"
diff --git a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
index 7ffd7a8ef2..3500fab721 100644
--- a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
+++ b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/tools/quicklauncher"
diff --git a/packages/opie-rdesktop/opie-rdesktop_cvs.bb b/packages/opie-rdesktop/opie-rdesktop_cvs.bb
index 2112bede6b..ea29f97790 100644
--- a/packages/opie-rdesktop/opie-rdesktop_cvs.bb
+++ b/packages/opie-rdesktop/opie-rdesktop_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opierdesktop \
${HANDHELDS_CVS};module=opie/apps \
diff --git a/packages/opie-reader/opie-reader_cvs.bb b/packages/opie-reader/opie-reader_cvs.bb
index bcac865f95..c4edc7043e 100644
--- a/packages/opie-reader/opie-reader_cvs.bb
+++ b/packages/opie-reader/opie-reader_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-recorder/opie-recorder_cvs.bb b/packages/opie-recorder/opie-recorder_cvs.bb
index 3a6ec5ab44..04b4d44618 100644
--- a/packages/opie-recorder/opie-recorder_cvs.bb
+++ b/packages/opie-recorder/opie-recorder_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opierec \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-remote/opie-remote_cvs.bb b/packages/opie-remote/opie-remote_cvs.bb
index 6ef478950b..9276829349 100644
--- a/packages/opie-remote/opie-remote_cvs.bb
+++ b/packages/opie-remote/opie-remote_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/remote \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-restartapplet/opie-restartapplet2_cvs.bb b/packages/opie-restartapplet/opie-restartapplet2_cvs.bb
index ea233607f9..62461b6a22 100644
--- a/packages/opie-restartapplet/opie-restartapplet2_cvs.bb
+++ b/packages/opie-restartapplet/opie-restartapplet2_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applets"
PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
APPNAME = "restartapplet"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet2 \
diff --git a/packages/opie-restartapplet/opie-restartapplet_cvs.bb b/packages/opie-restartapplet/opie-restartapplet_cvs.bb
index ab7c5f676a..255ab53a36 100644
--- a/packages/opie-restartapplet/opie-restartapplet_cvs.bb
+++ b/packages/opie-restartapplet/opie-restartapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb b/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb
index 7ebe4b0338..912cea6cbb 100644
--- a/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb
+++ b/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet2 \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb b/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb
index 35598cf81a..f74599cd43 100644
--- a/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb
+++ b/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/rotateapplet \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
index 84cdbc6c32..d03726301c 100644
--- a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/screenshotapplet \
diff --git a/packages/opie-search/opie-search_cvs.bb b/packages/opie-search/opie-search_cvs.bb
index 6acae68910..020d315a7a 100644
--- a/packages/opie-search/opie-search_cvs.bb
+++ b/packages/opie-search/opie-search_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/osearch \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-security/opie-security_cvs.bb b/packages/opie-security/opie-security_cvs.bb
index 4aa9a1f255..980b03b7c1 100644
--- a/packages/opie-security/opie-security_cvs.bb
+++ b/packages/opie-security/opie-security_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/security \
diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb
index 3d78f3757d..45f5ecf221 100644
--- a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
I18N_FILES = "libmultiauthbluepingplugin.ts"
RDEPENDS = "opie-security bluez-utils"
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
APPNAME = "multiauthbluepingplugin"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/blueping \
diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb
index 93cf6ac712..5aad60f8a6 100644
--- a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
I18N_FILES = "libmultiauthdummyplugin.ts"
RDEPENDS = "opie-security"
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
APPNAME = "multiauthdummyplugin"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/dummy \
diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb
index 34e79d78b5..1f1ec113be 100644
--- a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
I18N_FILES = "libmultiauthnoticeplugin.ts"
RDEPENDS = "opie-security"
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
APPNAME = "multiauthnoticeplugin"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/notice \
diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb
index b85132b5e2..792fc706c0 100644
--- a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb
@@ -8,7 +8,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
I18N_FILES = "libmultiauthpinplugin.ts"
RDEPENDS = "opie-security"
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
APPNAME = "multiauthpinplugin"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/pin \
diff --git a/packages/opie-securityplugins/opie-securityplugins_cvs.bb b/packages/opie-securityplugins/opie-securityplugins_cvs.bb
index f8c47a5c4f..79aae825a6 100644
--- a/packages/opie-securityplugins/opie-securityplugins_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugins_cvs.bb
@@ -1,4 +1,4 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
diff --git a/packages/opie-sfcave/opie-sfcave_cvs.bb b/packages/opie-sfcave/opie-sfcave_cvs.bb
index 8b087d4f0b..b383491746 100644
--- a/packages/opie-sfcave/opie-sfcave_cvs.bb
+++ b/packages/opie-sfcave/opie-sfcave_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/sfcave \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-sh-snes/files/snes.png b/packages/opie-sh-snes/files/snes.png
index 2bb69e733f..2c0abfe7e6 100644
--- a/packages/opie-sh-snes/files/snes.png
+++ b/packages/opie-sh-snes/files/snes.png
Binary files differ
diff --git a/packages/opie-sh-snes/opie-sh-snes_cvs.bb b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
index f8c47a5c4f..0ce2a6b704 100644
--- a/packages/opie-sh-snes/opie-sh-snes_cvs.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
@@ -1,4 +1,5 @@
include ${PN}.inc
-
-PV = "1.2.1+cvs${SRCDATE}"
+
+#Remove the dash below when 1.2.1 changes
+PV = "1.2.1+cvs-${SRCDATE}"
diff --git a/packages/opie-sh/opie-sh_cvs.bb b/packages/opie-sh/opie-sh_cvs.bb
index 782f06e4ba..efa04a2178 100644
--- a/packages/opie-sh/opie-sh_cvs.bb
+++ b/packages/opie-sh/opie-sh_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/opie-sh \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-sheet/opie-sheet_cvs.bb b/packages/opie-sheet/opie-sheet_cvs.bb
index dbf3aa0825..629457892a 100644
--- a/packages/opie-sheet/opie-sheet_cvs.bb
+++ b/packages/opie-sheet/opie-sheet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-sheet \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-snake/opie-snake_cvs.bb b/packages/opie-snake/opie-snake_cvs.bb
index 1c6b515278..c2a9e9b47d 100644
--- a/packages/opie-snake/opie-snake_cvs.bb
+++ b/packages/opie-snake/opie-snake_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/snake \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-solitaire/opie-solitaire_cvs.bb b/packages/opie-solitaire/opie-solitaire_cvs.bb
index b5aae11de6..184bec3f73 100644
--- a/packages/opie-solitaire/opie-solitaire_cvs.bb
+++ b/packages/opie-solitaire/opie-solitaire_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/solitaire \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-sounds/opie-sounds_cvs.bb b/packages/opie-sounds/opie-sounds_cvs.bb
index 9d58620165..cf58717170 100644
--- a/packages/opie-sounds/opie-sounds_cvs.bb
+++ b/packages/opie-sounds/opie-sounds_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/sounds"
diff --git a/packages/opie-sshkeys/opie-sshkeys_cvs.bb b/packages/opie-sshkeys/opie-sshkeys_cvs.bb
index a6e7536f36..bb1c458f9f 100644
--- a/packages/opie-sshkeys/opie-sshkeys_cvs.bb
+++ b/packages/opie-sshkeys/opie-sshkeys_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sshkeys \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-stumbler/files/opiestumbler.png b/packages/opie-stumbler/files/opiestumbler.png
index 6d491ed7e8..8ca7b4b604 100644
--- a/packages/opie-stumbler/files/opiestumbler.png
+++ b/packages/opie-stumbler/files/opiestumbler.png
Binary files differ
diff --git a/packages/opie-stumbler/opie-stumbler_cvs.bb b/packages/opie-stumbler/opie-stumbler_cvs.bb
index 3bc3f32fca..0c772b23af 100644
--- a/packages/opie-stumbler/opie-stumbler_cvs.bb
+++ b/packages/opie-stumbler/opie-stumbler_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opiestumbler \
${HANDHELDS_CVS};module=opie/apps \
diff --git a/packages/opie-style-flat/opie-style-flat_cvs.bb b/packages/opie-style-flat/opie-style-flat_cvs.bb
index 23f048b193..02e203f24b 100644
--- a/packages/opie-style-flat/opie-style-flat_cvs.bb
+++ b/packages/opie-style-flat/opie-style-flat_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/flat "
diff --git a/packages/opie-style-fresh/opie-style-fresh_cvs.bb b/packages/opie-style-fresh/opie-style-fresh_cvs.bb
index 53e7d08d6f..8e82eb2010 100644
--- a/packages/opie-style-fresh/opie-style-fresh_cvs.bb
+++ b/packages/opie-style-fresh/opie-style-fresh_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/fresh "
diff --git a/packages/opie-style-liquid/opie-style-liquid_cvs.bb b/packages/opie-style-liquid/opie-style-liquid_cvs.bb
index 0f62f0ce89..d3110b062b 100644
--- a/packages/opie-style-liquid/opie-style-liquid_cvs.bb
+++ b/packages/opie-style-liquid/opie-style-liquid_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/liquid "
diff --git a/packages/opie-style-metal/opie-style-metal_cvs.bb b/packages/opie-style-metal/opie-style-metal_cvs.bb
index 46dd132960..70e8511995 100644
--- a/packages/opie-style-metal/opie-style-metal_cvs.bb
+++ b/packages/opie-style-metal/opie-style-metal_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/metal "
diff --git a/packages/opie-style-phase/opie-style-phase_cvs.bb b/packages/opie-style-phase/opie-style-phase_cvs.bb
index 158e6ee471..1a4370c959 100644
--- a/packages/opie-style-phase/opie-style-phase_cvs.bb
+++ b/packages/opie-style-phase/opie-style-phase_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/phase"
diff --git a/packages/opie-style-web/opie-style-web_cvs.bb b/packages/opie-style-web/opie-style-web_cvs.bb
index 3e16a97f49..7a62ed8340 100644
--- a/packages/opie-style-web/opie-style-web_cvs.bb
+++ b/packages/opie-style-web/opie-style-web_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/web"
diff --git a/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb b/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb
index 09cf46c96e..62b2920441 100644
--- a/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb
+++ b/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/suspendapplet \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-symlinker/opie-symlinker_cvs.bb b/packages/opie-symlinker/opie-symlinker_cvs.bb
index be4d1d6fe5..8a525c069b 100644
--- a/packages/opie-symlinker/opie-symlinker_cvs.bb
+++ b/packages/opie-symlinker/opie-symlinker_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/symlinker "
diff --git a/packages/opie-sysinfo/opie-sysinfo_cvs.bb b/packages/opie-sysinfo/opie-sysinfo_cvs.bb
index 3454154dc2..800fdb998f 100644
--- a/packages/opie-sysinfo/opie-sysinfo_cvs.bb
+++ b/packages/opie-sysinfo/opie-sysinfo_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sysinfo \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-systemtime/opie-systemtime_cvs.bb b/packages/opie-systemtime/opie-systemtime_cvs.bb
index 30606d7926..4b9d2ea7ac 100644
--- a/packages/opie-systemtime/opie-systemtime_cvs.bb
+++ b/packages/opie-systemtime/opie-systemtime_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/netsystemtime \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-tableviewer/opie-tableviewer_cvs.bb b/packages/opie-tableviewer/opie-tableviewer_cvs.bb
index d391539791..7e5995836e 100644
--- a/packages/opie-tableviewer/opie-tableviewer_cvs.bb
+++ b/packages/opie-tableviewer/opie-tableviewer_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/tableviewer \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index f662b2f4aa..b9e6ff9720 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
diff --git a/packages/opie-tetrix/opie-tetrix_cvs.bb b/packages/opie-tetrix/opie-tetrix_cvs.bb
index 0dc932668d..32ecabb861 100644
--- a/packages/opie-tetrix/opie-tetrix_cvs.bb
+++ b/packages/opie-tetrix/opie-tetrix_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/tetrix \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-textedit/opie-textedit_cvs.bb b/packages/opie-textedit/opie-textedit_cvs.bb
index ad29b882fc..5e4bdd9eb0 100644
--- a/packages/opie-textedit/opie-textedit_cvs.bb
+++ b/packages/opie-textedit/opie-textedit_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-theme/opie-theme_cvs.bb b/packages/opie-theme/opie-theme_cvs.bb
index 2e237fa95b..dd00a68b1a 100644
--- a/packages/opie-theme/opie-theme_cvs.bb
+++ b/packages/opie-theme/opie-theme_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/theme \
${HANDHELDS_CVS};module=opie/plugins/styles "
diff --git a/packages/opie-tictac/opie-tictac_cvs.bb b/packages/opie-tictac/opie-tictac_cvs.bb
index a5e62a0566..5e0147450a 100644
--- a/packages/opie-tictac/opie-tictac_cvs.bb
+++ b/packages/opie-tictac/opie-tictac_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/tictac \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-tinykate/opie-tinykate_cvs.bb b/packages/opie-tinykate/opie-tinykate_cvs.bb
index e166b9ad7f..237bbe4623 100644
--- a/packages/opie-tinykate/opie-tinykate_cvs.bb
+++ b/packages/opie-tinykate/opie-tinykate_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/tinykate \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb
index 3ffbf54318..4bb9617da5 100644
--- a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb
+++ b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/addressbook "
diff --git a/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb b/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb
index a13eb97a21..91cb7e428b 100644
--- a/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb
+++ b/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/datebook "
diff --git a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb
index f9e3822561..3a756a7a35 100644
--- a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb
+++ b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/fortune "
diff --git a/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb b/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb
index 3153a1a3fe..462a1f77fa 100644
--- a/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb
+++ b/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/mail "
diff --git a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb
index 07aacd9f09..42896a07ed 100644
--- a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb
+++ b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/stockticker \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb b/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb
index f1e301cdb9..c1c27599a8 100644
--- a/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb
+++ b/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/todolist "
diff --git a/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb b/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb
index 04d5635422..5cc9e2bc1e 100644
--- a/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb
+++ b/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/weather \
${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-today/opie-today_cvs.bb b/packages/opie-today/opie-today_cvs.bb
index de4af163f9..5135a334cb 100644
--- a/packages/opie-today/opie-today_cvs.bb
+++ b/packages/opie-today/opie-today_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-todo/opie-todo_cvs.bb b/packages/opie-todo/opie-todo_cvs.bb
index f7a9db7bb5..6ae1079847 100644
--- a/packages/opie-todo/opie-todo_cvs.bb
+++ b/packages/opie-todo/opie-todo_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/todo \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-tonleiter/opie-tonleiter_cvs.bb b/packages/opie-tonleiter/opie-tonleiter_cvs.bb
index f02528c4b6..77dcd1c8db 100644
--- a/packages/opie-tonleiter/opie-tonleiter_cvs.bb
+++ b/packages/opie-tonleiter/opie-tonleiter_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/tonleiter \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb
index f9da0438ff..e31427c256 100644
--- a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb
+++ b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/unikeyboard "
diff --git a/packages/opie-usermanager/opie-usermanager_cvs.bb b/packages/opie-usermanager/opie-usermanager_cvs.bb
index b987644d1d..648caeb97c 100644
--- a/packages/opie-usermanager/opie-usermanager_cvs.bb
+++ b/packages/opie-usermanager/opie-usermanager_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/usermanager \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb b/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb
index cc4118500e..5ea8b91fba 100644
--- a/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb
+++ b/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sound \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-vmemo/opie-vmemo_cvs.bb b/packages/opie-vmemo/opie-vmemo_cvs.bb
index 297433a108..9f66e5864e 100644
--- a/packages/opie-vmemo/opie-vmemo_cvs.bb
+++ b/packages/opie-vmemo/opie-vmemo_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/vmemo \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
index e2a03712d5..50e180dd8f 100644
--- a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
+++ b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/volumeapplet \
diff --git a/packages/opie-vtapplet/opie-vtapplet_cvs.bb b/packages/opie-vtapplet/opie-vtapplet_cvs.bb
index 13c2d80b9c..4b73250b50 100644
--- a/packages/opie-vtapplet/opie-vtapplet_cvs.bb
+++ b/packages/opie-vtapplet/opie-vtapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/vtapplet \
${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb b/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb
index 16ac12c510..e223d11a73 100644
--- a/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb
+++ b/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/wellenreiter \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb
index efb8c65d78..fd5f3f584c 100644
--- a/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb
+++ b/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb
@@ -1,5 +1,5 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/wirelessapplet"
diff --git a/packages/opie-wordgame/opie-wordgame_cvs.bb b/packages/opie-wordgame/opie-wordgame_cvs.bb
index adc05e192e..3f143e1dc4 100644
--- a/packages/opie-wordgame/opie-wordgame_cvs.bb
+++ b/packages/opie-wordgame/opie-wordgame_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/wordgame \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-write/opie-write_cvs.bb b/packages/opie-write/opie-write_cvs.bb
index c93125bf51..b552bf6152 100644
--- a/packages/opie-write/opie-write_cvs.bb
+++ b/packages/opie-write/opie-write_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb b/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb
index 92ba1f3bd3..91167ca860 100644
--- a/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb
+++ b/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/zkbapplet \
${HANDHELDS_CVS};module=opie/share \
diff --git a/packages/opie-zlines/opie-zlines_cvs.bb b/packages/opie-zlines/opie-zlines_cvs.bb
index c3ffa80d43..4e99318420 100644
--- a/packages/opie-zlines/opie-zlines_cvs.bb
+++ b/packages/opie-zlines/opie-zlines_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/zlines \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-zsafe/opie-zsafe_cvs.bb b/packages/opie-zsafe/opie-zsafe_cvs.bb
index 88b3519bfc..5e58e8e544 100644
--- a/packages/opie-zsafe/opie-zsafe_cvs.bb
+++ b/packages/opie-zsafe/opie-zsafe_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/zsafe \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-zsame/opie-zsame_cvs.bb b/packages/opie-zsame/opie-zsame_cvs.bb
index 2b0e7adfae..8e9011b806 100644
--- a/packages/opie-zsame/opie-zsame_cvs.bb
+++ b/packages/opie-zsame/opie-zsame_cvs.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PV = "1.2.1+cvs${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/zsame \
${HANDHELDS_CVS};module=opie/pics \