Browse Source

* debian/patches:

- garmin-usb-fix.dpatch, gpxlogger-gps.h.dpatch,
    gpsd_dbus.h-buildfix.dpatch: Removed, integrated upstream.

git-svn-id: https://ssl.recluse.de/svn/debian/packages/gpsd/trunk@503 9c2cd6cd-4e54-406b-9ece-f07a8ab7d216
tags/debian/2.37-6
bzed 13 years ago
parent
commit
f359d6aba0
5 changed files with 4 additions and 81 deletions
  1. +4
    -1
      debian/changelog
  2. +0
    -6
      debian/patches/00list
  3. +0
    -37
      debian/patches/garmin-usb-fix.dpatch
  4. +0
    -19
      debian/patches/gpsd_dbus.h-buildfix.dpatch
  5. +0
    -18
      debian/patches/gpxlogger-gps.h.dpatch

+ 4
- 1
debian/changelog View File

@@ -6,8 +6,11 @@ gpsd (2.37rc1-1) unstable; urgency=low
- A bit of housekeeping and cruft removal.
* debian/libgps-dev.install:
- File added (instead of handling this in debian/rules).
* debian/patches:
- garmin-usb-fix.dpatch, gpxlogger-gps.h.dpatch,
gpsd_dbus.h-buildfix.dpatch: Removed, integrated upstream.

-- Bernd Zeimetz <bzed@debian.org> Sun, 17 Feb 2008 13:00:48 +0100
-- Bernd Zeimetz <bzed@debian.org> Sun, 17 Feb 2008 13:15:52 +0100

gpsd (2.36-2) unstable; urgency=low



+ 0
- 6
debian/patches/00list View File

@@ -1,10 +1,4 @@
no-gps-manpage
default_units.dpatch
gpsd.hotplug_location.dpatch
gpxlogger-gps.h
INSTALL-description-fix
gpsd_dbus.h-buildfix


#bugfixes:
garmin-usb-fix

+ 0
- 37
debian/patches/garmin-usb-fix.dpatch View File

@@ -1,37 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## garmin-usb-fix.dpatch by Bernd Zeimetz <bzed@debian.org>
##
## DP: r4656 - fix for garmin USB devices. Thanks to P.C. Chan.

@DPATCH@
diff -urNad gpsd~/packet.c gpsd/packet.c
--- gpsd~/packet.c 2007-12-28 04:13:48.000000000 +0100
+++ gpsd/packet.c 2008-01-13 11:36:05.000000000 +0100
@@ -440,17 +440,23 @@
#if defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE) || defined(GARMIN_ENABLE)
case DLE_LEADER:
#ifdef EVERMORE_ENABLE
- if (c == STX)
+ if (c == STX) {
lexer->state = EVERMORE_LEADER_2;
+ break;
+ }
#endif /* EVERMORE_ENABLE */
#if defined(TSIP_ENABLE) || defined(GARMIN_ENABLE) || defined(NAVCOM_ENABLE)
/* garmin is special case of TSIP */
/* check last because there's no checksum */
- if (c >= 0x13)
+ if (c >= 0x13) {
lexer->state = TSIP_PAYLOAD;
- if (c == DLE)
+ break;
+ }
+ if (c == DLE) {
lexer->state = GROUND_STATE;
- break;
+ break;
+ }
+ // FALL-THRU!!!!! no break here
#endif /* TSIP_ENABLE */
#ifdef NAVCOM_ENABLE
case NAVCOM_LEADER_1:

+ 0
- 19
debian/patches/gpsd_dbus.h-buildfix.dpatch View File

@@ -1,19 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## gpsd_dbus.h-buildfix.dpatch by Bernd Zeimetz <bzed@debian.org>
##
## DP: r4543 | esr | 2007-12-12 22:34:19 +0100 (Wed, 12 Dec 2007) | 2 lines
## DP: Renable building with DBUS.

@DPATCH@
diff -urNad gpsd~/gpsd_dbus.h gpsd/gpsd_dbus.h
--- gpsd~/gpsd_dbus.h 2007-06-01 23:17:26.000000000 +0200
+++ gpsd/gpsd_dbus.h 2007-12-15 02:13:51.000000000 +0100
@@ -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);

+ 0
- 18
debian/patches/gpxlogger-gps.h.dpatch View File

@@ -1,18 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## gpxlogger-gps.h.dpatch by Bernd Zeimetz <bernd@bzed.de>
##
## DP: fixing an implicit declaration

@DPATCH@
diff -urNad gpsd~/gpxlogger.c gpsd/gpxlogger.c
--- gpsd~/gpxlogger.c 2006-12-15 00:43:39.000000000 +0100
+++ gpsd/gpxlogger.c 2007-10-14 21:22:13.000000000 +0200
@@ -15,6 +15,8 @@
#include <glib/gprintf.h>
#include "gpsd_config.h"
+#include "gps.h"
+
DBusConnection* connection;
static char *author = "Amaury Jacquot";

Loading…
Cancel
Save