diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-08-10 11:01:07 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-08-10 11:01:07 +0000 |
| commit | 218897f352d0bed08178a177d186f59c8c73a506 (patch) | |
| tree | 9effb3a35ce2889ec72e5bd649263974b11b7d65 /packages/openmoko2 | |
| parent | f309083441acde886c432ffcb41fa06bd790f9d8 (diff) | |
| parent | 2edb67ce2572765431f7791bd13c17e255ff12c6 (diff) | |
merge of '294a7914d9ff32527dddf5266da757d7385372e7'
and '726f50fa46c4db4bf5fb2dc2f6390ca60337cdd0'
Diffstat (limited to 'packages/openmoko2')
| -rw-r--r-- | packages/openmoko2/openmoko-terminal2_1.0.0.bb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/openmoko2/openmoko-terminal2_1.0.0.bb b/packages/openmoko2/openmoko-terminal2_1.0.0.bb index 8d9a5245ca..84bd470f7a 100644 --- a/packages/openmoko2/openmoko-terminal2_1.0.0.bb +++ b/packages/openmoko2/openmoko-terminal2_1.0.0.bb @@ -1,7 +1,10 @@ DESCRIPTION = "The OpenMoko Command Line Console" SECTION = "openmoko/applications" RDEPENDS += "mrxvt" -PR = "r1" +PR = "r2" + +RCONFLICTS = "openmoko-terminal" +RREPLACES = "openmoko-terminal" inherit openmoko2 |