From: Holger Freyther <zecke@selfish.org>
Date: Tue, 23 Oct 2007 14:27:39 +0000 (+0000)
Subject: packages/webkit: Change the package names of WebKit/Qtopia and force upgrade.
X-Git-Tag: Release-2010-05/1~8454^2~160^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36cdf38f87512a1358e15245cf5eeaa9cdcb044b;p=openembedded.git

packages/webkit: Change the package names of WebKit/Qtopia and force upgrade.
---

diff --git a/packages/webkit/webkit-qt.inc b/packages/webkit/webkit-qt.inc
index bba8d83cce..cb9c1f7943 100644
--- a/packages/webkit/webkit-qt.inc
+++ b/packages/webkit/webkit-qt.inc
@@ -1,9 +1,9 @@
 WEBKIT_PORT = "qt"
 WEBKIT_EXTRA_OPTIONS = ""
-PACKAGES =+ "webkit-qtlauncher-dbg webkit-qtlauncher"
+PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"
 
-FILES_webkit-qtlauncher = "${bindir}/QtLauncher"
-FILES_webkit-qtlauncher-dbg = "${bindir}/.debug/*"
+FILES_${PN}launcher = "${bindir}/QtLauncher"
+FILES_${PN}launcher-dbg = "${bindir}/.debug/*"
 
 require webkit.inc
 
diff --git a/packages/webkit/webkit-qt_svn.bb b/packages/webkit/webkit-qt_svn.bb
index 75b36a4a58..e681e7a41b 100644
--- a/packages/webkit/webkit-qt_svn.bb
+++ b/packages/webkit/webkit-qt_svn.bb
@@ -1,2 +1,4 @@
 require webkit-qt.inc
 inherit qt4x11
+
+PR = "r1"
diff --git a/packages/webkit/webkit-qtopia_svn.bb b/packages/webkit/webkit-qtopia_svn.bb
index cfd96c8956..706f0f1cd1 100644
--- a/packages/webkit/webkit-qtopia_svn.bb
+++ b/packages/webkit/webkit-qtopia_svn.bb
@@ -1,3 +1,4 @@
-BROKEN="1"
 require webkit-qt.inc
 inherit qtopia4core
+
+PR = "r1"