diff options
| author | Klaus Kurzmann <mok@fluxnetz.de> | 2009-11-26 11:14:36 +0100 |
|---|---|---|
| committer | Klaus Kurzmann <mok@fluxnetz.de> | 2009-11-26 11:14:36 +0100 |
| commit | be98757e02387eff347c892d144dce6acbab3c58 (patch) | |
| tree | 2d00513a2aabdb3a77349bf746a54f43a3650b10 /recipes | |
| parent | 22505097ca650e344c8d3b88ae79a5f9ea5ab6b2 (diff) | |
| parent | e7e0893066da10767701df779972210082aa4aa8 (diff) | |
Merge branch 'org.openembedded.dev' of git+ssh://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/e17/e-wm_svn.bb | 3 | ||||
| -rw-r--r-- | recipes/gnome-mplayer/gnome-mplayer_svn.bb | 2 | ||||
| -rw-r--r-- | recipes/shr/e-wm-menu-shr_git.bb | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb index a935728e02..fe65620852 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -3,7 +3,7 @@ DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" SRCNAME = "e" PV = "0.16.999.060+svnr${SRCPV}" -PR = "r7" +PR = "r8" inherit e update-alternatives @@ -90,7 +90,6 @@ RRECOMMENDS_${PN} = "\ ${PN}-other \ ${PN}-input-methods \ ${PN}-sysactions \ - ${PN}-menu \ " PACKAGE_ARCH_${PN}-config-default = "all" diff --git a/recipes/gnome-mplayer/gnome-mplayer_svn.bb b/recipes/gnome-mplayer/gnome-mplayer_svn.bb index 2769bcbfe9..73dbd079dd 100644 --- a/recipes/gnome-mplayer/gnome-mplayer_svn.bb +++ b/recipes/gnome-mplayer/gnome-mplayer_svn.bb @@ -1,7 +1,7 @@ require gnome-mplayer.inc SRCREV = "1583" -PV = "0.9.8+svn${SRCPV}" +PV = "0.9.8+svnr${SRCPV}" PR = "r0" S = "${WORKDIR}/trunk" diff --git a/recipes/shr/e-wm-menu-shr_git.bb b/recipes/shr/e-wm-menu-shr_git.bb index b8b267b504..0c8d75ae3a 100644 --- a/recipes/shr/e-wm-menu-shr_git.bb +++ b/recipes/shr/e-wm-menu-shr_git.bb @@ -2,8 +2,8 @@ DESCRIPTION = "illume SHR applications.menu config" SECTION = "e/utils" LICENSE = "MIT BSD" PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}" +PR = "r1" -RPROVIDES_${PN} = "e-wm-menu" RCONFLICTS_${PN} = "e-wm-menu" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" |