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

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

2005/02/09 14:08:12+01:00 uni-frankfurt.de!mickeyl
this patch eliminates qte-for-opie and all traces. bye bye.

BKrev: 420a0b48MB3bEystu8ubZ_jKWvY1GQ

6 files changed, 10 insertions, 10 deletions

diff --git a/conf/distro/familiar-0.8.0.conf b/conf/distro/familiar-0.8.0.conf
index 1ddd0d2a69..b0c29ccc69 100644
--- a/conf/distro/familiar-0.8.0.conf
+++ b/conf/distro/familiar-0.8.0.conf
@@ -11,7 +11,7 @@ FEED_URIS += " \
 CVSDATE = 20041120
 CVSDATE_minimo = 20040828
 
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
@@ -23,7 +23,7 @@ PREFERRED_VERSION_gcc-cross = "3.4.2"
 PREFERRED_VERSION_gcc-cross-initial = "3.4.2"
 PREFERRED_VERSION_libtool-native = "1.5.6"
 PREFERRED_VERSION_libtool-cross= "1.5.6"
-PREFERRED_VERSION_qte-for-opie = "2.3.7"
+PREFERRED_VERSION_qte = "2.3.7"
 PREFERRED_VERSION_orinoco-modules = "0.13e"
 PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
 PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
diff --git a/conf/distro/familiar-0.8.1.conf b/conf/distro/familiar-0.8.1.conf
index 8f38a39c10..b94ef01577 100644
--- a/conf/distro/familiar-0.8.1.conf
+++ b/conf/distro/familiar-0.8.1.conf
@@ -27,8 +27,8 @@ PREFERRED_VERSION_libtool-cross= "1.5.6"
 # Opie
 #
 
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
-PREFERRED_VERSION_qte-for-opie = "2.3.10"
+PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
+PREFERRED_VERSION_qte = "2.3.10"
 
 OPIE_VERSION = "1.1.9"
 include conf/distro/preferred-opie-versions.inc
diff --git a/conf/distro/grant.conf b/conf/distro/grant.conf
index 0ffd6d5652..30bbb831f2 100644
--- a/conf/distro/grant.conf
+++ b/conf/distro/grant.conf
@@ -5,7 +5,7 @@ FEED_URIS_openzaurus = "OZ-3.5.2##http://openzaurus.org/official/unstable/3.5.2/
               OZ-Upgrades##http://openzaurus.org/official/unstable/3.5.2/upgrades/"
 
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
diff --git a/conf/distro/openzaurus-3.5.1.conf b/conf/distro/openzaurus-3.5.1.conf
index 49638d8693..36a9d8d2b6 100644
--- a/conf/distro/openzaurus-3.5.1.conf
+++ b/conf/distro/openzaurus-3.5.1.conf
@@ -6,7 +6,7 @@ FEED_URIS_openzaurus = "OZ-3.5.1##http://openzaurus.org/official/unstable/3.5.1/
 
 CVSDATE = 20040915
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
@@ -25,7 +25,7 @@ PREFERRED_VERSION_gcc-cross = "3.4.2"
 PREFERRED_VERSION_gcc-cross-initial = "3.4.2"
 PREFERRED_VERSION_libtool-native = "1.5.6"
 PREFERRED_VERSION_libtool-cross= "1.5.6"
-PREFERRED_VERSION_qte-for-opie = "2.3.7"
+PREFERRED_VERSION_qte = "2.3.7"
 PREFERRED_VERSION_orinoco-modules = "0.13e"
 PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
 PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
diff --git a/conf/distro/openzaurus-3.5.2.conf b/conf/distro/openzaurus-3.5.2.conf
index b9c83c353d..7d647a97f3 100644
--- a/conf/distro/openzaurus-3.5.2.conf
+++ b/conf/distro/openzaurus-3.5.2.conf
@@ -9,7 +9,7 @@ FEED_URIS += " \
 
 CVSDATE = 20041127
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
@@ -29,7 +29,7 @@ PREFERRED_VERSION_gcc-cross = "3.4.2"
 PREFERRED_VERSION_gcc-cross-initial = "3.4.2"
 PREFERRED_VERSION_libtool-native = "1.5.6"
 PREFERRED_VERSION_libtool-cross= "1.5.6"
-PREFERRED_VERSION_qte-for-opie = "2.3.7"
+PREFERRED_VERSION_qte = "2.3.7"
 PREFERRED_VERSION_orinoco-modules = "0.13e"
 PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
 PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index a940383da1..73e5a821f4 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -15,7 +15,7 @@ FEED_URIS += " \
 
 CVSDATE = "20050208"
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"