dbh, ocamlc, qmake, uicmoc: don't use | or / to seperate multiply licensed files...

diff --git a/packages/dbh/dbh_1.0-18.bb b/packages/dbh/dbh_1.0-18.bb
index 65ea98c..a84bd95 100644 (file)
--- a/packages/dbh/dbh_1.0-18.bb
+++ b/packages/dbh/dbh_1.0-18.bb
@@ -1,15 +1,13 @@
-SECTION = "devel"
-# cramfs-native OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
+DESCRIPTION ="Disk based hashes is a method to create multidimensional binary trees on disk."
+HOMEPAGE = "http://dbh.sourceforge.net"
+LICENSE = "GPL"
+SECTION = "libs"
+SRC_URI = "${SOURCEFORGE_MIRROR}/dbh/dbh_${PV}.tar.bz2 \
+          file://${FILESDIR}/configure.patch;patch=1"
 
-DESCRIPTION="Disk based hashes is a method to create multidimensional binary trees on disk."
-HOMEPAGE="http://dbh.sourceforge.net"
-LICENSE="QPL"
-SRC_URI="${SOURCEFORGE_MIRROR}/dbh/${PN}_${PV}.tar.bz2 \
-       file://${FILESDIR}/configure.patch;patch=1"
-
-S="${WORKDIR}/${PN}_${PV}"
+S="${WORKDIR}/dbh_${PV}"
 
 inherit autotools pkgconfig
 
@@ -18,6 +16,5 @@ do_stage() {
        install -m 644 src/dbh_functions.h ${STAGING_INCDIR}
        install -m 644 src/dbh.h ${STAGING_INCDIR}
 
-       oe_soinstall src/.libs/libdbh-1.0.so.1.0.0 ${STAGING_LIBDIR}
-       ln -s ${STAGING_LIBDIR}/libdbh-1.0.so.1.0.0 ${STAGING_LIBDIR}/libdbh.so
+       oe_libinstall -C src/.libs libdbh-1.0 ${STAGING_LIBDIR}
 }

diff --git a/packages/nonworking/ocamlc/ocamlc-native_3.06.bb b/packages/nonworking/ocamlc/ocamlc-native_3.06.bb
index 9bd0ce5..37805aa 100644 (file)
--- a/packages/nonworking/ocamlc/ocamlc-native_3.06.bb
+++ b/packages/nonworking/ocamlc/ocamlc-native_3.06.bb
@@ -1,9 +1,8 @@
-DESCRIPTION=Objective Caml Compiler
-SECTION=base
-PRIORITY=optional
-LICENSE=QPL
+DESCRIPTION = "Objective Caml Compiler"
+SECTION = "devel"
+LICENSE = "QPL"
 
-SRC_URI = http://caml.inria.fr/distrib/ocaml-3.06/ocaml-3.06.tar.gz
-S = ${WORKDIR}/ocaml-${PV}
+SRC_URI = "http://caml.inria.fr/distrib/ocaml-${PV}/ocaml-${PV}.tar.gz"
+S = "${WORKDIR}/ocaml-${PV}"
 
 inherit autotools native

diff --git a/packages/qmake/qmake-native_1.07a.bb b/packages/qmake/qmake-native_1.07a.bb
index d5b500a..eab9c48 100644 (file)
--- a/packages/qmake/qmake-native_1.07a.bb
+++ b/packages/qmake/qmake-native_1.07a.bb
@@ -3,8 +3,8 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 SECTION = "devel"
-LICENSE = "GPL|QPL"
-PR = "r1"
+LICENSE = "GPL QPL"
+PR = "r2"
 
 QTEVER = "qt-embedded-free-3.3.4"
 

diff --git a/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb b/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb
index d9138a0..7eceaef 100644 (file)
--- a/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb
+++ b/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb
@@ -1,7 +1,7 @@
-SECTION = "opie/base"
 DESCRIPTION= "Tools to update the Qt fontdir"
 MAINTAINER = "M&N Solutions <info@mn-solutions.de>"
-LICENSE = "GPL/QPL"
+SECTION = "opie/base"
+LICENSE = "GPL QPL"
 PACKAGE_ARCH = "all"
 PR = "r3"
 
@@ -10,6 +10,7 @@ SRC_URI += "file://update-qtfontdir"
 S = "${WORKDIR}/qt-embedded-free-${PV}"
 
 do_compile() {
+       :
 }
 
 do_install() {

diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb
index a596ec6..ca959c1 100644 (file)
--- a/packages/uicmoc/uicmoc-native_2.3.10.bb
+++ b/packages/uicmoc/uicmoc-native_2.3.10.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 2.x"
 SECTION = "devel"
 PRIORITY = "optional"
-LICENSE = "GPL/QPL"
+LICENSE = "GPL QPL"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r0"
 

diff --git a/packages/uicmoc/uicmoc3-native_3.3.2.bb b/packages/uicmoc/uicmoc3-native_3.3.2.bb
index 271dd1f..f7024f9 100644 (file)
--- a/packages/uicmoc/uicmoc3-native_3.3.2.bb
+++ b/packages/uicmoc/uicmoc3-native_3.3.2.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 3.x"
 SECTION = "devel"
 PRIORITY = "optional"
-LICENSE = "GPL/QPL"
+LICENSE = "GPL QPL"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.3.2.tar.bz2 \
           file://no-examples.patch;patch=1"