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

[mickeyl commit]

merge of 'dd9ddcf7f0679e8a8bd188c7a05defba089c118d'
     and 'fc5266affca09a60f8b05cce834b4c517e7e4003'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: f3ce42d6e8e15e51ce97fef93a3948da8fedc3ad
ViewMTN: http://monotone.openembedded.org/revision/info/f3ce42d6e8e15e51ce97fef93a3948da8fedc3ad
Files:
1
classes/distutils-base.bbclass
packages/images/moko-underground-image.bb
packages/python/python-dbus_0.82.4.bb
packages/nonworking/apache
packages/nonworking/apache/apache
packages/nonworking/apache/apache/apache-2.0.48
packages/nonworking/apache/apache/apache-2.0.48/configure.patch
packages/nonworking/apache/apache/apache-2.0.48/pcre-configure.patch
packages/nonworking/apache/apache/apache_2.0.48.bb
packages/nonworking/apache/apache/files
packages/nonworking/apache/apache/files/httpd.conf
packages/nonworking/apache/apache/files/init
packages/nonworking/apache/apache-2.0.47
packages/nonworking/apache/apache-2.0.47/configure.patch
packages/nonworking/apache/apache-2.0.47/init
packages/nonworking/apache/apache-2.0.47/pcre-configure.patch
packages/nonworking/apache/apache_2.0.47.bb
packages/nonworking/kgrok
packages/nonworking/kgrok/files
packages/nonworking/kgrok/files/mediabutton.patch
packages/nonworking/kgrok/files/parser_yacc.cpp
packages/nonworking/kgrok/files/parser_yacc.h
packages/nonworking/kgrok/kgrok_1.5.bb
packages/nonworking/lftp
packages/nonworking/lftp/files
packages/nonworking/lftp/files/pty.patch
packages/nonworking/lftp/lftp_3.2.1.bb
packages/nonworking/libmikey
packages/nonworking/libmikey/libmikey0_0.3.2.bb
packages/nonworking/libmikey/libmikey_0.1a.bb
packages/nonworking/libmnetutil
packages/nonworking/libmnetutil/libmnetutil0_0.2.2.bb
packages/nonworking/libmsip
packages/nonworking/libmsip/libmsip0_0.2.2.bb
packages/nonworking/lzma
packages/nonworking/lzma/lzma_0.01.bb
packages/nonworking/minisip
packages/nonworking/minisip/minisip_0.6.2.bb
Diffs:

#
# mt diff -rdd9ddcf7f0679e8a8bd188c7a05defba089c118d -rf3ce42d6e8e15e51ce97fef93a3948da8fedc3ad
#
# 
# 
# patch "classes/distutils-base.bbclass"
#  from [0a204cd849e070a15c2f9ff46443eda8e28915d0]
#    to [94522dc614b8c3295309161e3fbdff50dff557a7]
# 
# patch "packages/images/moko-underground-image.bb"
#  from [1bf3dccf2e43b6f0f8f36ad6c5e4d6115b40e826]
#    to [e3d712c4f1771ae91a8a413966252fb17a92eee9]
# 
# patch "packages/python/python-dbus_0.82.4.bb"
#  from [0b72f74fcfa2cc0079dab2bfdcb2fac470905f05]
#    to [aff2c48f361a7ace67a1057330cf36a822c07811]
# 
============================================================
--- classes/distutils-base.bbclass	0a204cd849e070a15c2f9ff46443eda8e28915d0
+++ classes/distutils-base.bbclass	94522dc614b8c3295309161e3fbdff50dff557a7
@@ -11,8 +11,17 @@ PYTHON_DIR = "${@python_dir(d)}"
 	raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
 
 PYTHON_DIR = "${@python_dir(d)}"
+
+PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc ${PN}"
+
 FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
-FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/.debug \
-                   ${libdir}/${PYTHON_DIR}/site-packages/*/.debug \
-                   ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug"
 
+FILES_${PN}-dev += "\
+  ${libdir}/pkgconfig \
+  ${libdir}/${PYTHON_DIR}/site-packages/*.la \
+"
+FILES_${PN}-dbg = "\
+  ${libdir}/${PYTHON_DIR}/site-packages/.debug \
+  ${libdir}/${PYTHON_DIR}/site-packages/*/.debug \
+  ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug \
+"
============================================================
--- packages/images/moko-underground-image.bb	1bf3dccf2e43b6f0f8f36ad6c5e4d6115b40e826
+++ packages/images/moko-underground-image.bb	e3d712c4f1771ae91a8a413966252fb17a92eee9
@@ -24,7 +24,11 @@ IMAGE_INSTALL = "\
   xhost \
   xset \
   xrandr \
-  "
+  \
+  gsm0710muxd \
+  pyneod \
+  pyneog \
+"
 
 DEPENDS = "\
   ${MACHINE_TASK_PROVIDER} \
============================================================
--- packages/python/python-dbus_0.82.4.bb	0b72f74fcfa2cc0079dab2bfdcb2fac470905f05
+++ packages/python/python-dbus_0.82.4.bb	aff2c48f361a7ace67a1057330cf36a822c07811
@@ -1,10 +1,10 @@ RDEPENDS = "python-threading python-io p
 DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication"
 SECTION = "devel/python"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "MIT"
 DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
 RDEPENDS = "python-threading python-io python-stringold python-logging"
-PR = "ml1"
+PR = "ml2"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
 S = "${WORKDIR}/dbus-python-${PV}"
@@ -18,3 +18,4 @@ do_stage() {
 	autotools_stage_all
 }
 
+FILES_${PN}-dev += "${libdir}/pkgconfig 


#
# mt diff -rfc5266affca09a60f8b05cce834b4c517e7e4003 -rf3ce42d6e8e15e51ce97fef93a3948da8fedc3ad
#
# 
# 
# delete "packages/nonworking/apache"
# 
# delete "packages/nonworking/apache/apache"
# 
# delete "packages/nonworking/apache/apache/apache-2.0.48"
# 
# delete "packages/nonworking/apache/apache/apache-2.0.48/configure.patch"
# 
# delete "packages/nonworking/apache/apache/apache-2.0.48/pcre-configure.patch"
# 
# delete "packages/nonworking/apache/apache/apache_2.0.48.bb"
# 
# delete "packages/nonworking/apache/apache/files"
# 
# delete "packages/nonworking/apache/apache/files/httpd.conf"
# 
# delete "packages/nonworking/apache/apache/files/init"
# 
# delete "packages/nonworking/apache/apache-2.0.47"
# 
# delete "packages/nonworking/apache/apache-2.0.47/configure.patch"
# 
# delete "packages/nonworking/apache/apache-2.0.47/init"
# 
# delete "packages/nonworking/apache/apache-2.0.47/pcre-configure.patch"
# 
# delete "packages/nonworking/apache/apache_2.0.47.bb"
# 
# delete "packages/nonworking/kgrok"
# 
# delete "packages/nonworking/kgrok/files"
# 
# delete "packages/nonworking/kgrok/files/mediabutton.patch"
# 
# delete "packages/nonworking/kgrok/files/parser_yacc.cpp"
# 
# delete "packages/nonworking/kgrok/files/parser_yacc.h"
# 
# delete "packages/nonworking/kgrok/kgrok_1.5.bb"
# 
# delete "packages/nonworking/lftp"
# 
# delete "packages/nonworking/lftp/files"
# 
# delete "packages/nonworking/lftp/files/pty.patch"
# 
# delete "packages/nonworking/lftp/lftp_3.2.1.bb"
# 
# delete "packages/nonworking/libmikey"
# 
# delete "packages/nonworking/libmikey/libmikey0_0.3.2.bb"
# 
# delete "packages/nonworking/libmikey/libmikey_0.1a.bb"
# 
# delete "packages/nonworking/libmnetutil"
# 
# delete "packages/nonworking/libmnetutil/libmnetutil0_0.2.2.bb"
# 
# delete "packages/nonworking/libmsip"
# 
# delete "packages/nonworking/libmsip/libmsip0_0.2.2.bb"
# 
# delete "packages/nonworking/lzma"
# 
# delete "packages/nonworking/lzma/lzma_0.01.bb"
# 
# delete "packages/nonworking/minisip"
# 
# delete "packages/nonworking/minisip/minisip_0.6.2.bb"
#