Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into handhelds.org:/home/ich/programming/oe/openembedded

2005/03/03 21:26:05+01:00 handhelds.org!zecke
Opie QSS:
	-Add a _cvs and 1.1.9 version. The 1.1.9 version currently doesn't use ${TAG}
	-QSS is needed to play sounds so make opie-taskbar dependant on it

2005/03/03 21:11:27+01:00 handhelds.org!zecke
Opie QCOP:
	Update the version due yesterdays Trolltech Qtopia 2.1.1 merge

BKrev: 422772f3ACFEaTwShwqtFB7_sLQXeQ

diff --git a/conf/distro/preferred-opie-versions.inc b/conf/distro/preferred-opie-versions.inc
index d8b2689..828f79b 100644 (file)
--- a/conf/distro/preferred-opie-versions.inc
+++ b/conf/distro/preferred-opie-versions.inc
@@ -119,6 +119,7 @@ PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-qcop = "1.0.0"
 PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qss = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}"

diff --git a/packages/opie-qcop/opie-qcop_1.0.0.bb b/packages/opie-qcop/opie-qcop_1.0.0.bb
deleted file mode 100644 (file)
index ea358ca..0000000
--- a/packages/opie-qcop/opie-qcop_1.0.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Opie QCOP IPC Client"
-SECTION = "opie/base"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-# cvsdate for opie-qcop 1.0 is 20050101
-CVSDATE = "20050101"
-
-SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop"
-S = "${WORKDIR}/qcop"
-
-inherit opie
-
-do_install() {
-       install -d ${D}${palmtopdir}/bin/
-       install -m 0755 ${S}/qcop ${D}${palmtopdir}/bin/qcop
-}

diff --git a/packages/opie-qcop/opie-qcop_1.0.1.bb b/packages/opie-qcop/opie-qcop_1.0.1.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/opie-qcop/opie-qcop_cvs.bb b/packages/opie-qcop/opie-qcop_cvs.bb
index a060a8b..785cb8b 100644 (file)
--- a/packages/opie-qcop/opie-qcop_cvs.bb
+++ b/packages/opie-qcop/opie-qcop_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "opie/base"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-PV = "1.0.0+cvs-${CVSDATE}"
+PV = "1.0.1+cvs-${CVSDATE}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop"
 S = "${WORKDIR}/qcop"

diff --git a/packages/opie-qss/opie-qss_1.1.9.bb b/packages/opie-qss/opie-qss_1.1.9.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/opie-qss/opie-qss_cvs.bb b/packages/opie-qss/opie-qss_cvs.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/opie-taskbar/opie-taskbar_1.1.9.bb b/packages/opie-taskbar/opie-taskbar_1.1.9.bb
index 102d8d9..751a2e4 100644 (file)
--- a/packages/opie-taskbar/opie-taskbar_1.1.9.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.1.9.bb
@@ -3,7 +3,7 @@ SECTION = "opie/base"
 PRIORITY = "optional"
 LICENSE = "GPL"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
-DEPENDS = "opie-libqrsync"
+DEPENDS = "opie-libqrsync opie-qss"
 PR = "r3"
 APPNAME = "qpe"
 

diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 343b2b7..d4387bb 100644 (file)
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "opie/base"
 PRIORITY = "optional"
 LICENSE = "GPL"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
-DEPENDS = "opie-libqrsync"
+DEPENDS = "opie-libqrsync opie-qss"
 PV = "1.1.9+cvs-${CVSDATE}"
 PR = "r5"
 APPNAME = "qpe"