[oe-commits] org.oe.dev merge of 'b56480f5496377245fb319218acc01132afd55d4'

[oe commit]

merge of 'b56480f5496377245fb319218acc01132afd55d4'
     and 'e073022cc54795bb1f1d4970d0785a18d25a5136'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 38529287a3b3f790ac168c4d45dcade49590dd17
ViewMTN: http://monotone.openembedded.org/revision/info/38529287a3b3f790ac168c4d45dcade49590dd17
Files:
1
packages/opie-taskbar/opie-taskbar/firstuse-path.patch
packages/opie-taskbar/opie-taskbar_1.2.3.bb
packages/opie-taskbar/opie-taskbar_cvs.bb
packages/xrestop/xrestop_0.4.bb
packages/ntpclient/ntpclient_2007_365.bb
Diffs:

#
# mt diff -rb56480f5496377245fb319218acc01132afd55d4 -r38529287a3b3f790ac168c4d45dcade49590dd17
#
# 
# 
# add_file "packages/opie-taskbar/opie-taskbar/firstuse-path.patch"
#  content [3daabb637a289e05a96e0c4ac8364ea64b7edcf4]
# 
# patch "packages/opie-taskbar/opie-taskbar_1.2.3.bb"
#  from [0112ad577e4b14c11a22556dd9de7e2c22083f02]
#    to [15845323fc8ba58771813583d4029baff27ca2b0]
# 
# patch "packages/opie-taskbar/opie-taskbar_cvs.bb"
#  from [61a236fc7e91c5eab32ed70a7bd08065ed5186a2]
#    to [edbbc176136c3e3d59b88a9c7ca445855ffe7c96]
# 
# patch "packages/xrestop/xrestop_0.4.bb"
#  from [db89658b7bd6b24b3f7e98e50641efe9b4e25bb3]
#    to [0a3c25fb100d4201cfed337558f772d41d2ba1fb]
# 
============================================================
--- packages/opie-taskbar/opie-taskbar/firstuse-path.patch	3daabb637a289e05a96e0c4ac8364ea64b7edcf4
+++ packages/opie-taskbar/opie-taskbar/firstuse-path.patch	3daabb637a289e05a96e0c4ac8364ea64b7edcf4
@@ -0,0 +1,11 @@
+--- launcher/firstuse.cpp	2007-10-14 12:47:55.000000000 +1300
++++ launcher/firstuse.cpp	2007-10-14 13:58:54.000000000 +1300
+@@ -124,7 +124,7 @@
+ #endif
+ 
+     for ( int i = 0; settingsTable[i].app; i++ ) {
+-	QString file = QPEApplication::qpeDir() + "bin/";
++	QString file = OPIE_BINDIR + QString("/");
+ 	file += settingsTable[i].app;
+ 	file += exeSuffix;
+ 	if ( QFile::exists(file) )
============================================================
--- packages/opie-taskbar/opie-taskbar_1.2.3.bb	0112ad577e4b14c11a22556dd9de7e2c22083f02
+++ packages/opie-taskbar/opie-taskbar_1.2.3.bb	15845323fc8ba58771813583d4029baff27ca2b0
@@ -13,4 +13,5 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};m
            file://kbdlocks-runtime.patch;patch=1 \
 	   file://restart-from-bindir.patch;patch=1 \
            file://server.pro \
+	   file://firstuse-path.patch;patch=1 \
           "
============================================================
--- packages/opie-taskbar/opie-taskbar_cvs.bb	61a236fc7e91c5eab32ed70a7bd08065ed5186a2
+++ packages/opie-taskbar/opie-taskbar_cvs.bb	edbbc176136c3e3d59b88a9c7ca445855ffe7c96
@@ -1,6 +1,6 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r15"
+PR = "r16"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
@@ -14,4 +14,5 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/
            file://kbdlocks-runtime.patch;patch=1 \
 	   file://restart-from-bindir.patch;patch=1 \
            file://server.pro \
+	   file://firstuse-path.patch;patch=1 \
           "
============================================================
--- packages/xrestop/xrestop_0.4.bb	db89658b7bd6b24b3f7e98e50641efe9b4e25bb3
+++ packages/xrestop/xrestop_0.4.bb	0a3c25fb100d4201cfed337558f772d41d2ba1fb
@@ -1,5 +1,8 @@
+DESCRIPTION = "top-like statistics of X11 server resource usage by clients"
+SECTION = "x11/utils"
 HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xrestop"
 LICENSE = "GPL"
+PR = "r1"
 
 DEPENDS = "libxres libxext virtual/libx11"
 


#
# mt diff -re073022cc54795bb1f1d4970d0785a18d25a5136 -r38529287a3b3f790ac168c4d45dcade49590dd17
#
# 
# 
# add_file "packages/ntpclient/ntpclient_2007_365.bb"
#  content [d5bc8f8a34db32961a6955ff40660c464bbc2d5c]
# 
============================================================
--- packages/ntpclient/ntpclient_2007_365.bb	d5bc8f8a34db32961a6955ff40660c464bbc2d5c
+++ packages/ntpclient/ntpclient_2007_365.bb	d5bc8f8a34db32961a6955ff40660c464bbc2d5c
@@ -0,0 +1,34 @@
+DESCRIPTION = "NTP (RFC-1305) client for unix-alike computers"
+HOMEPAGE = "http://doolittle.icarus.com/ntpclient"
+AUTHOR = "Larry Doolittle <larry at doolittle.boa.org>"
+RDEPENDS = "busybox"
+SECTION = "admin"
+LICENSE = "GPLv2"
+PR = "r0"
+# The ntpclient package uses version numbers that include an underscore :(
+PV = "2007_365"
+# ntpclient unpacks into a directory that doesn't include version info :(
+S = "${WORKDIR}/${PN}-2007"
+
+SRC_URI = "http://doolittle.icarus.com/ntpclient/ntpclient_${PV}.tar.gz \
+           file://init"
+
+INITSCRIPT_NAME = "ntpclient"
+INITSCRIPT_PARAMS = "defaults 65"
+inherit update-rc.d
+
+LDFLAGS += " -lrt "
+
+do_compile() {
+    oe_runmake ntpclient
+    oe_runmake adjtimex
+}
+
+do_install () {
+    # Install the binary and tools
+    install -D -m 0755 ${S}/ntpclient ${D}${base_sbindir}/ntpclient
+    install -D -m 0755 ${S}/adjtimex ${D}${base_sbindir}/adjtimex
+    install -D -m 0755 ${S}/rate.awk ${D}${sbindir}/ntpclient-drift-rate.awk
+    install -D -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ntpclient
+}
+