[oe-commits] org.oe.dev packages/qt4/qt_packaging.inc: Next round of typo fixing and trying

freyther commit openembedded-commits at lists.openembedded.org
Wed Dec 26 12:18:28 UTC 2007


packages/qt4/qt_packaging.inc: Next round of typo fixing and trying
    -Don't install every library to libQtUiTools-dev :}
    -Try to put the .la and .prl into the -dev packages as well

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

#
# mt diff -refd90f8b1dfa5f6c6f3a39eb0269ede1f3bb768e -r48e0262a6905035030021cbc430652a220a1ffcb
#
# 
# 
# patch "packages/qt4/qt_packaging.inc"
#  from [0b0f264425c7f75c51769586c6d2bbb2d374c97b]
#    to [89c28b0b3cdc3549644afeb433d67b1bfb04f2f6]
# 
============================================================
--- packages/qt4/qt_packaging.inc	0b0f264425c7f75c51769586c6d2bbb2d374c97b
+++ packages/qt4/qt_packaging.inc	89c28b0b3cdc3549644afeb433d67b1bfb04f2f6
@@ -62,48 +62,48 @@ FILES_${QT_BASE_LIB}core4               
 
 
 FILES_${QT_BASE_LIB}core4                   = "${libdir}/lib${QT_LIBRARY_NAME}Core.so.*"
-FILES_${QT_BASE_LIB}core4-dev               = "${libdir}/lib${QT_LIBRARY_NAME}Core.so ${includedir}/${QT_DIR_NAME}/QtCore* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Core.pc"
+FILES_${QT_BASE_LIB}core4-dev               = "${libdir}/lib${QT_LIBRARY_NAME}Core.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtCore* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Core.pc"
 FILES_${QT_BASE_LIB}core4-dbg               = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Core*"
 FILES_${QT_BASE_LIB}gui4                    = "${libdir}/lib${QT_LIBRARY_NAME}Gui.so.*"
-FILES_${QT_BASE_LIB}gui4-dev                = "${libdir}/lib${QT_LIBRARY_NAME}Gui.so ${includedir}/${QT_DIR_NAME}/QtGui* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Gui.pc"
+FILES_${QT_BASE_LIB}gui4-dev                = "${libdir}/lib${QT_LIBRARY_NAME}Gui.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtGui* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Gui.pc"
 FILES_${QT_BASE_LIB}gui4-dbg                = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Gui*"
 FILES_${QT_BASE_LIB}network4                = "${libdir}/lib${QT_LIBRARY_NAME}Network.so.*"
-FILES_${QT_BASE_LIB}network4-dev            = "${libdir}/lib${QT_LIBRARY_NAME}Network.so ${includedir}/${QT_DIR_NAME}/QtNetwork* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Network.pc"
+FILES_${QT_BASE_LIB}network4-dev            = "${libdir}/lib${QT_LIBRARY_NAME}Network.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtNetwork* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Network.pc"
 FILES_${QT_BASE_LIB}network4-dbg            = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Network*"
 FILES_${QT_BASE_LIB}sql4                    = "${libdir}/lib${QT_LIBRARY_NAME}Sql.so.*"
-FILES_${QT_BASE_LIB}sql4-dev                = "${libdir}/lib${QT_LIBRARY_NAME}Sql.so ${includedir}/${QT_DIR_NAME}/QtSql* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Sql.pc"
+FILES_${QT_BASE_LIB}sql4-dev                = "${libdir}/lib${QT_LIBRARY_NAME}Sql.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtSql* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Sql.pc"
 FILES_${QT_BASE_LIB}sql4-dbg                = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Sql*"
 FILES_${QT_BASE_LIB}svg4                    = "${libdir}/lib${QT_LIBRARY_NAME}Svg.so.*"
-FILES_${QT_BASE_LIB}svg4-dev                = "${libdir}/lib${QT_LIBRARY_NAME}Svg.so ${includedir}/${QT_DIR_NAME}/QtSvg* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Svg.pc"
+FILES_${QT_BASE_LIB}svg4-dev                = "${libdir}/lib${QT_LIBRARY_NAME}Svg.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtSvg* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Svg.pc"
 FILES_${QT_BASE_LIB}svg4-dbg                = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Svg*"
 FILES_${QT_BASE_LIB}test4                   = "${libdir}/lib${QT_LIBRARY_NAME}Test.so.*"
-FILES_${QT_BASE_LIB}test4-dev               = "${libdir}/lib${QT_LIBRARY_NAME}Test.so ${includedir}/${QT_DIR_NAME}/QtTest* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Test.pc"
+FILES_${QT_BASE_LIB}test4-dev               = "${libdir}/lib${QT_LIBRARY_NAME}Test.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtTest* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Test.pc"
 FILES_${QT_BASE_LIB}test4-dbg               = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Test*"
 FILES_${QT_BASE_LIB}xml4                    = "${libdir}/lib${QT_LIBRARY_NAME}Xml.so.*"
