opie-*: Convert remaining recipes with "cvs-" version to OPIE_CVS_PV.

diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
index a919c3094b950f389c5c3c120c4e1858eb372830..98ac64a4c1e6d187c7fc1a34fcc3027a4bb905fc 100644 (file)
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
@@ -1,8 +1,9 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \
-           ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet \
-           file://sysconfig-bluetooth.patch;patch=1"
+           ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet"
+
+#           file://sysconfig-bluetooth.patch;patch=1"

diff --git a/packages/opie-help-en/opie-help-en_cvs.bb b/packages/opie-help-en/opie-help-en_cvs.bb
index 787b40833f1c2d50b89fd5ed5c4fa21e9116a795..ccd75ca89a18eef7469c2d7158743964b6c0cb3f 100644 (file)
--- a/packages/opie-help-en/opie-help-en_cvs.bb
+++ b/packages/opie-help-en/opie-help-en_cvs.bb
@@ -1,6 +1,5 @@
 require ${PN}.inc
 
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/help/en/html "

diff --git a/packages/opie-i18n/opie-i18n_cvs.bb b/packages/opie-i18n/opie-i18n_cvs.bb
index 3e269e73ef3ccb6afec85deb61e89685c48fc1f7..6532cd170cf68f2117b05011df06bac30ffdfbfc 100644 (file)
--- a/packages/opie-i18n/opie-i18n_cvs.bb
+++ b/packages/opie-i18n/opie-i18n_cvs.bb
@@ -1,7 +1,6 @@
 require ${PN}.inc
 
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+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 94401fab789212ddd27ffccb6ec654713cb7988b..9bce52188febc35641979c2327da9e6c367cd752 100644 (file)
--- a/packages/opie-i18n/opie-lrelease-native_cvs.bb
+++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+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 5f2d834b74edb2069f6a176a0afbdbaa592677b8..e7c33b6da0c47db7bc17309c6be0cff9f26bd550 100644 (file)
--- a/packages/opie-i18n/opie-lupdate-native_cvs.bb
+++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+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-keytabs/opie-keytabs_cvs.bb b/packages/opie-keytabs/opie-keytabs_cvs.bb
index d18339a04661ed277eb222a4ff174042bf71e737..c81cd23eb9fb1860d5f780724e8657495e3135b4 100644 (file)
--- a/packages/opie-keytabs/opie-keytabs_cvs.bb
+++ b/packages/opie-keytabs/opie-keytabs_cvs.bb
@@ -1,6 +1,5 @@
 require ${PN}.inc
 
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/etc"

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 3cb7f8551e9e3d4bd60c12556351f3a4ec816f37..23898147b130367a67f9ee464fc8bee8a127e360 100644 (file)
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
 APPNAME = "opieplayer2"
+PV = "${OPIE_CVS_PV}"
 
 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 b2e826ae59455e87a6a301d7d4bd4972780c4a80..bbfbd25e2bdf4b758ac134da75115f007cb20eb6 100644 (file)
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
 APPNAME = "opieplayer2"
+PV = "${OPIE_CVS_PV}"
 
 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 d091f5090357bee9fc4991d4d8ebeb1983bc2563..ac3f961b3cee4d41e1009857d1868c40f861ba31 100644 (file)
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
 APPNAME = "opieplayer2"
+PV = "${OPIE_CVS_PV}"
 
 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 ca44bfc3afd037fbb0c165a38280956f462c9fe9..10a119a48a98daa654708d161f985a6f2fb9493a 100644 (file)
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
 APPNAME = "opieplayer2"
+PV = "${OPIE_CVS_PV}"
 
 RPROVIDES = "opie-mediaplayer2-skin"
 

diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
index 2badc15abde3c98f4692ead07a5b2dc02ba38804..b080b3ce929b7ddfb0662fe5469306857dbf6543 100644 (file)
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
@@ -1,7 +1,6 @@
 require ${PN}.inc
 
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \
            ${HANDHELDS_CVS};module=opie/pics \

diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb
index 5080a4d984e200892358b6a3538cc56179b7ceba..fa74824d73c6f377eb41383f1fa4b10b4f1af1cc 100644 (file)
--- a/packages/opie-multikey/opie-multikey_cvs.bb
+++ b/packages/opie-multikey/opie-multikey_cvs.bb
@@ -1,8 +1,9 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \
-           ${HANDHELDS_CVS};module=opie/share \
-           file://friendly-button-names.patch;patch=1"
+           ${HANDHELDS_CVS};module=opie/share"
+
+#           file://friendly-button-names.patch;patch=1"

diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb
index 593ea5bf9c79094a2ecb0eee5941690ed6a4ce10..185ff2f338bbb637dcd979b22f0d09565df82453 100644 (file)
--- a/packages/opie-pics/opie-pics_cvs.bb
+++ b/packages/opie-pics/opie-pics_cvs.bb
@@ -1,7 +1,6 @@
 require ${PN}.inc
 
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics \
            ${HANDHELDS_CVS};module=opie/pics-hires"

diff --git a/packages/opie-sh-snes/opie-sh-snes_cvs.bb b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
index 7c49fdd77b09d5afd1878102ca4f260084db4299..cf67d0c2e8d32ae773b7c2bd98ad687b7995405c 100644 (file)
--- a/packages/opie-sh-snes/opie-sh-snes_cvs.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
@@ -1,5 +1,4 @@
 require ${PN}.inc
 
-#Remove the dash below when 1.2.1 changes
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
 

diff --git a/packages/opie-sounds/opie-sounds_cvs.bb b/packages/opie-sounds/opie-sounds_cvs.bb
index 818a1c48f1666b9cc6dca48a0d4a85f26d3e86f9..bbd3046b64bbf10bd16bfb851194026d26632ba9 100644 (file)
--- a/packages/opie-sounds/opie-sounds_cvs.bb
+++ b/packages/opie-sounds/opie-sounds_cvs.bb
@@ -1,6 +1,5 @@
 require ${PN}.inc
 
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/sounds"