[oe-commits] Andreas Monzner : Revert "local changes"

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dreambox
Commit: 1b45e2b3e71c45a40a673b78ce033f4eddb9ac20
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1b45e2b3e71c45a40a673b78ce033f4eddb9ac20

Author: Andreas Monzner <ghost at opendreambox.org>
Date:   Sat Nov  1 01:19:26 2008 +0100

Revert "local changes"

This reverts commit 2eb57b32d5124a5872be9167e6323fdc6581f69c.

---

 conf/distro/opendreambox-1.5.conf      |    2 +-
 packages/dreambox/dreambox-bootlogo.bb |    2 +-
 packages/images/dreambox-image.bb      |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf/distro/opendreambox-1.5.conf b/conf/distro/opendreambox-1.5.conf
index b083dd2..4f91d20 100644
--- a/conf/distro/opendreambox-1.5.conf
+++ b/conf/distro/opendreambox-1.5.conf
@@ -5,7 +5,7 @@ DISTRO = "opendreambox"
 DISTRO_NAME = "OpenDreambox"
 DISTRO_VERSION = "1.5.0"
 
-FEED_URIS += "official##http://sources.dreamboxupdate.com/opendreambox/1.5/${MACHINE}/experimental"
+FEED_URIS += "official##http://sources.dreamboxupdate.com/opendreambox/1.5/${MACHINE}/feed"
 
 # freetype < 2.1.8 is a *must*, because of the old api
 # we choose 2.0.9 as it somehow renders in a different way,
diff --git a/packages/dreambox/dreambox-bootlogo.bb b/packages/dreambox/dreambox-bootlogo.bb
index 2719ef7..e5a10a6 100644
--- a/packages/dreambox/dreambox-bootlogo.bb
+++ b/packages/dreambox/dreambox-bootlogo.bb
@@ -5,7 +5,7 @@ LICENSE = "proprietary"
 MAINTAINER = "Felix Domke <tmbinc at elitedvb.net>"
 
 PV = "1.0"
-PR = "r2"
+PR = "r1"
 
 SRC_URI = "http://sources.dreamboxupdate.com/download/7020/bootlogo_${MACHINE}.elf \
 	http://sources.dreamboxupdate.com/download/7020/bootlogo_${MACHINE}.mvi \
diff --git a/packages/images/dreambox-image.bb b/packages/images/dreambox-image.bb
index 9b84f60..f8c52fa 100644
--- a/packages/images/dreambox-image.bb
+++ b/packages/images/dreambox-image.bb
@@ -37,6 +37,7 @@ OPENDREAMBOX_EXPERIMENTAL_R = "enigma2-plugin-systemplugins-frontprocessorupgrad
 
 #this packages dont exist with enigma2, enigma2-plugins 2.4
 OPENDREAMBOX_EXPERIMENTAL_R_append_dm8000 = " \
+	enigma2-plugin-systemplugins-defaultservicesscanner \
 	enigma2-defaultservices \
 	enigma2-plugin-systemplugins-networkwizard"