From dddb5f6d0875136762795e1d862708ad4b6d12ec Mon Sep 17 00:00:00 2001
From: Paul Eggleton <bluelightning@bluelightning.org>
Date: Tue, 30 Oct 2007 22:34:06 +0000
Subject: opie-mediaplayer2: update to 1.2.3 - close #3220

---
 .../opie-mediaplayer2-skin-default-landscape_1.2.2.bb    | 16 ----------------
 .../opie-mediaplayer2-skin-default-landscape_1.2.3.bb    | 16 ++++++++++++++++
 .../opie-mediaplayer2-skin-default-landscape_cvs.bb      |  3 +--
 .../opie-mediaplayer2-skin-default_1.2.2.bb              | 16 ----------------
 .../opie-mediaplayer2-skin-default_1.2.3.bb              | 16 ++++++++++++++++
 .../opie-mediaplayer2-skin-default_cvs.bb                |  3 +--
 .../opie-mediaplayer2-skin-pod_1.2.2.bb                  | 16 ----------------
 .../opie-mediaplayer2-skin-pod_1.2.3.bb                  | 16 ++++++++++++++++
 .../opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb  |  3 +--
 .../opie-mediaplayer2-skin-techno_1.2.2.bb               | 16 ----------------
 .../opie-mediaplayer2-skin-techno_1.2.3.bb               | 16 ++++++++++++++++
 .../opie-mediaplayer2-skin-techno_cvs.bb                 |  3 +--
 packages/opie-mediaplayer2/opie-mediaplayer2_1.2.2.bb    |  6 ------
 packages/opie-mediaplayer2/opie-mediaplayer2_1.2.3.bb    |  6 ++++++
 packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb      |  3 +--
 15 files changed, 75 insertions(+), 80 deletions(-)
 delete mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.2.bb
 create mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.3.bb
 delete mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.2.bb
 create mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.3.bb
 delete mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.2.bb
 create mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.3.bb
 delete mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.2.bb
 create mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.3.bb
 delete mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2_1.2.2.bb
 create mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2_1.2.3.bb

diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.2.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.2.bb
deleted file mode 100644
index 0c6b505d8c..0000000000
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.2.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Skin for opie-mediaplayer2"
-SECTION = "opie/multimedia"
-PRIORITY = "optional"
-LICENSE = "GPL"
-APPNAME = "opieplayer2"
-RPROVIDES="opie-mediaplayer2-skin"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
-
-FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default_landscape/*.png"
-
-do_install() {
-	install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default_landscape/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default_landscape/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default_landscape/
-}
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.3.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.3.bb
new file mode 100644
index 0000000000..0c6b505d8c
--- /dev/null
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.3.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Skin for opie-mediaplayer2"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+APPNAME = "opieplayer2"
+RPROVIDES="opie-mediaplayer2-skin"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default_landscape/*.png"
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default_landscape/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default_landscape/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default_landscape/
+}
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 3cb7f8551e..77dd92d8b4 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,7 @@ 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}"
+PV = "${OPIE_CVS_PV}"
 APPNAME = "opieplayer2"
 
 RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.2.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.2.bb
deleted file mode 100644
index e0b8efe4dc..0000000000
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.2.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Skin for opie-mediaplayer2"
-SECTION = "opie/multimedia"
-PRIORITY = "optional"
-LICENSE = "GPL"
-APPNAME = "opieplayer2"
-RPROVIDES = "opie-mediaplayer2-skin"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
-
-FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default/*.png"
-
-do_install() {
-	install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default/
-}
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.3.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.3.bb
new file mode 100644
index 0000000000..e0b8efe4dc
--- /dev/null
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.3.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Skin for opie-mediaplayer2"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+APPNAME = "opieplayer2"
+RPROVIDES = "opie-mediaplayer2-skin"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default/*.png"
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default/
+}
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
index b2e826ae59..30227bcf4e 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
@@ -2,8 +2,7 @@ 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}"
+PV = "${OPIE_CVS_PV}"
 APPNAME = "opieplayer2"
 
 RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.2.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.2.bb
deleted file mode 100644
index a40604c041..0000000000
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.2.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Skin for opie-mediaplayer2"
-SECTION = "opie/multimedia"
-PRIORITY = "optional"
-LICENSE = "GPL"
-APPNAME = "opieplayer2"
-RPROVIDES = "opie-mediaplayer2-skin"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
-
-FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/Pod/*.png"
-
-do_install() {
-	install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/Pod/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/Pod/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/Pod/
-}
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.3.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.3.bb
new file mode 100644
index 0000000000..a40604c041
--- /dev/null
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.3.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Skin for opie-mediaplayer2"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+APPNAME = "opieplayer2"
+RPROVIDES = "opie-mediaplayer2-skin"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/Pod/*.png"
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/Pod/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/Pod/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/Pod/
+}
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
index d091f50903..fb0bdb85bd 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
@@ -2,8 +2,7 @@ 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}"
+PV = "${OPIE_CVS_PV}"
 APPNAME = "opieplayer2"
 
 RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.2.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.2.bb
deleted file mode 100644
index 7a6715e5cf..0000000000
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.2.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Skin for opie-mediaplayer2"
-SECTION = "opie/multimedia"
-PRIORITY = "optional"
-LICENSE = "GPL"
-APPNAME = "opieplayer2"
-RPROVIDES = "opie-mediaplayer2-skin"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
-
-FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/techno/*.png"
-
-do_install() {
-	install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/techno/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/techno/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/techno/
-}
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.3.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.3.bb
new file mode 100644
index 0000000000..7a6715e5cf
--- /dev/null
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.3.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Skin for opie-mediaplayer2"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+APPNAME = "opieplayer2"
+RPROVIDES = "opie-mediaplayer2-skin"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/techno/*.png"
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/techno/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/techno/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/techno/
+}
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
index ca44bfc3af..14e5034818 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
@@ -2,8 +2,7 @@ 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}"
+PV = "${OPIE_CVS_PV}"
 APPNAME = "opieplayer2"
 
 RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.2.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.2.bb
deleted file mode 100644
index 2e6c7ec517..0000000000
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require ${PN}.inc
-
-
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.3.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.3.bb
new file mode 100644
index 0000000000..2e6c7ec517
--- /dev/null
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.3.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
index 2badc15abd..b080b3ce92 100644
--- 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 \
-- 
cgit v1.2.3