From 1434b204e16e87b7f59f074f3036d5dcbcf0116f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 9 Aug 2007 08:37:22 +0000 Subject: disapproval of revision '87f4964e99b725f1fc7dfcdb6feb62a3b3b0cd12' --- packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb | 7 +++---- packages/opie-help-en/opie-help-en_cvs.bb | 3 ++- packages/opie-i18n/opie-i18n_cvs.bb | 3 ++- packages/opie-i18n/opie-lrelease-native_cvs.bb | 4 ++-- packages/opie-i18n/opie-lupdate-native_cvs.bb | 4 ++-- packages/opie-keytabs/opie-keytabs_cvs.bb | 3 ++- .../opie-mediaplayer2-skin-default-landscape_cvs.bb | 3 ++- packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb | 3 ++- packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb | 3 ++- packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb | 3 ++- packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb | 3 ++- packages/opie-multikey/opie-multikey_cvs.bb | 7 +++---- packages/opie-pics/opie-pics_cvs.bb | 3 ++- packages/opie-sh-snes/opie-sh-snes_cvs.bb | 3 ++- packages/opie-sounds/opie-sounds_cvs.bb | 3 ++- 15 files changed, 32 insertions(+), 23 deletions(-) diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb index 98ac64a4c1..a919c3094b 100644 --- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb +++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb @@ -1,9 +1,8 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r2" +PR = "r1" 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 ccd75ca89a..787b40833f 100644 --- a/packages/opie-help-en/opie-help-en_cvs.bb +++ b/packages/opie-help-en/opie-help-en_cvs.bb @@ -1,5 +1,6 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" 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 6532cd170c..3e269e73ef 100644 --- a/packages/opie-i18n/opie-i18n_cvs.bb +++ b/packages/opie-i18n/opie-i18n_cvs.bb @@ -1,6 +1,7 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" 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 9bce52188f..94401fab78 100644 --- 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 -PV = "${OPIE_CVS_PV}" - +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" 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 e7c33b6da0..5f2d834b74 100644 --- 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 -PV = "${OPIE_CVS_PV}" - +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" 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 c81cd23eb9..d18339a046 100644 --- a/packages/opie-keytabs/opie-keytabs_cvs.bb +++ b/packages/opie-keytabs/opie-keytabs_cvs.bb @@ -1,5 +1,6 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" 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 23898147b1..3cb7f8551e 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb @@ -2,8 +2,9 @@ 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 bbfbd25e2b..b2e826ae59 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb @@ -2,8 +2,9 @@ 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 ac3f961b3c..d091f50903 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb @@ -2,8 +2,9 @@ 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 10a119a48a..ca44bfc3af 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb @@ -2,8 +2,9 @@ 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 b080b3ce92..2badc15abd 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb @@ -1,6 +1,7 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" 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 fa74824d73..5080a4d984 100644 --- a/packages/opie-multikey/opie-multikey_cvs.bb +++ b/packages/opie-multikey/opie-multikey_cvs.bb @@ -1,9 +1,8 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r2" +PR = "r1" 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 185ff2f338..593ea5bf9c 100644 --- a/packages/opie-pics/opie-pics_cvs.bb +++ b/packages/opie-pics/opie-pics_cvs.bb @@ -1,6 +1,7 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" 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 cf67d0c2e8..7c49fdd77b 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 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" +#Remove the dash below when 1.2.1 changes +PV = "1.2.2+cvs-${SRCDATE}" diff --git a/packages/opie-sounds/opie-sounds_cvs.bb b/packages/opie-sounds/opie-sounds_cvs.bb index bbd3046b64..818a1c48f1 100644 --- a/packages/opie-sounds/opie-sounds_cvs.bb +++ b/packages/opie-sounds/opie-sounds_cvs.bb @@ -1,5 +1,6 @@ require ${PN}.inc -PV = "${OPIE_CVS_PV}" +# Remove the dash below when 1.2.1 changes in PV +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/sounds" -- cgit v1.2.3