[oe-commits] org.oe.dev packages/qt4/qt_packaging.inc: Do not remove everything from the bindir, fix the glob

[freyther commit]

packages/qt4/qt_packaging.inc: Do not remove everything from the bindir, fix the glob
    -${PN}-doc already has the html documentation, no need for -documentation package
    -Package the demos and exmaples
    -.debug and translations are missing

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 909c536d732a709ac1bbe82a546de7dade5fdf07
ViewMTN: http://monotone.openembedded.org/revision/info/909c536d732a709ac1bbe82a546de7dade5fdf07
Files:
1
packages/qt4/qt_packaging.inc
Diffs:

#
# mt diff -r4ac1d57c5a88fdfa51f540a20bd80921b35f23d3 -r909c536d732a709ac1bbe82a546de7dade5fdf07
#
# 
# 
# patch "packages/qt4/qt_packaging.inc"
#  from [c59409473e86d03476a6fd8111444f48cde07d16]
#    to [4724721053882c0a600abf701a2210c4d55f880e]
# 
============================================================
--- packages/qt4/qt_packaging.inc	c59409473e86d03476a6fd8111444f48cde07d16
+++ packages/qt4/qt_packaging.inc	4724721053882c0a600abf701a2210c4d55f880e
@@ -31,8 +31,7 @@ DEV_PACKAGES += "${QT_BASE_LIB}core4-dev
              ${QT_BASE_LIB}script4-dev \
              ${QT_BASE_LIB}dbus4-dev \
              ${QT_BASE_LIB}opengl4-dev \
-             ${QT_BASE_LIB}uitools4-dev \
-             ${QT_BASE_LIB}-documentation"
+             ${QT_BASE_LIB}uitools4-dev"
 
 DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg \
              ${QT_BASE_LIB}gui4-dbg \
@@ -128,14 +127,11 @@ FILES_${QT_BASE_NAME}-common            
 FILES_${QT_BASE_NAME}-dbus                 = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
 
 FILES_${QT_BASE_NAME}-common               = "${bindir}/qtconfig"
-FILES_${QT_BASE_NAME}-examples             = "${bindir}/${QT_BASE_NAME}-examples/*"
-FILES_${QT_BASE_NAME}-demos                = "${bindir}/qtdemo ${bindir}/${QT_BASE_NAME}-demos/*"
+FILES_${QT_BASE_NAME}-examples             = "${bindir}/${QT_BASE_NAME}/examples/*"
+FILES_${QT_BASE_NAME}-demos                = "${bindir}/qtdemo ${bindir}/${QT_BASE_NAME}/demos/*"
 
 FILES_${QT_BASE_NAME}-fonts                = "${libdir}/fonts"
 
-
-FILES_${QT_BASE_NAME}-documentation = "${docdir}/${QT_DIR_NAME}/html/*"
-
 python populate_packages_prepend() {
 	translationdir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d)
 	do_split_packages(d, translationdir, '^qt_(.*)\.qm$', '${QT_DIR_NAME}-translation-%s', '{PN} translation for %s', extra_depends='' )
@@ -146,7 +142,7 @@ do_install() {
     oe_runmake install INSTALL_ROOT=${D}
 
     # These are host binaries, we should only use them in staging
-    rm -rf ${D}/${bindir}
+    rm -rf ${D}/${bindir}/qmake
     rm -rf ${D}/${datadir}/${QT_DIR_NAME}/mkspecs
 
     install -d ${D}/${libdir}/fonts