diff options
| author |   Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
| commit | f45580a1527dccdda100eee7f25f9f2c41af4db8 (patch) | |
| tree | 2218d4955f368e1804d86f212cc78317b4327f77 /recipes/shr/phonefsod_git.bb | |
| parent | 887b437869709625f5323438808ded9990cf590a (diff) | |
| parent | e3df24d64a48aff19aa9960dd9308a071b243b09 (diff) | |
| download | openembedded-f45580a1527dccdda100eee7f25f9f2c41af4db8.tar.gz | |
Merge commit 'origin/shr/merge' into shr/testing2009
Conflicts:
conf/distro/include/sane-srcrevs.inc
recipes/enotes/enotes_svn.bb
recipes/intone-video/intone-video_svn.bb
recipes/intone/intone_svn.bb
recipes/shr/shr-wizard_git.bb
recipes/tasks/task-shr-minimal.bb
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'recipes/shr/phonefsod_git.bb')
| -rw-r--r-- | recipes/shr/phonefsod_git.bb | 3 |
1 files changed, 2 insertions, 1 deletions
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" |