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

[oe commit]

merge of 'b52c7469e4fbb93f35ed1de1f3e5225ee9d27d9c'
     and 'd0de4044d1bae905c2f30dd83d3f5bab85b3f52d'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 52c62dd05756b14c442b2b031264855e264ee6fd
ViewMTN: http://monotone.openembedded.org/revision/info/52c62dd05756b14c442b2b031264855e264ee6fd
Files:
1
packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch
packages/libjson
packages/libjson/libjson_0.6.bb
packages/images/openmoko-python-devel-image.bb
packages/tasks/task-python-efl-examples.bb
Diffs:

#
# mt diff -rb52c7469e4fbb93f35ed1de1f3e5225ee9d27d9c -r52c62dd05756b14c442b2b031264855e264ee6fd
#
# 
# 
# patch "packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch"
#  from [13aa70d3fb4af7f44dd20be52a40d70acc6420a6]
#    to [e498b7488bf218d5d35c391cc4943458cff40181]
# 
============================================================
--- packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch	13aa70d3fb4af7f44dd20be52a40d70acc6420a6
+++ packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch	e498b7488bf218d5d35c391cc4943458cff40181
@@ -86,12 +86,3 @@ Index: ipkg-utils/ipkg-make-index
  if opt_s:
       sys.exit(0)
  
-@@ -154,7 +177,7 @@ if packages_filename:
-      os.rename(tmp_packages_filename, packages_filename)
-      os.rename(tmp_gzip_filename, gzip_filename)
- 
--if verbose:	
-+if verbose:
-      sys.stderr.write("Generate Packages.filelist file\n")
- files = {}
- names = packages.packages.keys()


#
# mt diff -rd0de4044d1bae905c2f30dd83d3f5bab85b3f52d -r52c62dd05756b14c442b2b031264855e264ee6fd
#
# 
# 
# add_dir "packages/libjson"
# 
# add_file "packages/libjson/libjson_0.6.bb"
#  content [57349c69fb7f4206bcae0906624bdedfd3f6a5b8]
# 
# patch "packages/images/openmoko-python-devel-image.bb"
#  from [314c670f5711b4e925e3261db65ca753dbbd5a78]
#    to [1eeadbbc4b1eaaea6a23762c1a47e6797b3de20b]
# 
# patch "packages/tasks/task-python-efl-examples.bb"
#  from [bf69dc5858a5a32c723a3146a32c4d96419db9ab]
#    to [c735dfada39bf25a56a17bd3b671cb79ea1e9ecf]
# 
============================================================
--- packages/libjson/libjson_0.6.bb	57349c69fb7f4206bcae0906624bdedfd3f6a5b8
+++ packages/libjson/libjson_0.6.bb	57349c69fb7f4206bcae0906624bdedfd3f6a5b8
@@ -0,0 +1,15 @@
+DESCRIPTION = "A library for parsing and creating JSON files"
+HOMEPAGE = "http://oss.metaparadigm.com/json-c/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "BSD"
+PR = "r0"
+
+SRC_URI = "http://oss.metaparadigm.com/json-c/json-c-${PV}.tar.gz"
+S = "${WORKDIR}/json-c-${PV}"
+
+inherit autotools 
+
+do_stage() {
+	autotools_stage_all
+}
============================================================
--- packages/images/openmoko-python-devel-image.bb	314c670f5711b4e925e3261db65ca753dbbd5a78
+++ packages/images/openmoko-python-devel-image.bb	1eeadbbc4b1eaaea6a23762c1a47e6797b3de20b
@@ -1,6 +1,7 @@ IMAGE_INSTALL += "\
 require openmoko-image.bb
 
 IMAGE_INSTALL += "\
   task-openmoko-python-devel \
+  task-python-efl-examples \
+  edje-viewer \
 "
-
============================================================
--- packages/tasks/task-python-efl-examples.bb	bf69dc5858a5a32c723a3146a32c4d96419db9ab
+++ packages/tasks/task-python-efl-examples.bb	c735dfada39bf25a56a17bd3b671cb79ea1e9ecf
@@ -1,10 +1,14 @@ RDEPENDS = "\
 DESCRIPTION = "Python Examples for the Enlightenment Foundation Libraries"
 LICENSE = "MIT"
 SECTION = "devel/python"
 RDEPENDS = "\
-  python-efl python-ecore-examples python-emotion-examples python-edje-examples python-epsilon-examples \
+  task-python-efl \
+  python-ecore-examples \
+  python-emotion-examples \
+  python-edje-examples \
+  python-epsilon-examples \
   python-math python-textutils \
 "
-PR = "ml2"
+PR = "ml3"
 
 ALLOW_EMPTY = "1"