-FILES_${QT_BASE_LIB}xml4-dev                = "${libdir}/lib${QT_LIBRARY_NAME}Xml.so ${includedir}/${QT_DIR_NAME}/QtXml* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Xml.pc"
+FILES_${QT_BASE_LIB}xml4-dev                = "${libdir}/lib${QT_LIBRARY_NAME}Xml.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtXml* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Xml.pc"
 FILES_${QT_BASE_LIB}xml4-dbg                = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Xml*"
 FILES_${QT_BASE_LIB}designer4               = "${libdir}/lib${QT_LIBRARY_NAME}Designer.so.*"
-FILES_${QT_BASE_LIB}designer4-dev           = "${libdir}/lib${QT_LIBRARY_NAME}Designer.so ${includedir}/${QT_DIR_NAME}/QtDesigner* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Designer.pc"
+FILES_${QT_BASE_LIB}designer4-dev           = "${libdir}/lib${QT_LIBRARY_NAME}Designer.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtDesigner* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Designer.pc"
 FILES_${QT_BASE_LIB}designer4-dbg           = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Designer*"
 FILES_${QT_BASE_LIB}designercomponents4     = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so.*"
-FILES_${QT_BASE_LIB}designercomponents4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so"
+FILES_${QT_BASE_LIB}designercomponents4-dev = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.{la,prl,so}"
 FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DesignerComponents*"
 FILES_${QT_BASE_LIB}3support4               = "${libdir}/lib${QT_LIBRARY_NAME}3Support.so.*"
-FILES_${QT_BASE_LIB}3support4-dev           = "${libdir}/lib${QT_LIBRARY_NAME}3Support.so ${includedir}/${QT_DIR_NAME}/Qt3Support*  ${libdir}/pkgconfig/${QT_LIBRARY_NAME}3Support.pc"
+FILES_${QT_BASE_LIB}3support4-dev           = "${libdir}/lib${QT_LIBRARY_NAME}3Support.{la,prl,so} ${includedir}/${QT_DIR_NAME}/Qt3Support*  ${libdir}/pkgconfig/${QT_LIBRARY_NAME}3Support.pc"
 FILES_${QT_BASE_LIB}3support4-dbg           = "${libdir}/.debug/lib${QT_LIBRARY_NAME}3Support*"
 FILES_${QT_BASE_LIB}assistantclient4        = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so.*"
-FILES_${QT_BASE_LIB}assistantclient4-dev    = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so ${includedir}/${QT_DIR_NAME}/QtAssistant*  ${libdir}/pkgconfig/${QT_LIBRARY_NAME}AssistantClient.pc"
+FILES_${QT_BASE_LIB}assistantclient4-dev    = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtAssistant*  ${libdir}/pkgconfig/${QT_LIBRARY_NAME}AssistantClient.pc"
 FILES_${QT_BASE_LIB}assistantclient4-dbg    = "${libdir}/.debug/lib${QT_LIBRARY_NAME}AssistantClient*"
 FILES_${QT_BASE_LIB}script4                 = "${libdir}/lib${QT_LIBRARY_NAME}Script.so.*"
-FILES_${QT_BASE_LIB}script4-dev             = "${libdir}/lib${QT_LIBRARY_NAME}Script.so ${includedir}/${QT_DIR_NAME}/QtScript*  ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Script.pc"
+FILES_${QT_BASE_LIB}script4-dev             = "${libdir}/lib${QT_LIBRARY_NAME}Script.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtScript*  ${libdir}/pkgconfig/${QT_LIBRARY_NAME}Script.pc"
 FILES_${QT_BASE_LIB}script4-dbg             = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Script*"
 FILES_${QT_BASE_LIB}dbus4                   = "${libdir}/lib${QT_LIBRARY_NAME}DBus.so.*"
-FILES_${QT_BASE_LIB}dbus4-dev               = "${libdir}/lib${QT_LIBRARY_NAME}DBus.sp ${includedir}/${QT_DIR_NAME}/QtDBus*  ${libdir}/pkgconfig/${QT_LIBRARY_NAME}DBus.pc"
+FILES_${QT_BASE_LIB}dbus4-dev               = "${libdir}/lib${QT_LIBRARY_NAME}DBus.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtDBus*  ${libdir}/pkgconfig/${QT_LIBRARY_NAME}DBus.pc"
 FILES_${QT_BASE_LIB}dbus4-dbg               = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DBus*"
 FILES_${QT_BASE_LIB}opengl4                 = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so.*"
-FILES_${QT_BASE_LIB}opengl4-dev             = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so ${includedir}/${QT_DIR_NAME}/QtOpenGL* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}OpenGL.pc"
+FILES_${QT_BASE_LIB}opengl4-dev             = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.{la,prl,so} ${includedir}/${QT_DIR_NAME}/QtOpenGL* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}OpenGL.pc"
 FILES_${QT_BASE_LIB}opengl4-dbg             = "${libdir}/.debug/lib${QT_LIBRARY_NAME}OpenGL*"
-FILES_${QT_BASE_LIB}uitools4-dev            = "${libdir}/lib${QT_LIBRARY_NAME}* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}UiTools.pc"
+FILES_${QT_BASE_LIB}uitools4-dev            = "${libdir}/lib${QT_LIBRARY_NAME}UiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}UiTools.pc"
 
 
 FILES_${QT_BASE_NAME}-plugins-accessible   = "${libdir}/${QT_DIR_NAME}/plugins/accessible/*.so"






More information about the Openembedded-commits mailing list