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

[mickeyl commit]

merge of 'e18d2142fbd0a6fe86b6cb56dab8ba29dcfa56d6'
     and 'fc9ea88e83e327d8456fd79595597c637950b850'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 7d4aa9ef3280a1abb86155bba86ac35f9399897d
ViewMTN: http://monotone.openembedded.org/revision/info/7d4aa9ef3280a1abb86155bba86ac35f9399897d
Files:
1
packages/dtnrg/dtn_2.5.0.bb
packages/screen/screen_4.0.2.bb
packages/images/openmoko-python-devel-image.bb
packages/tasks/task-openmoko-python-devel.bb
Diffs:

#
# mt diff -re18d2142fbd0a6fe86b6cb56dab8ba29dcfa56d6 -r7d4aa9ef3280a1abb86155bba86ac35f9399897d
#
# 
# 
# patch "packages/dtnrg/dtn_2.5.0.bb"
#  from [3234e08b19073c6fcc4c69cb16c48bec0ce78bdd]
#    to [987af483064b66222040dae87a47b35f9a675f6f]
# 
# patch "packages/screen/screen_4.0.2.bb"
#  from [76988964798c087b4ffa5d74a69d3a434763254c]
#    to [21d38aa1d5e0bd6ed228e4441f0855e5755ba3e8]
# 
============================================================
--- packages/dtnrg/dtn_2.5.0.bb	3234e08b19073c6fcc4c69cb16c48bec0ce78bdd
+++ packages/dtnrg/dtn_2.5.0.bb	987af483064b66222040dae87a47b35f9a675f6f
@@ -52,7 +52,9 @@ do_install_append() {
 	INCDIR=../.. LIBDIR=.. VERSION=${PV} python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir}
 }
 
-PACKAGES += "${PN}-python"
-FILES_${PN}-python = "${libdir}/${PYTHON_DIR}"
-RDEPENDS_${PN}-python = "python-core"
+PACKAGES += "python-dtn"
+DESCRIPTION_python-dtn = "Python bindings to the DTN API"
+PR_python-dtn = "ml1"
+FILES_python-dtn = "${libdir}/${PYTHON_DIR}"
+RDEPENDS_python-dtn = "python-core"
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug"
============================================================
--- packages/screen/screen_4.0.2.bb	76988964798c087b4ffa5d74a69d3a434763254c
+++ packages/screen/screen_4.0.2.bb	21d38aa1d5e0bd6ed228e4441f0855e5755ba3e8
@@ -1,13 +1,13 @@ DEPENDS = "ncurses"
 DESCRIPTION = "Screen is a full-screen window manager \
 that multiplexes a physical terminal between several \
 processes, typically interactive shells."
 LICENSE = "GPL"
 SECTION = "console/utils"
 DEPENDS = "ncurses"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
-           ${DEBIAN_MIRROR}/main/s/screen/screen_4.0.2-4.1.diff.gz;patch=1 \
+           ${DEBIAN_MIRROR}/main/s/screen/screen_4.0.2-4.1sarge1.diff.gz;patch=1 \
            file://configure.patch;patch=1"
 
 inherit autotools


#
# mt diff -rfc9ea88e83e327d8456fd79595597c637950b850 -r7d4aa9ef3280a1abb86155bba86ac35f9399897d
#
# 
# 
# add_file "packages/images/openmoko-python-devel-image.bb"
#  content [314c670f5711b4e925e3261db65ca753dbbd5a78]
# 
# add_file "packages/tasks/task-openmoko-python-devel.bb"
#  content [9e274c55cc6f029b3adec34e38bedeacbb8c2ca9]
# 
============================================================
--- packages/images/openmoko-python-devel-image.bb	314c670f5711b4e925e3261db65ca753dbbd5a78
+++ packages/images/openmoko-python-devel-image.bb	314c670f5711b4e925e3261db65ca753dbbd5a78
@@ -0,0 +1,6 @@
+require openmoko-image.bb
+
+IMAGE_INSTALL += "\
+  task-openmoko-python-devel \
+"
+
============================================================
--- packages/tasks/task-openmoko-python-devel.bb	9e274c55cc6f029b3adec34e38bedeacbb8c2ca9
+++ packages/tasks/task-openmoko-python-devel.bb	9e274c55cc6f029b3adec34e38bedeacbb8c2ca9
@@ -0,0 +1,11 @@
+DESCRIPTION = "OpenMoko: Python Development Tools"
+SECTION = "openmoko/devel"
+LICENSE = "MIT"
+PR = "r1"
+
+inherit task
+
+RDEPENDS_task-openmoko-python-devel = "\
+  python-efl \
+  python-pygtk \
+"