diff options
| author |   Klaus Kurzmann <mok@fluxnetz.de> | 2009-12-13 13:26:19 +0100 |
|---|---|---|
| committer | Klaus Kurzmann <mok@fluxnetz.de> | 2009-12-13 13:26:19 +0100 |
| commit | 1ab9cec95656c0616193989adfbc6001339efb20 (patch) | |
| tree | 8876bef2c9f7b6e6cbfc73fc24c8b9ef58cdcc66 /recipes/shr | |
| parent | 8ce58c76105cf48a9d510a0aa037470ccc264c2c (diff) | |
| parent | fcb6929125fdc4e1bd31aa198897cd50ca41ae9c (diff) | |
| download | openembedded-1ab9cec95656c0616193989adfbc6001339efb20.tar.gz | |
Merge branch 'org.openembedded.dev' into martin_jansa/srcpv
Conflicts:
recipes/shr/e-wm-config-illume-shr_git.bb
recipes/shr/phonefsod_git.bb
recipes/shr/phoneuid_git.bb
Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
Diffstat (limited to 'recipes/shr')
| -rw-r--r-- | recipes/shr/e-wm-config-illume-shr_git.bb | 11 | ||||
| -rw-r--r-- | recipes/shr/phonefsod_git.bb | 3 | ||||
| -rw-r--r-- | recipes/shr/phoneuid_git.bb | 4 | ||||
| -rw-r--r-- | recipes/shr/shr-launcher_svn.bb | 5 |
4 files changed, 17 insertions, 6 deletions
diff --git a/recipes/shr/e-wm-config-illume-shr_git.bb b/recipes/shr/e-wm-config-illume-shr_git.bb index 36154cef8e..76ce8d3071 100644 --- a/recipes/shr/e-wm-config-illume-shr_git.bb +++ b/recipes/shr/e-wm-config-illume-shr_git.bb @@ -3,7 +3,7 @@ SECTION = "e/utils" DEPENDS = "eet" LICENSE = "MIT BSD" PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" -PR = "r6" +PR = "r7" inherit e @@ -17,5 +17,12 @@ EXTRA_OECONF = "\ FILES_${PN} = "${datadir}/enlightenment/data/config/illume-shr" -RRECOMMENDS_${PN} = "e-wm-theme-illume-shr e-wm-sysactions-shr e-wm-menu-shr" +RRECOMMENDS_${PN} = "\ + e-wm-theme-illume-shr \ + e-wm-sysactions-shr \ + e-wm-menu-shr \ + illume-keyboard-default-alpha \ + illume-keyboard-default-numeric \ + illume-keyboard-default-terminal \ +" diff --git a/recipes/shr/phonefsod_git.bb b/recipes/shr/phonefsod_git.bb index e35cbf7649..2103122068 100644 --- a/recipes/shr/phonefsod_git.bb +++ b/recipes/shr/phonefsod_git.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += " dbus-glib libframeworkd-glib sqlite3 shr-specs" PV = "0.0.0+gitr${SRCPV}" -PR = "r3" +PR = "r4" SRC_URI = "git://git.shr-project.org/repo/phonefsod.git;protocol=http;branch=master" S = "${WORKDIR}/git" @@ -18,5 +18,6 @@ EXTRA_OECONF = "\ SPECS_PATH=${STAGING_DATADIR}/shr-specs \ " +CONFFILES_${PN} = "${sysconfdir}/phonefsod.conf" diff --git a/recipes/shr/phoneuid_git.bb b/recipes/shr/phoneuid_git.bb index e786d3e4cd..2bb58819a8 100644 --- a/recipes/shr/phoneuid_git.bb +++ b/recipes/shr/phoneuid_git.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += " dbus-glib libframeworkd-glib libphone-ui sqlite3 shr-specs" PV = "0.0.0+gitr${SRCPV}" -PR = "r3" +PR = "r4" SRC_URI = "git://git.shr-project.org/repo/phoneuid.git;protocol=http;branch=master" S = "${WORKDIR}/git" @@ -18,3 +18,5 @@ EXTRA_OECONF = "\ FILES_${PN} += "${datadir}" +CONFFILES_${PN} = "${sysconfdir}/phoneuid.conf" + diff --git a/recipes/shr/shr-launcher_svn.bb b/recipes/shr/shr-launcher_svn.bb index a9da5a6d37..807d3a2cea 100644 --- a/recipes/shr/shr-launcher_svn.bb +++ b/recipes/shr/shr-launcher_svn.bb @@ -11,8 +11,9 @@ PR = "r4" SRC_URI = "svn://shr-launcher.googlecode.com/svn/trunk;module=.;proto=http" do_configure_prepend() { - rm -f ${S}/config.log - rm -f ${S}/config.status + # all links to /usr/share/automake-1.10/ + rm -f ${S}/depcomp ${S}/config.guess ${S}/config.sub ${S}/INSTALL ${S}/install-sh ${S}/missing + touch ${S}/INSTALL } S = "${WORKDIR}" |