diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-06-12 22:21:07 +0200 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-06-12 22:21:07 +0200 |
| commit | c326ad5a1960df22c5efd71bd815b9b12688556e (patch) | |
| tree | 09bd868c4446f3510a070ed601e7b67c6b791cde /recipes/freesmartphone/fso-gsm0710muxd_git.bb | |
| parent | dd0fdfe9ed922189f4251c688b7a16faa76cd904 (diff) | |
| parent | 2bca6bd1a15123af28ff5ef8fd6ebb417a3a4dee (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/tgt/tgt_1.0.5.bb
Diffstat (limited to 'recipes/freesmartphone/fso-gsm0710muxd_git.bb')
| -rw-r--r-- | recipes/freesmartphone/fso-gsm0710muxd_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes/freesmartphone/fso-gsm0710muxd_git.bb b/recipes/freesmartphone/fso-gsm0710muxd_git.bb index 6fae6af421..a85a796e5d 100644 --- a/recipes/freesmartphone/fso-gsm0710muxd_git.bb +++ b/recipes/freesmartphone/fso-gsm0710muxd_git.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" SRCREV = "1d69fb5b666ac2a9e54e46978c7afa8fe5dfc3c9" PV = "0.9.3.1+gitr${SRCPV}" PE = "1" -PR = "r0" +PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/gsm0710muxd.git;protocol=git;branch=master" S = "${WORKDIR}/git" @@ -14,7 +14,7 @@ S = "${WORKDIR}/git" inherit autotools RDEPENDS_${PN} = "dbus dbus-glib" -RCONFLICTS = "gsm0710muxd" -RREPLACES = "gsm0710muxd" +RCONFLICTS_${PN} = "gsm0710muxd" +RREPLACES_${PN} = "gsm0710muxd" FILES_${PN} += "${datadir} ${sysconfdir}" |