[oe-commits] org.oe.dev merge of '8e2516afaaa24a7f517979818ae7304aadb4dbc9'

[xora commit]

merge of '8e2516afaaa24a7f517979818ae7304aadb4dbc9'
     and 'f8359facab8aa6b2607db3f4f3d254d7082a48c5'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 9a8033e81f2f82d4e63c6bbb8247dec9e225a26b
ViewMTN: http://monotone.openembedded.org/revision/info/9a8033e81f2f82d4e63c6bbb8247dec9e225a26b
Files:
1
packages/roadmap/roadmap.inc
packages/linux-libc-headers/linux-libc-headers.inc
packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
Diffs:

#
# mt diff -r8e2516afaaa24a7f517979818ae7304aadb4dbc9 -r9a8033e81f2f82d4e63c6bbb8247dec9e225a26b
#
# 
# 
# patch "packages/roadmap/roadmap.inc"
#  from [46055702ecd5e97c7f30231e54b7f3d929ea0fad]
#    to [9cc55a4e20979c8d8d54cf55678430dbc466d5cb]
# 
============================================================
--- packages/roadmap/roadmap.inc	46055702ecd5e97c7f30231e54b7f3d929ea0fad
+++ packages/roadmap/roadmap.inc	9cc55a4e20979c8d8d54cf55678430dbc466d5cb
@@ -1,9 +1,7 @@ DESCRIPTION = "RoadMap is a program that
 DESCRIPTION = "RoadMap is a program that provides car navigation for Linux and UNIX." 
-PRIORITY = "optional"
-AUTHOR = "Pascal Martin <pascal.martin at iname.com>"
+AUTHOR = "Paul Fox <pgf at foxharp.boston.ma.us>"
 HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
 LICENSE = "GPL"
-RRECOMMENDS = "gpsd flite"
 DEPENDS = "expat"
 
 FILES_${PN} += "${datadir}/roadmap"
@@ -16,3 +14,6 @@ do_install() {
         oe_runmake install
         install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
 }
+
+RRECOMMENDS = "gpsd flite"
+FILES_${PN} += "${datadir}/roadmap"


#
# mt diff -rf8359facab8aa6b2607db3f4f3d254d7082a48c5 -r9a8033e81f2f82d4e63c6bbb8247dec9e225a26b
#
# 
# 
# patch "packages/linux-libc-headers/linux-libc-headers.inc"
#  from [8d23279cdfe7a7a9d3b20655625b2c6424e25069]
#    to [5c98632deeb64f09ea2d1409ebfb3f52ca329b18]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.23.bb"
#  from [66ed33603a1599bc68718e22c5e7fe1d81ff51cc]
#    to [9848fbf9a03e26527896520878c57d533bebc91e]
# 
============================================================
--- packages/linux-libc-headers/linux-libc-headers.inc	8d23279cdfe7a7a9d3b20655625b2c6424e25069
+++ packages/linux-libc-headers/linux-libc-headers.inc	5c98632deeb64f09ea2d1409ebfb3f52ca329b18
@@ -1,3 +1,6 @@ LICENSE = "GPL"
 DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
 SECTION = "devel"
 LICENSE = "GPL"
+
+RDEPENDS_${PN}-dev = ""
+RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})"
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.23.bb	66ed33603a1599bc68718e22c5e7fe1d81ff51cc
+++ packages/linux-libc-headers/linux-libc-headers_2.6.23.bb	9848fbf9a03e26527896520878c57d533bebc91e
@@ -1,8 +1,8 @@ DEPENDS += "unifdef-native"
 require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"