From: nslu2-linux.adm@bkbits.net Date: Sun, 26 Dec 2004 12:40:09 +0000 (+0000) Subject: Merge bk://oe-devel.bkbits.net/openembedded X-Git-Tag: Release-2010-05/1~15568 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f316d246a3996718c63b054cc4fbd51843cc5684;p=openembedded.git Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2004/12/26 13:08:36+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/12/26 13:08:22+01:00 uni-frankfurt.de!mickeyl bring back qmake 1.07a until opie has catched up with 1.08a BKrev: 41ceb129j2Bm_Nf-ZthWbF5emSSbOA --- diff --git a/packages/qmake/qmake-native-1.08a/common.pro b/packages/qmake/files/common.pro similarity index 100% rename from packages/qmake/qmake-native-1.08a/common.pro rename to packages/qmake/files/common.pro diff --git a/packages/qmake/qmake-native-1.08a/linux-oe-qmake.conf b/packages/qmake/files/linux-oe-qmake.conf similarity index 100% rename from packages/qmake/qmake-native-1.08a/linux-oe-qmake.conf rename to packages/qmake/files/linux-oe-qmake.conf diff --git a/packages/qmake/qmake-native-1.08a/ramses/linux-oe-qmake.conf b/packages/qmake/files/ramses/linux-oe-qmake.conf similarity index 100% rename from packages/qmake/qmake-native-1.08a/ramses/linux-oe-qmake.conf rename to packages/qmake/files/ramses/linux-oe-qmake.conf diff --git a/packages/qmake/qmake-native_1.07a.bb b/packages/qmake/qmake-native_1.07a.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qmake/qmake-native_1.08a.bb b/packages/qmake/qmake-native_1.08a.bb index a310301c87..22530d1bfd 100644 --- a/packages/qmake/qmake-native_1.08a.bb +++ b/packages/qmake/qmake-native_1.08a.bb @@ -4,15 +4,17 @@ HOMEPAGE = "http://www.trolltech.com" MAINTAINER = "Michael 'Mickey' Lauer " SECTION = "devel" LICENSE = "GPL|QPL" -PR = "r2" +PR = "r3" -QTEVER = "4.0.0-b1" +DEFAULT_PREFERENCE = "-1" -SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-opensource-${QTEVER}.tar.bz2 \ +QTEVER = "qt-embedded-opensource-4.0.0-b1" + +SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTEVER}.tar.bz2 \ file://old-moc-compatibility.patch;patch=1 \ file://old-uic-compatibility.patch;patch=1 \ file://linux-oe-qmake.conf" -S = "${WORKDIR}/qt-embedded-opensource-${QTEVER}" +S = "${WORKDIR}/${QTEVER}" inherit autotools native