[oe-commits] org.oe.dev merge of '42ff173cbe3d22d33fbc21116ae54424b99451c8'

[xora commit]

merge of '42ff173cbe3d22d33fbc21116ae54424b99451c8'
     and '75652b38a37c44ad34823f4fc6e67b212f2d6ec2'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 49d63989ff625988d6bb90696a2abb7d3fc939bb
ViewMTN: http://monotone.openembedded.org/revision/info/49d63989ff625988d6bb90696a2abb7d3fc939bb
Files:
1
packages/gpsd/gpsd-2.35
packages/gpsd/gpsd-2.35/gpsd_dbus.patch
packages/gpsd/gpsd_2.35.bb
packages/gpsd/gpsd_2.36.bb
packages/gpsd/gpsd.inc
conf/distro/include/preferred-om-2008-versions.inc
Diffs:

#
# mt diff -r42ff173cbe3d22d33fbc21116ae54424b99451c8 -r49d63989ff625988d6bb90696a2abb7d3fc939bb
#
# 
# 
# delete "packages/gpsd/gpsd-2.35"
# 
# delete "packages/gpsd/gpsd-2.35/gpsd_dbus.patch"
# 
# rename "packages/gpsd/gpsd_2.35.bb"
#     to "packages/gpsd/gpsd_2.36.bb"
# 
# patch "packages/gpsd/gpsd.inc"
#  from [6ccdc1d0e17c682348f2cf4bf46c24536c69178d]
#    to [91e167633095484f711ff118e87bf2839f7105b2]
# 
# patch "packages/gpsd/gpsd_2.36.bb"
#  from [47bd5369a4431a93392a18786271350401f12f9e]
#    to [fcf9fa136398ac80a6cb1c8408ac6df26d0ddeaf]
# 
============================================================
--- packages/gpsd/gpsd.inc	6ccdc1d0e17c682348f2cf4bf46c24536c69178d
+++ packages/gpsd/gpsd.inc	91e167633095484f711ff118e87bf2839f7105b2
@@ -32,10 +32,9 @@ do_stage() {
 }
 
 do_stage() {
-        oe_libinstall -so -C ${S}/.libs libgps ${STAGING_LIBDIR}
-        install -m 0655 ${S}/libgps.la ${STAGING_LIBDIR}
-        install -m 0655 ${S}/gps.h ${STAGING_INCDIR}
-        install -m 0655 ${S}/gpsd.h ${STAGING_INCDIR}
+        oe_libinstall -so libgps ${STAGING_LIBDIR}
+        install -m 0644 ${S}/gps.h ${STAGING_INCDIR}
+        install -m 0644 ${S}/gpsd.h ${STAGING_INCDIR}
 }
 
 do_install_append() {
============================================================
--- packages/gpsd/gpsd_2.35.bb	47bd5369a4431a93392a18786271350401f12f9e
+++ packages/gpsd/gpsd_2.36.bb	fcf9fa136398ac80a6cb1c8408ac6df26d0ddeaf
@@ -1,8 +1,3 @@ require gpsd.inc
 require gpsd.inc
 
-SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \
-           file://gpsd-default \
-           file://gpsd \
-           file://gpsd_dbus.patch;patch=1 "
-
 PR = "r0"


#
# mt diff -r75652b38a37c44ad34823f4fc6e67b212f2d6ec2 -r49d63989ff625988d6bb90696a2abb7d3fc939bb
#
# 
# 
# add_file "conf/distro/include/preferred-om-2008-versions.inc"
#  content [f09fc00fcb956472364428627b653deb21fa27ae]
# 
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	f09fc00fcb956472364428627b653deb21fa27ae
+++ conf/distro/include/preferred-om-2008-versions.inc	f09fc00fcb956472364428627b653deb21fa27ae
@@ -0,0 +1 @@
+PREFERRED_VERSION_vte = "0.16.10"