summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschon <schon@dev03-server>2012-08-31 10:08:07 (GMT)
committerschon <schon@dev03-server>2012-08-31 10:08:07 (GMT)
commitccd5bbd739f0436dea027dae6789d3b1e25025bb (patch)
tree9b2cca98dc037300a72daa89c9181a76ef8689b4
parent21cf4a67996989829a5c87ca5dc6821442ed281f (diff)
parent83e31fb7c0cce3253bc52d73d1d81ec3e27bcd76 (diff)
Merge branch 'vuplus-1.6k' of /home/shcheong/work/stb/sw/oe_1.6/bm750/openembedded into rk2637
-rwxr-xr-xrecipes/enigma2/enigma2-defaultservices.bb2
-rwxr-xr-x[-rw-r--r--]recipes/enigma2/enigma2-defaultservices/lamedb.1922
-rw-r--r--recipes/enigma2/enigma2.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/recipes/enigma2/enigma2-defaultservices.bb b/recipes/enigma2/enigma2-defaultservices.bb
index b67b148..796509d 100755
--- a/recipes/enigma2/enigma2-defaultservices.bb
+++ b/recipes/enigma2/enigma2-defaultservices.bb
@@ -4,7 +4,7 @@ LICENSE = "proprietary"
MAINTAINER = "tmbinc@elitedvb.net"
PR = "r4"
-PR_vuplus = "r6"
+PR_vuplus = "r7"
SRC_URI = "file://*"
diff --git a/recipes/enigma2/enigma2-defaultservices/lamedb.192 b/recipes/enigma2/enigma2-defaultservices/lamedb.192
index 49d62da..8362d17 100644..100755
--- a/recipes/enigma2/enigma2-defaultservices/lamedb.192
+++ b/recipes/enigma2/enigma2-defaultservices/lamedb.192
@@ -816,7 +816,7 @@ p:DIGITAL+
Sky †Cinema‡ +†24‡
p:SKY,C:1861
4e2b:00c00000:043a:0001:1:0
-.
+Deutsches Wetterfernsehen
p:ProSiebenSat.1
772b:00c00000:0416:0001:1:0
CAZA Y PESCA
diff --git a/recipes/enigma2/enigma2.bb b/recipes/enigma2/enigma2.bb
index df21681..07aa924 100644
--- a/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb
@@ -78,7 +78,7 @@ RDEPENDS_enigma2-plugin-extensions-hbbtv = "tslib-conf libts-1.0-0 libsysfs2 lib
RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-ng-blkid ntfs-3g dosfstools"
PN = "enigma2"
-PR = "r41"
+PR = "r42"
SRCDATE = "20110922"
SRCREV = "5e19a3f8a5e8ce8a4e2cb2b601a1b8ef3554e4be"