From: Koen Kooi <koen@openembedded.org>
Date: Thu, 10 Feb 2005 20:26:58 +0000 (+0000)
Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~15063
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb88352fb60d630d26e90a442f4f789e56ca8ad3;p=openembedded.git

Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into lieve.(none):/data/build/oe/clean-tree/openembedded

2005/02/10 21:23:56+01:00 (none)!koen
sectest-gpe-image.bb, opie-image.bb, gpe-image.bb:
  adjust FEED_URI

BKrev: 420bc3927AT-3QA2yFaOgTGm4UgU2Q
---

diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index cd778270a6..ec6f86593e 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -2,8 +2,8 @@ FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${D
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
 FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
-FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/x11 \
-                                gpe##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/gpe"
+FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \
+                                gpe##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/gpe"
 
 PR = "r10"
 
diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb
index f07c4c2eba..fa90bfed5c 100644
--- a/packages/meta/opie-image.bb
+++ b/packages/meta/opie-image.bb
@@ -3,7 +3,7 @@ export IMAGE_LINGUAS = ""
 
 FEED_URIS_append_openzaurus = " opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie"
 FEED_URIS_append_opensimpad = " opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie"
-FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/opie"
+FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
 
 PR = "r10"
 
diff --git a/packages/meta/sectest-gpe-image.bb b/packages/meta/sectest-gpe-image.bb
index a819afc032..27777975ec 100644
--- a/packages/meta/sectest-gpe-image.bb
+++ b/packages/meta/sectest-gpe-image.bb
@@ -3,8 +3,8 @@ FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${D
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
 FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
-FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/x11 \
-                                gpe##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/gpe"
+FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \
+                                gpe##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/gpe"
 
 PR = "r4"