From 0816f16f207a8f877cee48ac8714f3adae6114a9 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Thu, 3 Jan 2008 13:05:26 +0000
Subject: gpsd: update to 2.36, drop 2.35.

---
 packages/gpsd/gpsd-2.35/.mtn2git_empty  |  0
 packages/gpsd/gpsd-2.35/gpsd_dbus.patch | 11 -----------
 packages/gpsd/gpsd_2.35.bb              |  8 --------
 packages/gpsd/gpsd_2.36.bb              |  3 +++
 4 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 packages/gpsd/gpsd-2.35/.mtn2git_empty
 delete mode 100644 packages/gpsd/gpsd-2.35/gpsd_dbus.patch
 delete mode 100644 packages/gpsd/gpsd_2.35.bb
 create mode 100644 packages/gpsd/gpsd_2.36.bb

diff --git a/packages/gpsd/gpsd-2.35/.mtn2git_empty b/packages/gpsd/gpsd-2.35/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/gpsd/gpsd-2.35/gpsd_dbus.patch b/packages/gpsd/gpsd-2.35/gpsd_dbus.patch
deleted file mode 100644
index 215b0ecce9..0000000000
--- a/packages/gpsd/gpsd-2.35/gpsd_dbus.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpsd-2.35/gpsd_dbus.h.old	2008-01-02 20:54:33.000000000 -0600
-+++ gpsd-2.35/gpsd_dbus.h	2008-01-02 20:55:35.000000000 -0600
-@@ -6,6 +6,8 @@
- 
- #include <dbus/dbus.h>
- 
-+#include "gpsd.h"
-+
- int initialize_dbus_connection (void);
- void send_dbus_fix (struct gps_device_t* channel);
- 
diff --git a/packages/gpsd/gpsd_2.35.bb b/packages/gpsd/gpsd_2.35.bb
deleted file mode 100644
index fcc5c76070..0000000000
--- a/packages/gpsd/gpsd_2.35.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-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"
diff --git a/packages/gpsd/gpsd_2.36.bb b/packages/gpsd/gpsd_2.36.bb
new file mode 100644
index 0000000000..58e9ebeee2
--- /dev/null
+++ b/packages/gpsd/gpsd_2.36.bb
@@ -0,0 +1,3 @@
+require gpsd.inc
+
+PR = "r0"
-- 
cgit v1.2.3


From 6540294a6e516730508e4ebbee20f539a984b795 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Thu, 3 Jan 2008 13:34:49 +0000
Subject: gpsd.inc: fix staging

---
 packages/gpsd/gpsd.inc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc
index d493b2bca7..be593e0744 100644
--- a/packages/gpsd/gpsd.inc
+++ b/packages/gpsd/gpsd.inc
@@ -32,10 +32,9 @@ do_install_prepend() {
 }
 
 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() {
-- 
cgit v1.2.3