[oe-commits] org.oe.dev merge of 'c80492670adbda2d61a72a0c64c1a2a873d10b51'

[justinp commit]

merge of 'c80492670adbda2d61a72a0c64c1a2a873d10b51'
     and 'df3f0f654af4ab20778a61e050187c6f94876b9d'

Author: justinp at openembedded.org
Branch: org.openembedded.dev
Revision: cfd14c49a0d924daeec754ef84c5b25d0b1a730f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=cfd14c49a0d924daeec754ef84c5b25d0b1a730f
Files:
1
packages/proj4/proj-4_4.9.bb
packages/linux/linux-rp_2.6.21.bb
Diffs:

#
# mt diff -rc80492670adbda2d61a72a0c64c1a2a873d10b51 -rcfd14c49a0d924daeec754ef84c5b25d0b1a730f
#
# 
# 
# patch "packages/proj4/proj-4_4.9.bb"
#  from [35b70b196c7ba5d7010365a703e2f9a9b7bc8543]
#    to [8fd0c92f1a2329d08b2c5a251cbd7d6270406e0d]
# 
============================================================
--- packages/proj4/proj-4_4.9.bb	35b70b196c7ba5d7010365a703e2f9a9b7bc8543
+++ packages/proj4/proj-4_4.9.bb	8fd0c92f1a2329d08b2c5a251cbd7d6270406e0d
@@ -1,13 +1,17 @@ LICENSE = "MIT"
 DESCRIPTION = "PROJ.4 - Cartographic Projections Library"
 HOMEPAGE = "http://www.remotesensing.org/proj/"
 LICENSE = "MIT"
 
+PR = "r1"
+
 inherit autotools pkgconfig
 
 SRC_URI = "ftp://ftp.remotesensing.org/proj/proj-4.${PV}.tar.gz"
 
 S = "${WORKDIR}/proj-4.${PV}"
 
+FILES_${PN} += "${datadir}/proj"
+
 do_stage() {
 	autotools_stage_all
 }


#
# mt diff -rdf3f0f654af4ab20778a61e050187c6f94876b9d -rcfd14c49a0d924daeec754ef84c5b25d0b1a730f
#
# 
# 
# patch "packages/linux/linux-rp_2.6.21.bb"
#  from [791613c9350e496eb591d9d3114c81a1e6b2c20c]
#    to [0611fe14d6ba36f9557f2f7c5814c1be6fbd7f84]
# 
============================================================
--- packages/linux/linux-rp_2.6.21.bb	791613c9350e496eb591d9d3114c81a1e6b2c20c
+++ packages/linux/linux-rp_2.6.21.bb	0611fe14d6ba36f9557f2f7c5814c1be6fbd7f84
@@ -1,6 +1,6 @@ require linux-rp.inc
 require linux-rp.inc
 
-PR = "r4"
+PR = "r5"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -51,6 +51,7 @@ SRC_URI = "http://www.kernel.org/pub/lin
            file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
            file://squashfs3.0-2.6.15.patch;patch=1;status=external \
            file://vesafb-tng-1.0-rc2-2.6.20-rc2.patch;patch=1;status=external \
+           file://sharpsl-rc-r1.patch;patch=1 \
            file://defconfig-c7x0 \
            file://defconfig-hx2000 \
            file://defconfig-collie \