diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-12-19 09:20:25 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-12-19 09:20:25 +0100 |
| commit | 89becd13888f321e4f7e1d88165db41f86caaaf8 (patch) | |
| tree | 47c3b02c7f8de78003f446c9a5bc5b73d3f4a40c /packages/ncurses | |
| parent | 26102276cb26e256186d841390988460c52bde8a (diff) | |
| parent | ef5ad935d6efd350b24e141e34bf26744ca31409 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/ncurses')
| -rw-r--r-- | packages/ncurses/ncurses.inc | 4 | ||||
| -rw-r--r-- | packages/ncurses/ncurses_5.4.bb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/ncurses/ncurses.inc b/packages/ncurses/ncurses.inc index 18c0722662..6d35467d8a 100644 --- a/packages/ncurses/ncurses.inc +++ b/packages/ncurses/ncurses.inc @@ -7,7 +7,9 @@ PACKAGES_prepend = "ncurses-tools " PACKAGES_append = " ncurses-terminfo" FILES_ncurses_append = " ${datadir}/tabset" RSUGGESTS_${PN} = "ncurses-terminfo" -RPROVIDES = "libncurses5" +RPROVIDES_${PN} = "libncurses5" +RCONFLICTS_${PN} = "libncurses5" +RREPLACES_${PN} = "libncurses5" inherit autotools diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb index 2cd0cf0de0..451a180b39 100644 --- a/packages/ncurses/ncurses_5.4.bb +++ b/packages/ncurses/ncurses_5.4.bb @@ -1,4 +1,4 @@ -PR = "r15" +PR = "r16" SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \ file://makefile_tweak.patch;patch=1 \ |