Merge the conflict

2004/11/13 21:06:11+01:00 handhelds.org!zecke
Opie 1.1.7:
	Remove CVSDATE and PR from the package files

2004/11/13 20:52:18+01:00 handhelds.org!zecke
Update packaging of 1.1.7 to match the 'cvs' version of the Opie versions

2004/11/13 20:36:08+01:00 handhelds.org!zecke
Upgrade all Opie 1.1.6 files to Opie 1.1.7 in preparation
of the next OpenZaurus/Familiar release.

Remove all occurrences of Opie1.1.6 in the files

BKrev: 41966a744AeMTtlPuskXFPg512ykqQ

6 files changed, 0 insertions, 27 deletions

diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.6.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.6.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.1.7.oe
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.6.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.6.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.1.7.oe
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.6.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.6.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.1.7.oe
diff --git a/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.6.oe b/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.6.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.1.7.oe
diff --git a/opie-mediaplayer2/opie-mediaplayer2_1.1.6.oe b/opie-mediaplayer2/opie-mediaplayer2_1.1.6.oe
deleted file mode 100644
index 4ac478bb39..0000000000
--- a/opie-mediaplayer2/opie-mediaplayer2_1.1.6.oe
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "The mediaplayer for Opie. It plays mp3, mpeg, wav, ogg, quicktime, divx and more. Also it is streaming capable."
-SECTION = "opie/multimedia"
-PRIORITY = "optional"
-LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>
-DEPENDS = "libxine-1.0.0-beta12"
-RDEPENDS = "opie-mediaplayer2-skin"
-APPNAME = "opieplayer2"
-PR = "r1"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps \
-	   file://fix-switch-yuv2rgb_arm2.patch;patch=1"
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-QMAKE_PROFILES = "opieplayer2.pro"
-
-do_install() {
-	install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${S}${palmtopdir}/apps/Applications/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	install -m 0644 ${WORKDIR}/apps/Applications/mediaplayer.desktop ${D}${palmtopdir}/apps/Applications/
-}
-
diff --git a/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe b/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe