[oe-commits] Simon Busch : qt4: fix OTHER_PACKAGES list and bump PR

[git version control]

Module: openembedded.git
Branch: master
Commit: 2d67689202a2d38e3ebf2ae16dbbd75844bbe31a
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=2d67689202a2d38e3ebf2ae16dbbd75844bbe31a

Author: Simon Busch <morphis at gravedo.de>
Date:   Thu May 19 23:48:49 2011 +0200

qt4: fix OTHER_PACKAGES list and bump PR

Commit 4adf97be8c5b5f71ad92095a19968af534baa9e2 added a *-dbg package to the
OTHER_PACKAGES list which can lead to packaging errors. This removes the package from
OTHER_PACKAGES and bump PR for qt4-embedded and qt4-x11-free.

Signed-off-by: Simon Busch <morphis at gravedo.de>

---

 recipes/qt4/qt4-embedded.inc |    2 +-
 recipes/qt4/qt4-x11-free.inc |    2 +-
 recipes/qt4/qt4.inc          |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index 98bc56c..74c91cd 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r31"
+INC_PR = "r32"
 
 QT_BASE_NAME ?= "qt4-embedded"
 QT_BASE_LIB  ?= "libqt-embedded"
diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
index 5abff64..2af04eb 100644
--- a/recipes/qt4/qt4-x11-free.inc
+++ b/recipes/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL QPL"
 DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
 
-INC_PR = "r26"
+INC_PR = "r27"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
            file://0001-cross-compile.patch \
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index 9d06866..b37e7ff 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -92,8 +92,7 @@ OTHER_PACKAGES = "\
              ${QT_BASE_NAME}-qmlviewer \
              ${QT_BASE_NAME}-xmlpatterns \
              ${QT_BASE_NAME}-qt3to4 \
-             ${QT_BASE_NAME}-qml-plugins \
-             ${QT_BASE_NAME}-qml-plugins-dbg"
+             ${QT_BASE_NAME}-qml-plugins"
 
 PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}"
 PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-*"