From: hschang <chang@dev3>
Date: Wed, 23 Jul 2014 04:18:42 +0000 (+0900)
Subject: Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=38875c9b5c043e066ed208f4d2ac79c1bd5b4c83

Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0

Conflicts:
	meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
---

38875c9b5c043e066ed208f4d2ac79c1bd5b4c83
diff --cc meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 2192246,1c5492f..b364ec6
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@@ -88,14 -89,17 +88,14 @@@ RDEPENDS_enigma2-plugin-systemplugins-b
  RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
  
  PN = "enigma2"
- PR = "r79"
+ PR = "r80"
  
 -SRCDATE = "20121128"
 -#SRCDATE is NOT used by git to checkout a specific revision
 -#but we need it to build a ipk package version
 -#when you like to checkout a specific revision of e2 you need
 -#have to specify a commit id or a tag name in SRCREV
 +inherit gitpkgv pythonnative
  
  ####################################################
 +PV = "experimental-gitr${SRCPV}"
 +PKGV = "experimental-gitr${GITPKGV}"
  BRANCH = "vuplus_experimental"
 -PV = "experimental-git${SRCDATE}"
  SRCREV = ""
  ####################################################
  
diff --cc meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
index 3bc6dcd,2e814b3..42766a5
--- a/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
+++ b/meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
@@@ -3,9 -3,9 +3,9 @@@ PRIORITY = "required
  LICENSE = "CLOSED"
  
  DEPENDS = "mpfr gmp"
 -RDEPENDS = "sysfsutils vuplus-dvb-modules"
 +RDEPENDS_${PN} = "sysfsutils vuplus-dvb-modules"
  
- SRC_DATE = "20140718_0"
+ SRC_DATE = "20140721_0"
  
  PR = "r1_${SRC_DATE}"
  SRC_URI = ""