[oe-commits] org.oe.dev merge of '2f6a75703ff201034fac5c3a14baf261f8eb2b94'

[oe commit]

merge of '2f6a75703ff201034fac5c3a14baf261f8eb2b94'
     and '6e404b0729a59d47868eceeec95ed68998b51090'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 84faa8309d20a2d72895ea64790f085a69d15fab
ViewMTN: http://monotone.openembedded.org/revision.psp?id=84faa8309d20a2d72895ea64790f085a69d15fab
Files:
1
packages/xorg-util/makedepend-native_1.0.1.bb
packages/tslib/tslib/htctornado/tslib.sh
packages/tslib/tslib/htctornado/ts.conf
packages/tslib/tslib_1.0.bb
Diffs:

#
# mt diff -r2f6a75703ff201034fac5c3a14baf261f8eb2b94 -r84faa8309d20a2d72895ea64790f085a69d15fab
#
# 
# 
# patch "packages/xorg-util/makedepend-native_1.0.1.bb"
#  from [78b179556261b85dcff7b1d824cb47fda685c5a8]
#    to [2fa373a4635f8f5e54384a66aacd2efbfe8a2fe7]
# 
============================================================
--- packages/xorg-util/makedepend-native_1.0.1.bb	78b179556261b85dcff7b1d824cb47fda685c5a8
+++ packages/xorg-util/makedepend-native_1.0.1.bb	2fa373a4635f8f5e54384a66aacd2efbfe8a2fe7
@@ -1,7 +1,8 @@ DESCRIPTION = "create dependencies in ma
 require xorg-util-common.inc
 inherit native
 
 DESCRIPTION = "create dependencies in makefiles"
+DEPENDS = "xproto-native"
 PR = "r1"
 PE = "1"
 


#
# mt diff -r6e404b0729a59d47868eceeec95ed68998b51090 -r84faa8309d20a2d72895ea64790f085a69d15fab
#
# 
# 
# delete "packages/tslib/tslib/htctornado/tslib.sh"
# 
# add_file "packages/tslib/tslib/htctornado/ts.conf"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# patch "packages/tslib/tslib_1.0.bb"
#  from [f07f9416c5b2bf045a4b37e9132c0533a9344d61]
#    to [d61e7fbdba448eea4a9e938eaf4d56a7ce5aa7df]
# 
============================================================
--- packages/tslib/tslib/htctornado/ts.conf	da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ packages/tslib/tslib/htctornado/ts.conf	da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- packages/tslib/tslib_1.0.bb	f07f9416c5b2bf045a4b37e9132c0533a9344d61
+++ packages/tslib/tslib_1.0.bb	d61e7fbdba448eea4a9e938eaf4d56a7ce5aa7df
@@ -1,10 +1,10 @@ LICENSE = "LGPL"
 DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library."
 HOMEPAGE = "http://tslib.berlios.de/"
 AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
 LICENSE = "LGPL"
 
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
            file://tslib-input_raw-grab_events.patch;patch=1 \