[oe-commits] org.oe.dev merge of '1af7742e17a7556d323fd4873c9ad1dc74655d34'

[rwhitby commit]

merge of '1af7742e17a7556d323fd4873c9ad1dc74655d34'
     and '24c7203b69a8d8da8f6cacbf0180f1fc57efa6c1'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 4c108250ef95743112aee6c23a4f206124025bbb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4c108250ef95743112aee6c23a4f206124025bbb
Files:
1
packages/vte/vte_0.11.15.bb
packages/vte/vte_0.16.8.bb
packages/opentom
packages/xoscope
packages/opentom/ttimgextract.bb
packages/xoscope/xoscope_1.12.bb
packages/tasks/task-openmoko-feed.bb
Diffs:

#
# mt diff -r1af7742e17a7556d323fd4873c9ad1dc74655d34 -r4c108250ef95743112aee6c23a4f206124025bbb
#
# 
# 
# rename "packages/vte/vte_0.11.15.bb"
#     to "packages/vte/vte_0.16.8.bb"
# 
# add_dir "packages/opentom"
# 
# add_dir "packages/xoscope"
# 
# add_file "packages/opentom/ttimgextract.bb"
#  content [b372d95236cced5b56014edd4edb6a33f3da8a87]
# 
# add_file "packages/xoscope/xoscope_1.12.bb"
#  content [b2df507e8f99f8e467fe59524ffb800381cbda0f]
# 
============================================================
--- packages/opentom/ttimgextract.bb	b372d95236cced5b56014edd4edb6a33f3da8a87
+++ packages/opentom/ttimgextract.bb	b372d95236cced5b56014edd4edb6a33f3da8a87
@@ -0,0 +1,17 @@
+LICENSE = "None"
+DESCRIPTION = "A tool to extract the ttsystem images into their components." 
+
+SRC_URI = "svn://svn.opentom.org/opentom/trunk/;module=ttimgextract;proto=http"
+
+PV = "0.0+svn${SRCDATE}"
+S = "${WORKDIR}/${PN}"
+
+
+do_compile() {
+        ${CC} -o ttimgextract ttimgextract.c -DPATH_MAX=4096 ${TARGET_CC_ARCH}
+}
+
+do_install () {
+        install -d ${D}${bindir}
+        install -m 0755 ${S}/ttimgextract ${D}${bindir}/
+}
============================================================
--- packages/xoscope/xoscope_1.12.bb	b2df507e8f99f8e467fe59524ffb800381cbda0f
+++ packages/xoscope/xoscope_1.12.bb	b2df507e8f99f8e467fe59524ffb800381cbda0f
@@ -0,0 +1,13 @@
+DESCRIPTION = "Scope for your soundcard of COMEDI device"
+LICENSE = "GPLv2"
+
+DEPENDS = "gtk+-1.2 esound"
+
+SRC_URI = "http://prdownloads.sourceforge.net/xoscope/xoscope-${PV}.tgz"
+
+inherit autotools
+
+PARALLEL_MAKE = ""
+
+FILES_${PN}-dbg += "${libexecdir}/xoscope/.debug"
+


#
# mt diff -r24c7203b69a8d8da8f6cacbf0180f1fc57efa6c1 -r4c108250ef95743112aee6c23a4f206124025bbb
#
# 
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [302554914224dc246bcf0ec4d52b65b71291be19]
#    to [556642537d4bd3763b3a455f2bd4eb77bd92deca]
# 
============================================================
--- packages/tasks/task-openmoko-feed.bb	302554914224dc246bcf0ec4d52b65b71291be19
+++ packages/tasks/task-openmoko-feed.bb	556642537d4bd3763b3a455f2bd4eb77bd92deca
@@ -1,7 +1,7 @@ LICENSE = "MIT"
 DESCRIPTION = "OpenMoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
 
 inherit task
 
@@ -11,4 +11,5 @@ RDEPENDS_task-openmoko-feed = "\
   python \
   python-pygtk \
   python-pyserial \
+  timezones \
 "