[oe-commits] org.oe.dev qmake_base: Fix packages that refer to qmake-base instead of qmake_base. OE needs a class files naming convention - choose hyphens or underscores, not both.

[rwhitby commit]

qmake_base: Fix packages that refer to qmake-base instead of qmake_base.  OE needs a class files naming convention - choose hyphens or underscores, not both.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 04064a090214c47ea721e65e4a64aebe688dec21
ViewMTN: http://monotone.openembedded.org/revision/info/04064a090214c47ea721e65e4a64aebe688dec21
Files:
1
packages/opie-reader/uqtreader_cvs.bb
packages/qt/qt-x11-free-common.inc
packages/qt/qt4-x11-free_4.3.0.bb
packages/snes9x/snes9x-sdl-qpe_1.39.bb
Diffs:

#
# mt diff -r36bb11ae5d36a6ad5a636ed1f3161763b847741a -r04064a090214c47ea721e65e4a64aebe688dec21
#
# 
# 
# patch "packages/opie-reader/uqtreader_cvs.bb"
#  from [8403c9a2b21f0d9505daa16ba0afa062cdd3e607]
#    to [61873b6271c2f1decde3ab439dda692a2aa98a36]
# 
# patch "packages/qt/qt-x11-free-common.inc"
#  from [56b0bf6597459e0c2b3d4d8e4840efe5943938d0]
#    to [6dcb32e86f0ad84e9cccbc5e9c36107259b8a388]
# 
# patch "packages/qt/qt4-x11-free_4.3.0.bb"
#  from [81b2d4f19a5e7a05beed1318a962589e6c8beac9]
#    to [2a8bfa1b9cc3aa059dd561726a7bbdfc8bcc4e79]
# 
# patch "packages/snes9x/snes9x-sdl-qpe_1.39.bb"
#  from [be78c34b9de5652bcd1b72e4182b39b3747ec019]
#    to [e72d7742c9c38f87dd93a9ad9a55eb8e1a11c5b3]
# 
============================================================
--- packages/opie-reader/uqtreader_cvs.bb	8403c9a2b21f0d9505daa16ba0afa062cdd3e607
+++ packages/opie-reader/uqtreader_cvs.bb	61873b6271c2f1decde3ab439dda692a2aa98a36
@@ -17,7 +17,7 @@ export OPIEDIR="${S}/opiedir"
 
 export OPIEDIR="${S}/opiedir"
 
-inherit qmake-base qt4x11
+inherit qmake_base qt4x11
 
 do_configure() {
 	${OE_QMAKE_QMAKE} -recursive opie-reader.pro UQT_DATADIR="${datadir}/${PN}" UQT_LIBDIR="${libdir}/${PN}"
============================================================
--- packages/qt/qt-x11-free-common.inc	56b0bf6597459e0c2b3d4d8e4840efe5943938d0
+++ packages/qt/qt-x11-free-common.inc	6dcb32e86f0ad84e9cccbc5e9c36107259b8a388
@@ -6,7 +6,7 @@ S = "${WORKDIR}/qt-x11-free-${PV}"
 
 S = "${WORKDIR}/qt-x11-free-${PV}"
 
-inherit qmake-base qt3x11
+inherit qmake_base qt3x11
 
 export QTDIR = "${S}"
 STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
============================================================
--- packages/qt/qt4-x11-free_4.3.0.bb	81b2d4f19a5e7a05beed1318a962589e6c8beac9
+++ packages/qt/qt4-x11-free_4.3.0.bb	2a8bfa1b9cc3aa059dd561726a7bbdfc8bcc4e79
@@ -21,7 +21,7 @@ PARALLEL_MAKE = ""
 
 PARALLEL_MAKE = ""
 
-inherit qmake-base qt4x11
+inherit qmake_base qt4x11
 
 export QTDIR = "${S}"
 STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4"
============================================================
--- packages/snes9x/snes9x-sdl-qpe_1.39.bb	be78c34b9de5652bcd1b72e4182b39b3747ec019
+++ packages/snes9x/snes9x-sdl-qpe_1.39.bb	e72d7742c9c38f87dd93a9ad9a55eb8e1a11c5b3
@@ -11,7 +11,7 @@ FILESPATH = "${FILE_DIRNAME}/${PN}-${PV}
 
 FILESPATH = "${FILE_DIRNAME}/${PN}-${PV}:${FILE_DIRNAME}/snes9x-sdl-${PV}:${FILE_DIRNAME}/snes9x-sdl:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
-inherit qmake-base
+inherit qmake_base
 
 QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'