Browse Source

* debian/patches:

- Adding garmin-usb-fix.dpatch (r4656 from svn) to fix the broken Garmin
    USB driver. Thanks to P.C. Chan for the help to find the breakage.
    (Closes: #457684)

git-svn-id: https://ssl.recluse.de/svn/debian/packages/gpsd/trunk@480 9c2cd6cd-4e54-406b-9ece-f07a8ab7d216
tags/debian/2.37-6
bzed 13 years ago
parent
commit
868f963d30
3 changed files with 50 additions and 0 deletions
  1. +9
    -0
      debian/changelog
  2. +4
    -0
      debian/patches/00list
  3. +37
    -0
      debian/patches/garmin-usb-fix.dpatch

+ 9
- 0
debian/changelog View File

@@ -1,3 +1,12 @@
gpsd (2.36-2) unstable; urgency=low

* debian/patches:
- Adding garmin-usb-fix.dpatch (r4656 from svn) to fix the broken Garmin
USB driver. Thanks to P.C. Chan for the help to find the breakage.
(Closes: #457684)

-- Bernd Zeimetz <bzed@debian.org> Sun, 13 Jan 2008 11:49:55 +0100

gpsd (2.36-1) unstable; urgency=low

* New upstream release.


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

@@ -4,3 +4,7 @@ gpsd.hotplug_location.dpatch
gpxlogger-gps.h
INSTALL-description-fix
gpsd_dbus.h-buildfix


#bugfixes:
garmin-usb-fix

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

@@ -0,0 +1,37 @@
#! /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:

Loading…
Cancel
Save