[oe-commits] org.oe.dev merge of '10c20f13828f71806f4d990010db22c15e357aee'

[Laibsch commit]

merge of '10c20f13828f71806f4d990010db22c15e357aee'
     and 'fcb60e20d2bda504bfd7af6775c815a4c014185e'

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 47a018f2318445ba4e71d5969574adb98e48f062
ViewMTN: http://monotone.openembedded.org/revision/info/47a018f2318445ba4e71d5969574adb98e48f062
Files:
1
packages/jikes/jikes-initial.bb
packages/dtnrg/dtn_2.5.0.bb
Diffs:

#
# mt diff -r10c20f13828f71806f4d990010db22c15e357aee -r47a018f2318445ba4e71d5969574adb98e48f062
#
# 
# 
# patch "packages/jikes/jikes-initial.bb"
#  from [ccc5500cd108638a643a49a0af8fb6fb71ff6e8b]
#    to [acb7ab273c93fa5264bb5d431ef94cf91cb08c8b]
# 
============================================================
--- packages/jikes/jikes-initial.bb	ccc5500cd108638a643a49a0af8fb6fb71ff6e8b
+++ packages/jikes/jikes-initial.bb	acb7ab273c93fa5264bb5d431ef94cf91cb08c8b
@@ -1,6 +1,6 @@ SUMMARY = "Initial Java 1.4-compatible (
 SUMMARY = "Initial Java 1.4-compatible (and not higher) compiler"
 
-DEPENDS = "virtual/javac-native classpath-initial"
+DEPENDS = "jikes-native classpath-initial"
 
 SRC_URI = ""
 


#
# mt diff -rfcb60e20d2bda504bfd7af6775c815a4c014185e -r47a018f2318445ba4e71d5969574adb98e48f062
#
# 
# 
# patch "packages/dtnrg/dtn_2.5.0.bb"
#  from [3c974b28f58a46ed1bd5f18206aee37d6d8779c6]
#    to [f21e25b094f74aa1f1eba88ec1f6bcec6045077c]
# 
============================================================
--- packages/dtnrg/dtn_2.5.0.bb	3c974b28f58a46ed1bd5f18206aee37d6d8779c6
+++ packages/dtnrg/dtn_2.5.0.bb	f21e25b094f74aa1f1eba88ec1f6bcec6045077c
@@ -1,10 +1,10 @@ SRC_URI = "http://www.dtnrg.org/docs/cod
 DESCRIPTION = "Delay Tolerant Networking Package"
 HOMEPAGE = "http://www.dtnrg.org/wiki"
 SECTION = "libs"
 DEPENDS = "db openssl python-native xerces-c"
 LICENSE = "Apache"
 SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz"
-PR = "r1"
+PR = "r2"
 
 inherit autotools
 
@@ -57,9 +57,11 @@ do_install_append() {
 	INCDIR=../.. LIBDIR=.. VERSION=${PV} python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir}
 }
 
+PACKAGES =+ "${PN}-lib"
+FILES_${PN}-lib = "${libdir}/*.so*"
 PACKAGES += "python-dtn"
 DESCRIPTION_python-dtn = "Python bindings to the DTN API"
 PR_python-dtn = "ml2"
 FILES_python-dtn = "${libdir}/${PYTHON_DIR}"
-RDEPENDS_python-dtn = "python-core dtn"
+RDEPENDS_python-dtn = "python-core dtn-lib"
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug"