Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/11 15:36:37+01:00 local!hrw
added patch to get oz-compat working with qt/e 2.3.10

BKrev: 420cc36bA6cm2zvHBp84LaoKvlQpfw

diff --git a/packages/oz-compat/oz-compat/qt2310.patch b/packages/oz-compat/oz-compat/qt2310.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/oz-compat/oz-compat_0.5.bb b/packages/oz-compat/oz-compat_0.5.bb
index 04cd0da..fed22b9 100644 (file)
--- a/packages/oz-compat/oz-compat_0.5.bb
+++ b/packages/oz-compat/oz-compat_0.5.bb
@@ -6,18 +6,19 @@ PRIORITY = "optional"
 RDEPENDS = "opie-sh"
 MAINTAINER = "Tim Ansell <mithro AT mithis.net>"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 EXCLUDE_FROM_WORLD = "1"
 
 SRC_URI = "http://openzaurus.org/mirror/oz-compat_0.5.tar.gz \
-          file://hentges.patch;patch=1"
+          file://hentges.patch;patch=1 \
+          file://qt2310.patch;patch=1"
 
 inherit update-rc.d
 
 INITSCRIPT_NAME = "quickexec"
 INITSCRIPT_PARAMS = "defaults 10"
-        
+
 do_install() {
        install -d ${D}/opt/QtPalmtop/apps/Settings
        install -d ${D}/opt/QtPalmtop/bin/