opie-alarm, opie-qcop, opie-qss, opie-quicklauncher: Install to $bindir.

* Per #2254.

diff --git a/packages/opie-alarm/opie-alarm.inc b/packages/opie-alarm/opie-alarm.inc
index d193653..60ef1e1 100644 (file)
--- a/packages/opie-alarm/opie-alarm.inc
+++ b/packages/opie-alarm/opie-alarm.inc
@@ -10,9 +10,7 @@ S = "${WORKDIR}/opiealarm"
 inherit opie
 
 do_install() {
-       install -d ${D}${palmtopdir}/bin/ ${D}${sysconfdir}/apm/event.d/
-       install -m 0755 ${S}/opiealarm ${D}${palmtopdir}/bin/
+       install -d ${D}${bindir} ${D}${sysconfdir}/apm/event.d/
+       install -m 0755 ${S}/opiealarm ${D}${bindir}/
        install -m 0755 ${WORKDIR}/01opiealarm ${D}${sysconfdir}/apm/event.d/
 }
-
-FILES_${PN} = "${palmtopdir}/bin/opiealarm ${sysconfdir}/apm/event.d/01opiealarm"

diff --git a/packages/opie-alarm/opie-alarm_cvs.bb b/packages/opie-alarm/opie-alarm_cvs.bb
index 0dd6254..9b0cbe3 100644 (file)
--- a/packages/opie-alarm/opie-alarm_cvs.bb
+++ b/packages/opie-alarm/opie-alarm_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
            file://01opiealarm "

diff --git a/packages/opie-qcop/opie-qcop.inc b/packages/opie-qcop/opie-qcop.inc
index 8c36328..b9b0309 100644 (file)
--- a/packages/opie-qcop/opie-qcop.inc
+++ b/packages/opie-qcop/opie-qcop.inc
@@ -8,6 +8,6 @@ S = "${WORKDIR}/qcop"
 inherit opie
 
 do_install() {
-       install -d ${D}${palmtopdir}/bin/
-       install -m 0755 ${S}/qcop ${D}${palmtopdir}/bin/qcop
+       install -d ${D}${bindir}
+       install -m 0755 ${S}/qcop ${D}${bindir}/qcop
 }

diff --git a/packages/opie-qcop/opie-qcop_cvs.bb b/packages/opie-qcop/opie-qcop_cvs.bb
index 7a68c6e..01a1d1b 100644 (file)
--- a/packages/opie-qcop/opie-qcop_cvs.bb
+++ b/packages/opie-qcop/opie-qcop_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop \
            file://unbreak-logging.patch;patch=1"

diff --git a/packages/opie-qss/opie-qss.inc b/packages/opie-qss/opie-qss.inc
index 10abdf2..1e7ea3a 100644 (file)
--- a/packages/opie-qss/opie-qss.inc
+++ b/packages/opie-qss/opie-qss.inc
@@ -8,6 +8,6 @@ S = "${WORKDIR}/qss"
 inherit opie
 
 do_install() {
-       install -d ${D}${palmtopdir}/bin/
-       install -m 0755 ${S}/qss ${D}${palmtopdir}/bin/qss
+       install -d ${D}${bindir}
+       install -m 0755 ${S}/qss ${D}${bindir}/qss
 }

diff --git a/packages/opie-qss/opie-qss_cvs.bb b/packages/opie-qss/opie-qss_cvs.bb
index 7658499..915fefa 100644 (file)
--- a/packages/opie-qss/opie-qss_cvs.bb
+++ b/packages/opie-qss/opie-qss_cvs.bb
@@ -1,5 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qss"

diff --git a/packages/opie-quicklauncher/opie-quicklauncher.inc b/packages/opie-quicklauncher/opie-quicklauncher.inc
index d445f69..e205728 100644 (file)
--- a/packages/opie-quicklauncher/opie-quicklauncher.inc
+++ b/packages/opie-quicklauncher/opie-quicklauncher.inc
@@ -8,7 +8,6 @@ S = "${WORKDIR}/quicklauncher"
 inherit opie
 
 do_install() {
-       install -d ${D}${palmtopdir}/bin/
-       install -m 755 quicklauncher ${D}${palmtopdir}/bin/
-
+       install -d ${D}${bindir}
+       install -m 755 quicklauncher ${D}${bindir}/
 }

diff --git a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
index 992279d..4255a2b 100644 (file)
--- a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
+++ b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
@@ -1,5 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/tools/quicklauncher"