From: Koen Kooi Date: Sun, 6 Jun 2010 14:19:07 +0000 (+0200) Subject: qt 4.7.0-beta1: fix versioning X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c070de32d40dd561b63de5b4f41baa3cf822ef5b;p=openembedded.git qt 4.7.0-beta1: fix versioning --- diff --git a/recipes/qt4/qt-4.7.0-beta1.inc b/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc similarity index 100% rename from recipes/qt4/qt-4.7.0-beta1.inc rename to recipes/qt4/qt-4.6.2+4.7.0-beta1.inc diff --git a/recipes/qt4/qt-4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch similarity index 100% rename from recipes/qt4/qt-4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch rename to recipes/qt4/qt-4.6.2+4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch diff --git a/recipes/qt4/qt-4.7.0-beta1/0002-Disable-tools-assistant.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0002-Disable-tools-assistant.patch similarity index 100% rename from recipes/qt4/qt-4.7.0-beta1/0002-Disable-tools-assistant.patch rename to recipes/qt4/qt-4.6.2+4.7.0-beta1/0002-Disable-tools-assistant.patch diff --git a/recipes/qt4/qt-4.7.0-beta1/0003-Disable-examples-designer.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0003-Disable-examples-designer.patch similarity index 100% rename from recipes/qt4/qt-4.7.0-beta1/0003-Disable-examples-designer.patch rename to recipes/qt4/qt-4.6.2+4.7.0-beta1/0003-Disable-examples-designer.patch diff --git a/recipes/qt4/qt-4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch similarity index 100% rename from recipes/qt4/qt-4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch rename to recipes/qt4/qt-4.6.2+4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch diff --git a/recipes/qt4/qt-4.7.0-beta1/0005-Disable-examples-help.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0005-Disable-examples-help.patch similarity index 100% rename from recipes/qt4/qt-4.7.0-beta1/0005-Disable-examples-help.patch rename to recipes/qt4/qt-4.6.2+4.7.0-beta1/0005-Disable-examples-help.patch diff --git a/recipes/qt4/qt-4.7.0-beta1/0006-Disable-demos-browser.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0006-Disable-demos-browser.patch similarity index 100% rename from recipes/qt4/qt-4.7.0-beta1/0006-Disable-demos-browser.patch rename to recipes/qt4/qt-4.6.2+4.7.0-beta1/0006-Disable-demos-browser.patch diff --git a/recipes/qt4/qt-4.7.0-beta1/0007-Disable-demos-qtdemos.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0007-Disable-demos-qtdemos.patch similarity index 100% rename from recipes/qt4/qt-4.7.0-beta1/0007-Disable-demos-qtdemos.patch rename to recipes/qt4/qt-4.6.2+4.7.0-beta1/0007-Disable-demos-qtdemos.patch diff --git a/recipes/qt4/qt-4.7.0-beta1/0008-Disable-examples-declarative.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0008-Disable-examples-declarative.patch similarity index 100% rename from recipes/qt4/qt-4.7.0-beta1/0008-Disable-examples-declarative.patch rename to recipes/qt4/qt-4.6.2+4.7.0-beta1/0008-Disable-examples-declarative.patch diff --git a/recipes/qt4/qt-4.7.0-beta1/0009-Disable-demos-affine.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0009-Disable-demos-affine.patch similarity index 100% rename from recipes/qt4/qt-4.7.0-beta1/0009-Disable-demos-affine.patch rename to recipes/qt4/qt-4.6.2+4.7.0-beta1/0009-Disable-demos-affine.patch diff --git a/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb b/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb index 5d3f55ceec..0539c049e0 100644 --- a/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb +++ b/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb @@ -2,6 +2,8 @@ DEFAULT_PREFERENCE = "-1" require qt4-tools-native.inc LICENSE = "LGPLv2.1 GPLv3" + +PV = "4.6.2+4.7.0-beta1" PR = "${INC_PR}.0" EXTRA_OECONF += " -no-fast -silent -no-rpath" diff --git a/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb b/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb index 250d4ccd9a..228b686d95 100644 --- a/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb +++ b/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb @@ -1,6 +1,8 @@ DEFAULT_PREFERENCE = "-1" require qt4-x11-free.inc + +PV = "4.6.2+4.7.0-beta1" PR = "${INC_PR}.0" QT_CONFIG_FLAGS_append_armv6 = " -no-neon "