From 7655bbe08fce38e42a6d9e9350e4f6bf29da1b5a Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Fri, 10 Jul 2020 15:13:04 +0100 Subject: [PATCH] Import gpsbabel_1.7.0+ds-3.debian.tar.xz [dgit import tarball gpsbabel 1.7.0+ds-3 gpsbabel_1.7.0+ds-3.debian.tar.xz] --- .gitlab-ci.yml | 6 + README.Debian | 20 + changelog | 469 +++++++++ clean | 4 + control | 85 ++ copyright | 255 +++++ gpsbabel-doc.doc-base | 10 + gpsbabel-doc.docs | 2 + gpsbabel-doc.links | 1 + gpsbabel-gui.install | 4 + gpsbabel.docs | 2 + gpsbabel.install | 1 + gpsbabel.manpages | 1 + patches/0006-Use-system-zlib.patch | 921 ++++++++++++++++++ patches/0007-Use-system-shapelib.patch | 121 +++ ...-Drop-mac-libusb-libusb.h-dependency.patch | 21 + patches/cross.patch | 12 + patches/gmapbase.html-location | 11 + patches/gpsbabelfe_disable_version_check | 47 + .../gpsbabelfe_do-not-check-for-newer-version | 110 +++ ...gpsbabelfe_opt-in-for-usage-data-reporting | 12 + patches/htmldoc-location | 40 + patches/series | 9 + rules | 38 + source/format | 1 + watch | 3 + 26 files changed, 2206 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 README.Debian create mode 100644 changelog create mode 100644 clean create mode 100644 control create mode 100644 copyright create mode 100644 gpsbabel-doc.doc-base create mode 100644 gpsbabel-doc.docs create mode 100644 gpsbabel-doc.links create mode 100644 gpsbabel-gui.install create mode 100644 gpsbabel.docs create mode 100644 gpsbabel.install create mode 100644 gpsbabel.manpages create mode 100644 patches/0006-Use-system-zlib.patch create mode 100644 patches/0007-Use-system-shapelib.patch create mode 100644 patches/0009-Drop-mac-libusb-libusb.h-dependency.patch create mode 100644 patches/cross.patch create mode 100644 patches/gmapbase.html-location create mode 100644 patches/gpsbabelfe_disable_version_check create mode 100644 patches/gpsbabelfe_do-not-check-for-newer-version create mode 100644 patches/gpsbabelfe_opt-in-for-usage-data-reporting create mode 100644 patches/htmldoc-location create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format create mode 100644 watch diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..5c575a1 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,6 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + +variables: + RELEASE: 'unstable' diff --git a/README.Debian b/README.Debian new file mode 100644 index 0000000..b5d597c --- /dev/null +++ b/README.Debian @@ -0,0 +1,20 @@ +If you are having trouble with your Garmin USB device, the garmin_usb +kernel module may have grabbed it. + +According to http://www.gpsbabel.org/os/Linux_Hotplug.html, you can +prevent that by following these instructions: + +According to the documentation at gpsbabel: +http://www.gpsbabel.org/os/Linux_Hotplug.html + +To keep the OS from loading the (frequently dysfunctional) kernel +garmin_gps module, edit /etc/modprobe.d/blacklist and add the lines + +# stop garmin_gps serial from loading for USB garmin devices +blacklist garmin_gps + +To allow the USB devices to be read and written by a non-privileged +user, create a named /etc/udev/rules.d/51-garmin.rules with the following +contents: + +SYSFS{idVendor}=="091e", SYSFS{idProduct}=="0003", MODE="666" diff --git a/changelog b/changelog new file mode 100644 index 0000000..8f34773 --- /dev/null +++ b/changelog @@ -0,0 +1,469 @@ +gpsbabel (1.7.0+ds-3) unstable; urgency=medium + + * Fix test logic + + -- Jochen Sprickerhof Fri, 10 Jul 2020 16:13:04 +0200 + +gpsbabel (1.7.0+ds-2) unstable; urgency=medium + + * Update arch list that ignore test result + + -- Jochen Sprickerhof Fri, 10 Jul 2020 15:09:25 +0200 + +gpsbabel (1.7.0+ds-1) unstable; urgency=medium + + * New upstream version + * Update file excludes + * Update d/copyright + * Simplify d/watch + * rebase patches + * bump debhelper version (no changes) + * Depend on libusb-1.0-0-dev (Closes: #810420) + + -- Jochen Sprickerhof Thu, 09 Jul 2020 21:54:33 +0200 + +gpsbabel (1.6.0+ds-11) unstable; urgency=medium + + * Add patch for strcmp (Closes: #957304) + * bump policy version (no changes) + + -- Jochen Sprickerhof Tue, 21 Apr 2020 19:40:57 +0200 + +gpsbabel (1.6.0+ds-10) unstable; urgency=medium + + * [a1fdee8] Install gmapbase.html. + Also patch a useful path into gpsbabelfe. (LP: #1015886) + + -- Bernd Zeimetz Sun, 22 Dec 2019 00:27:08 +0100 + +gpsbabel (1.6.0+ds-9) unstable; urgency=medium + + * [a1fdee8] Install gmapbase.html. + Also patch a useful path into gpsbabelfe. (LP: #1015886) + + -- Bernd Zeimetz Sat, 21 Dec 2019 23:45:28 +0100 + +gpsbabel (1.6.0+ds-8) unstable; urgency=medium + + * Add patch for "super gps" + Thanks to Tim Connors (Closes: #935373) + + -- Jochen Sprickerhof Tue, 24 Sep 2019 22:09:09 +0200 + +gpsbabel (1.6.0+ds-7) unstable; urgency=medium + + * Drop old build dependency + * Fix build depends + + -- Jochen Sprickerhof Tue, 03 Sep 2019 23:46:06 +0200 + +gpsbabel (1.6.0+ds-6) unstable; urgency=medium + + * Use upstream manpage + (Closes: #522332, #618856, #803509, #803512, #698326, #862299) + * Drop note about quilt + * Add patch for cross compilation. + Thanks to Helmut Grohne (Closes: #934849) + + -- Jochen Sprickerhof Tue, 03 Sep 2019 21:28:10 +0200 + +gpsbabel (1.6.0+ds-5) unstable; urgency=medium + + * Only override build-arch in d/rules, fixes building on all + + -- Jochen Sprickerhof Fri, 26 Jul 2019 15:54:26 +0200 + +gpsbabel (1.6.0+ds-4) unstable; urgency=medium + + * Fix gpsbabel-gui package (Closes: #932875) + + -- Jochen Sprickerhof Fri, 26 Jul 2019 11:12:00 +0200 + +gpsbabel (1.6.0+ds-3) unstable; urgency=medium + + * Build pdf on mips again as #580333 was fixed + * Ignore test results on some architectures + + -- Jochen Sprickerhof Fri, 19 Jul 2019 14:08:44 +0200 + +gpsbabel (1.6.0+ds-2) unstable; urgency=medium + + * Build doc in build-indep + + -- Jochen Sprickerhof Fri, 19 Jul 2019 00:55:34 +0200 + +gpsbabel (1.6.0+ds-1) unstable; urgency=medium + + [ Jochen Sprickerhof ] + * Cleanup upstream sources + * New upstream version (Closes: #805355) + * Fix debian/source/format + * Add watch file + * Rebase patches + * Add patches to use system libraries + * Port to dh 12 (Closes: #912089) + * Update copyright + + [ Bernd Zeimetz ] + * Use gitlab-ci instead of travis + * Update Vcs-Git Urls. + + [ Jochen Sprickerhof ] + * Maintainer set to team and add myself as uploader + * Bump policy version (no changes) + + -- Jochen Sprickerhof Thu, 18 Jul 2019 23:32:20 +0200 + +gpsbabel (1.5.4-2) unstable; urgency=medium + + * [cc58f71] Move git repository to github. + * [fb44d98] Add a debian .travis.yml + * [28c7ad3] Don't build the gui on [!amd64 arm64 armhf i386 mipsel] + The recent qtwebengine is not available on all architectures. + Thanks to Adrian Bunk (Closes: #877808) + + -- Bernd Zeimetz Sat, 21 Oct 2017 13:37:08 +0200 + +gpsbabel (1.5.4-1) unstable; urgency=medium + + * [ee23f26] Merge branch 'upstream' + - New upstream version. + - Builds fine with gcc7. + Thanks to Adrian Bunk (Closes: #872744) + * [f340fb9] Refreshing patches. + * [8100370] export QT_SELECT=qt5 + * [522c580] Build for/with QT5. + Using as build-deps: + qtbase5-dev + qtwebengine5-dev + qttools5-dev-tools + Thanks to Dmitry Shachnev (Closes: #816808) + * [7d38162] Depend on dh 10 for comapt level 10. + * [ada8fa9] Fix building with recent QT5 versions. + * [d627435] Use qmake instead of qmake-qt4. + * [c08a568] Updating changelog. + + -- Bernd Zeimetz Mon, 28 Aug 2017 23:53:53 +0200 + +gpsbabel (1.5.3-2) unstable; urgency=medium + + * [b2954b1] Fix skytraq default values. + Taken from upstream + Thanks to Jeroen N. Witmond (Closes: #846945) + + -- Bernd Zeimetz Sun, 01 Jan 2017 22:06:31 +0100 + +gpsbabel (1.5.3-1) unstable; urgency=medium + + * [41ba336] Merge branch 'upstream' + * [9511cf2] removing extra gpsbabel directory from d/rules. + * [65959cd] Refreshing patches. + * [cd70dc1] ensur emissing minizip .o files are built + * [48328e9] Fix help2man call for gpsbabel + * [bf2c668] Bump dh compat level to 10. + * [ec910a4] Remove gpsbabel/ from some more places. + + -- Bernd Zeimetz Sun, 27 Nov 2016 16:18:18 +0100 + +gpsbabel (1.5.2-1) unstable; urgency=medium + + * [fda6f38] Merge branch 'upstream' + * [901aac0] Refreshing patches. + + -- Bernd Zeimetz Sun, 25 Oct 2015 20:36:55 +0100 + +gpsbabel (1.5.0-3) unstable; urgency=medium + + * [5b27c1cd] Install gpsbabel.html only. + Remove php-ized htmldoc folder. + The whole documentation is available as pdf anyway. + Thanks to Axel Beckert (Closes: #755457) + + -- Bernd Zeimetz Mon, 04 Aug 2014 16:23:33 +0200 + +gpsbabel (1.5.0-2) unstable; urgency=medium + + * [d7bbdd34] Add menu and desktop files for gpsbabel-gui. + Thanks to Julien Valroff (Closes: #592799) + * [c8c9fc34] Ignore make check results for now. + Checks fail on various architectures due to endianess/byte ordering + issues or due to floating point numbers not being completely equal. + * [bd0b02a9] Build-depend on locales-all. + make check needs the en_US.UTF8 locale. + + -- Bernd Zeimetz Wed, 14 May 2014 22:19:45 +0200 + +gpsbabel (1.5.0-1) unstable; urgency=medium + + * [72ac73df] Support nocheck in DEB_BUILD_OPTIONS. + * [3eb772af] Importing upstream version 1.4.4 + * [91e94593] Refreshing patches. + * [d9a07846] Updating changelog. + * [e089d5ab] Merging upstream 1.5.0 + * [77258acf] Refreshing patches + * [cba6d75d] Create/clean autogen directory. + + -- Bernd Zeimetz Tue, 13 May 2014 01:19:24 +0200 + +gpsbabel (1.4.3-1) unstable; urgency=low + + * New upstream release (Closes: #660476) + * [0754cb61] Merge branch 'upstream' + * [0dc59f07] Merge branch 'upstream' + * [337703bb] Refreshing patches. + * [6e23bc91] Migrate debian/rules and .install files to gpsbabel subdirectory. + + -- Bernd Zeimetz Wed, 16 May 2012 23:28:46 +0200 + +gpsbabel (1.4.2-3) unstable; urgency=low + + * [64bae20c] Use libqtwebkit-dev as build-dependency. (Closes: #629742) + + -- Bernd Zeimetz Mon, 04 Jul 2011 16:17:13 +0200 + +gpsbabel (1.4.2-2) unstable; urgency=low + + * [8251cb18] Work around the issues of the sbuild internal resolver. + + -- Bernd Zeimetz Tue, 15 Feb 2011 11:12:09 +0100 + +gpsbabel (1.4.2-1) unstable; urgency=low + + * [15f28bac] gpsbabel-gui needs to depend on gpsbabel. + Add the missing dependency. + * [e5c3f560] Build-depend on libqtwebkit-dev for recent QT versions. + * [709bd4d9] Merge branch 'upstream' + * [f0e46422] Refreshing patches for new upstream version. + + -- Bernd Zeimetz Mon, 14 Feb 2011 14:14:26 +0100 + +gpsbabel (1.4.0-1) unstable; urgency=low + + * New upstream version. + * [37a299e3] Merge branch 'upstream' + * [01923dca] Removing limited_pointer_type_comparison_fixes patch, + applied upstream. + * [4d4ea8f8] Refreshing patches. + * [f4ef9d52] Add various patches to integrate gpsbabelfe better into + Debian. + - Submitting statistics data should be opt-in instead of + activated by default + - Disable check for newer versions. apt-get/aptitude takes care of that. + - Disable check for version differences between gpsbabelfe and gpsbabel. + The check did not work as expected and dpkg ensures there is + no difference. + + -- Bernd Zeimetz Wed, 23 Jun 2010 01:44:11 +0200 + +gpsbabel (1.3.7~cvs2-3) unstable; urgency=low + + * [b76106eb] Rename gpsbabel.doc-base parts to stop confusing + dh_installdocs. + * [0c9397ce] Split documentation into gpsbabel-doc. + * [08e7b6ec] Fix build target dependency for build-doc. + + -- Bernd Zeimetz Thu, 06 May 2010 12:12:41 +0200 + +gpsbabel (1.3.7~cvs2-2) unstable; urgency=low + + * [014dfaaa] Use $(QUILT_STAMPFN) instead of patch as dependency. This + avoids running configure twice. + * [75bd04e0] Require make check to succeed for a successful build. + * [fe9c247b] Better dependencies for the install target. + * [9a028647] Remove build-dependencies on texlive. The tex based + documentation is not being built anymore. + * [182c909d] Fix various comparison errors due to limited pointer + types. + * [f6d8e680] Use -ffloat-store on i386. + * [760285e1] Do not build gpsbabel.pdf on mips as fop is broken there. + + -- Bernd Zeimetz Thu, 06 May 2010 00:31:46 +0200 + +gpsbabel (1.3.7~cvs2-1) unstable; urgency=low + + * Updating to CVS HEAD of today. + * [09ce2bac] Build pdf file again, for works fine now. + * [3542f981] Require dh 7 for compat level 7. + * [5f340180] Do some housekeeping in debian/rules. + * [fd477016] Merge branch 'upstream' + * [5f1d5231] Clean gui/setup.iss after build. + * [56dd1e9b] Rename htmldoc directory and change the references to it. + * [05194507] Install docs only into the gpsbabel package. + * [e932db97] Build a manpage for gpsbabel using help2man. + * [dd121ff7] Merge remote branch 'origin/upstream-cvs' + * [475d34c2] gpsbabel is reuired to build the manpage. Add a proper + dependency to the target. + * [74b24bde] Don't call clean in doc, not built anymore. + * [90bb4cc5] Add AUTHORS file to docs. + * [a807b146] Install gpsbabel.pdf to /usr/share/doc/gpsbabel. + * [d65fa27d] Move doc production into its own target. + * [8e6e25a7] Delete all automatically generated and left over files. + * [851f5a32] Use source format 1.0 for easy backporting. + * [788292c2] Bump Standards-Version to 3.8.4 - no changes needed. + * [db9f500a] Add doc-base information for gpsbabel. + + -- Bernd Zeimetz Wed, 05 May 2010 00:25:48 +0200 + +gpsbabel (1.3.7~cvs1-1) unstable; urgency=low + + * Updating to CVS HEAD of today. + * [4d21a068] Drop Debian's gpsbabel manapge. + * [a350b9f6] Update patches for current gpsbabel beta. + * [0516a23a] Bump debhelper compat level to 7. + * [f964f0e2] Do no require make check to pass for a successful build. + * [f2f46177] Add install file for gpsbabel gui. + * [1ce3dba8] Don't call makeextras.mak, the file is gone. + * [f590f252] Add patch to rename the gpsbabelfe binary. + * [e686c93a] Add fop as build-dependency to build the documentation. + * [1bcda881] Update debian/copyright file. + + -- Bernd Zeimetz Mon, 26 Apr 2010 14:24:21 +0200 + +gpsbabel (1.3.6+cvs1-1) experimental; urgency=low + + * Updating to latest CVS head + (c0af31ca669e2ea66ad33a27f23f0efffef2c948). + + -- Bernd Zeimetz Tue, 07 Apr 2009 18:06:49 +0200 + +gpsbabel (1.3.6-3) unstable; urgency=low + + * debian/patches: + - Adding 'osm-char-int-cast-bug-fix' patch to remove an unneeded + cast from int to char and back to int which resulted in a broken + osm module on some architectures. + + -- Bernd Zeimetz Wed, 07 Jan 2009 16:12:17 +0100 + +gpsbabel (1.3.6-2) unstable; urgency=low + + * debian/rules: + - Enable 'make doc' again, it was accidentally left disabled. + + -- Bernd Zeimetz Wed, 07 Jan 2009 00:05:46 +0100 + +gpsbabel (1.3.6-1) unstable; urgency=low + + * Imported Upstream version 1.3.6 + * Dropping Debian specific patches which were applied to the source + directly. They should not be needed anymore. + * debian/rules: + - Cleaning up unused lines. + - Don't ignore make check failures. + * debian/control: + - Setting myself as maintainer in agreement with John Goerzen. + Thanks to John for maintaining the package until now! + - Updating Vcs fields to reflect the new location of the git + repository. + - Bumping Standards-Version to 3.8.0 - no changes needed. + - Adding libpaper-dev as Build-Dependency as an appropriate + dependency is missing in docbook-xsl. + - Adding quilt Build-Dep to handle patches. + * debian/dirs: dropping file, not needed anymore. + * debian/patches: + - Adding patch to stop building gpsbabel.pdf as fop is not in main. + * debian/README.source: + - Adding file to describe the use of quilt. + * debian/watch: + - Dropping file, author doesn't provide useful download pages anymore. + + -- Bernd Zeimetz Tue, 06 Jan 2009 16:12:28 +0100 + +gpsbabel (1.3.5-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fixing FTBFS (Closes: #491364) + * debian/control: + - adding autoconf and autotools-dev as build dependencies as + Package falied to build from source (Closes: #491364) + * debian/rules: + - Copying config.sub/guess from autotools-dev + - Don't ignore errors on clean, fixing a lintian warning. + + -- Bernd Zeimetz Sun, 20 Jul 2008 21:36:20 +0200 + +gpsbabel (1.3.5-1) unstable; urgency=low + + * New upstream release. Closes: #480449. + + -- John Goerzen Wed, 16 Jul 2008 13:04:50 -0500 + +gpsbabel (1.3.4-2) unstable; urgency=low + + * Add Homepage and Vcs-* lines to Debian/control. + + -- John Goerzen Sun, 02 Mar 2008 08:52:21 -0600 + +gpsbabel (1.3.4-1) unstable; urgency=low + + * New upstream release. Closes: #459234. Upstream has dropped + Coldsync. Closes: #421769. + * Update debian/copyright. + * Add garmin_usb info to README.Debian. Closes: #344702. + + -- John Goerzen Thu, 14 Feb 2008 05:50:31 -0600 + +gpsbabel (1.3.3-2) unstable; urgency=low + + * Added build-dep on texlive-base. Closes: #427620. + * Fixed path of binary. Closes: #427365. + + -- John Goerzen Tue, 05 Jun 2007 01:48:37 -0500 + +gpsbabel (1.3.3-1) unstable; urgency=low + + * New upstream release. Closes: #330416, #419884. + * Added manpage for Joaquim Ortega-Cerda. Closes: #342324. + * Fixed typo in debian/copyright. Closes: #421769. + + -- John Goerzen Fri, 01 Jun 2007 02:28:54 -0500 + +gpsbabel (1.3.2-2) unstable; urgency=high + + * Fix doc generation. Closes: #403092. + + -- John Goerzen Mon, 18 Dec 2006 05:53:16 -0600 + +gpsbabel (1.3.2-1) unstable; urgency=low + + * New upstream version. Closes: #383899, #380533, #304178. + * Style docs now included. Closes: #348986. (Note: README.style + no longer exists) + + -- John Goerzen Fri, 17 Nov 2006 03:57:30 -0600 + +gpsbabel (1.2.7-1) unstable; urgency=low + + * New upstream version. Closes: #317559. + + -- John Goerzen Tue, 11 Oct 2005 05:31:39 -0500 + +gpsbabel (1.2.5+1.2.6-beta20050608-1) unstable; urgency=low + + * New usptream version. Closes: #315227. + * New version includes support for USB. Closes: #315134. + * New upstream version already has patch for my_rd_deinit. + Closes: #315164. + + -- John Goerzen Tue, 21 Jun 2005 05:59:58 -0500 + +gpsbabel (1.2.4-2) unstable; urgency=low + + * make check failure no longer causes build failure. There are apparently + a lot of minor differences in rounding on different archs that were + causing this. Closes: #294717. + + -- John Goerzen Mon, 14 Mar 2005 10:39:57 -0600 + +gpsbabel (1.2.4-1) unstable; urgency=low + + * New upstream release. Closes: #291544. + + -- John Goerzen Thu, 27 Jan 2005 11:08:20 -0600 + +gpsbabel (1.2.3-1) unstable; urgency=low + + * Initial Release. Closes: #270812. + + -- John Goerzen Thu, 9 Sep 2004 08:14:00 -0500 + diff --git a/clean b/clean new file mode 100644 index 0000000..cdd0b99 --- /dev/null +++ b/clean @@ -0,0 +1,4 @@ +debian/doctmp/ +debian/doctmpcapabilities.inc +debian/gpsbabel.1 +debian/gpsbabel.xpm diff --git a/control b/control new file mode 100644 index 0000000..93705fd --- /dev/null +++ b/control @@ -0,0 +1,85 @@ +Source: gpsbabel +Section: utils +Priority: optional +Maintainer: Debian GPS team +Uploaders: Bernd Zeimetz , Jochen Sprickerhof +Build-Depends: debhelper-compat (= 13), + pkg-config, + libexpat1-dev, expat, + libxml2-utils, + libusb-1.0-0-dev, zlib1g-dev, + libshp-dev, + qt5-default, + qtwebengine5-dev [amd64 arm64 armhf i386 mipsel], + qttools5-dev-tools, + imagemagick, + locales-all, + xsltproc, + docbook-xsl +Build-Depends-Indep: fop, docbook-xml, libpaper-dev +Standards-Version: 4.5.0 +Rules-Requires-Root: no +Homepage: http://www.gpsbabel.org/ +Vcs-Git: https://salsa.debian.org/debian-gps-team/pkg-gpsbabel.git +Vcs-Browser: https://salsa.debian.org/debian-gps-team/pkg-gpsbabel + +Package: gpsbabel +Architecture: any +Recommends: gpsbabel-doc +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: GPS file conversion plus transfer to/from GPS units + GPSBabel converts waypoints, tracks, and routes from one format to + another, whether that format is a common mapping format like Delorme, + Streets and Trips, or even a serial upload or download to a GPS unit + such as those from Garmin and Magellan. + . + GPSBabel supports dozens of data formats and will be useful for tasks + such as geocaching, mapping, and converting from one GPS unit to another. + Among the interesting formats it supports are several GPS devices via + a serial link, various PDA-based mapping programs, and various + Geocaching data formats. + . + Among others GPSBabel supports the following formats: + . + Cetus, CoPilot Flight Planner, CSV, Custom CSV, Delorme Street Atlas, + Delorme Street Atlas 2004 Plus, Delorms GPS Log, Delorme routes, + DNA, EasyGPS Binary, Fugawi, Garmin serial, Geocaching.com loc, + GeocachingDB, Geoniche, GPilotS, GPSDrive, GPSman, GPSPilot, + gpsutil, GPX, Holux, IGC, Magellan serial, Magellan SD, + Magellan Navigator Companion, Mapopolis.Com Mapconverter, Mapsend, + Mapsource, Maptech, Microsoft Streets and Trips, Navicache, + Netstumbler, NIMA/GNIS Geographic Names, NMEA sentences, OziExplorer, + PalmDoc, PCX5, PocketStreets 2002 Pushpin, PSITrex, Quovadis, + Tab-separated data, Tiger, TopoMapPro, Topo by National Geographic, + xcsv, xmap, xmapwpt. + +Package: gpsbabel-doc +Architecture: all +Multi-Arch: foreign +Section: doc +Depends: ${misc:Depends} +Suggests: gpsbabel, pdf-viewer | www-browser +Description: GPS file conversion plus transfer to/from GPS units - documentation + GPSBabel converts waypoints, tracks, and routes from one format to + another, whether that format is a common mapping format like Delorme, + Streets and Trips, or even a serial upload or download to a GPS unit + such as those from Garmin and Magellan. + . + GPSBabel supports dozens of data formats and will be useful for tasks + such as geocaching, mapping, and converting from one GPS unit to another. + Among the interesting formats it supports are several GPS devices via + a serial link, various PDA-based mapping programs, and various + Geocaching data formats. + . + This package contains the detailed documentation of gpsbabel. + +Package: gpsbabel-gui +Architecture: amd64 arm64 armhf i386 mipsel +Depends: ${shlibs:Depends}, ${misc:Depends}, gpsbabel (= ${binary:Version}) +Description: GPS file conversion plus transfer to/from GPS units - GUI + GPSBabel converts waypoints, tracks, and routes from one format to + another, whether that format is a common mapping format like Delorme, + Streets and Trips, or even a serial upload or download to a GPS unit + such as those from Garmin and Magellan. + . + This package contains gpsbabelfe, a QT based frontend for gpsbabel. diff --git a/copyright b/copyright new file mode 100644 index 0000000..6eeb9aa --- /dev/null +++ b/copyright @@ -0,0 +1,255 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Files-Excluded: gui/serial_mac.cc + mac + mingw + shapelib + tools/qtci + tools/uploadtool + zlib +Comment: serial_mac, mac, mingw, qtci, uploadtool: unused + shapelib, zlib: packaged in Debian + +Files: * +Copyright: 2002, Alex Mottram + 2008, Alexander Stapff + 2008, Andreas Grimme + 2006, Andy Armstrong + 2008, Björn Augustsson + 2004, Chris Jones + 2009, Chris Tracy + 2006, Curtis E. Mills + 2008, Dr. Jrgen Neumann + 2008, Dustin Johnson + 2009, Erez Zuler + 2010, Eriks Zelenka + 2005-2006, Etienne Tasse + 2011, Fernando Arbeiza + 2005, Fredie Kern + 1998, Gerald Combs + 2014, Gleb Smirnoff, glebius @t FreeBSD d.t org + 2012, Guilhem Bonnefille + 2007, Gunar Megger <0xff@quantentunnel.de> + 2005, Gustavo Niemeyer + 2014, Jean-Claude Repetto + 2007, Jeremy Ehrhardt + 2012, Jeremy Mortis + 2014, Jim Keeler + 2002, Jochen Becker + 2003, Mark Bradley + 2019, Martin Buck + 2008-2019, Mathias Adam + 2010, Michael von Glasow, michael @t vonglasow d.t com + 2007, Mirko Parthey + 2012, Nicolas Boullis + 2005-2008, Olaf Klein + 2011, Paul Brook + 2009, Paul Cornett + 1998, Paul J. Lucas + 2002, Paul Tomblin + 2007, Per Borgentun + 2020, Pierre Bernard + 2014-2020, Ralf Horstmann + 2003, Rick Richardson + 2001-2020, Robert Lipe + 2008, Rodney Lorrimar + 2003-2014, Ronald L. Parker + 2004, Scott Brynen + 2005, Steve Chamberlin + 2009, Tal Benavidor + 2009, Tobias Kretschmar + 2005, Tobias Minich + 2007, Tom Hughes + 2014, Zingo Andersen + 2012-2016, Zingo Andersen + 2009, jekaeff + 2013, xiao jian cheng + 2007, Mark McClure + 2009, S. Khai Mong +License: GPL-2+ + +Files: jeeps/gpsapp.cc + jeeps/gpscom.cc + jeeps/gpsfmt.cc + jeeps/gpsmath.cc + jeeps/gpsmem.cc + jeeps/gpsproj.cc + jeeps/gpsprot.cc + jeeps/gpsread.cc + jeeps/gpsrqst.cc + jeeps/gpssend.cc + jeeps/gpsserial.cc + jeeps/jgpsutil.cc + strptime.c +Copyright: 2007, Achim Schumacher + 1999-2000, Alan Bleasby + 2010, Martin Buck + 2004-2006, Robert Lipe +License: LGPL-2+ + +Files: m4/* +Copyright: 2008, Benjamin Kosnik + 2014-2015, Google Inc.; contributed by Alexey Sokolov + 2016, Krzesimir Nowak + 2015, Moritz Klammler + 2015, Paul Norman + 2013, Roy Stogner + 2008, Tim Toolan + 2012, Zack Weinberg +License: FSFAP + +Files: build-aux/* +Copyright: 1992-2014, Free Software Foundation, Inc +License: GPL-3+ with AutoConf exception + +Files: deprecated/queue.h +Copyright: 2002-2005, Robert Lipe + 2001, Simon Tatham +License: Expat or GPL-2+ + +Files: build-aux/install-sh +Copyright: 1994, X Consortium +License: Expat + +Files: configure +Copyright: 1992-2012, Free Software Foundation, Inc +License: FSFUL + +Files: aclocal.m4 +Copyright: 1996-2017, Free Software Foundation, Inc +License: FSFULLR + +Files: debian/* +License: GPL-2+ +Copyright: 2004-2008, John Goerzen + 208-2017, Bernd Zeimetz + 2019, Jochen Sprickerhof + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +License: FSFAP + Copying and distribution of this file, with or without modification, are + permitted in any medium without royalty provided the copyright notice + and this notice are preserved. This file is offered as-is, without any + warranty. + +License: FSFUL + This file is free software; the Free Software Foundation gives + gives unlimited permission to copy, distribute and modify it. + +License: FSFULLR + This file is free software; the Free Software Foundation + gives unlimited permission to copy and/or distribute it, + with or without modifications, as long as this notice is preserved. + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + . + On Debian GNU/Linux systems, the complete text of the GNU General + Public License version 2 can be found in + `/usr/share/common-licenses/GPL-2'. + +License: GPL-3+ with AutoConf exception + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + On Debian systems, the complete text of the GNU General Public + License version 3 can be found in /usr/share/common-licenses/GPL-3. + . + Under Section 7 of GPL version 3, you are granted additional + permissions described in the Autoconf Configure Script Exception, + version 3.0, as published by the Free Software Foundation. + . + The Autoconf Configure Script Exception version 3 is below: + . + AUTOCONF CONFIGURE SCRIPT EXCEPTION + Version 3.0, 18 August 2009 + . + This Exception is an additional permission under section 7 of the GNU + General Public License, version 3 ("GPLv3"). It applies to a given + file that bears a notice placed by the copyright holder of the file + stating that the file is governed by GPLv3 along with this Exception. + . + The purpose of this Exception is to allow distribution of Autoconf's + typical output under terms of the recipient's choice (including + proprietary). + . + 0. Definitions + . + "Covered Code" is the source or object code of a version of Autoconf + that is a covered work under this License. + . + "Normally Copied Code" for a version of Autoconf means all parts of + its Covered Code which that version can copy from its code (i.e., not + from its input file) into its minimally verbose, non-debugging and + non-tracing output. + . + "Ineligible Code" is Covered Code that is not Normally Copied Code. + . + 1. Grant of Additional Permission. + . + You have permission to propagate output of Autoconf, even if such + propagation would otherwise violate the terms of GPLv3. However, if + by modifying Autoconf you cause any Ineligible Code of the version you + received to become Normally Copied Code of your modified version, then + you void this Exception for the resulting covered work. If you convey + that resulting covered work, you must remove this Exception in accordance + with the second paragraph of Section 7 of GPLv3. + . + 2. No Weakening of Autoconf Copyleft. + . + The availability of this Exception does not imply any general presumption + that third-party software is unaffected by the copyleft requirements of + the license of Autoconf. + +License: LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + On Debian systems, the complete text of the GNU Lesser General Public + License version 2 can be found in /usr/share/common-licenses/LGPL-2. + diff --git a/gpsbabel-doc.doc-base b/gpsbabel-doc.doc-base new file mode 100644 index 0000000..ea8d6b9 --- /dev/null +++ b/gpsbabel-doc.doc-base @@ -0,0 +1,10 @@ +Document: gpsbabel +Title: gpsbabel filter and format documentation +Section: Science/Geoscience + +Format: HTML +Files: /usr/share/doc/gpsbabel/gpsbabel.html +Index: /usr/share/doc/gpsbabel/gpsbabel.html + +Format: PDF +Files: /usr/share/doc/gpsbabel/gpsbabel.pdf.gz diff --git a/gpsbabel-doc.docs b/gpsbabel-doc.docs new file mode 100644 index 0000000..9f7267b --- /dev/null +++ b/gpsbabel-doc.docs @@ -0,0 +1,2 @@ +gpsbabel.html +gpsbabel.pdf diff --git a/gpsbabel-doc.links b/gpsbabel-doc.links new file mode 100644 index 0000000..0a5be16 --- /dev/null +++ b/gpsbabel-doc.links @@ -0,0 +1 @@ +usr/share/doc/gpsbabel usr/share/doc/gpsbabel-doc/doc diff --git a/gpsbabel-gui.install b/gpsbabel-gui.install new file mode 100644 index 0000000..30392ad --- /dev/null +++ b/gpsbabel-gui.install @@ -0,0 +1,4 @@ +gui/objects/gpsbabelfe /usr/bin +debian/gpsbabel.xpm /usr/share/pixmaps +gui/gpsbabel.desktop /usr/share/applications +gui/gmapbase.html /usr/share/gpsbabel diff --git a/gpsbabel.docs b/gpsbabel.docs new file mode 100644 index 0000000..5734f62 --- /dev/null +++ b/gpsbabel.docs @@ -0,0 +1,2 @@ +README.* +AUTHORS diff --git a/gpsbabel.install b/gpsbabel.install new file mode 100644 index 0000000..9e0436b --- /dev/null +++ b/gpsbabel.install @@ -0,0 +1 @@ +usr/bin/gpsbabel diff --git a/gpsbabel.manpages b/gpsbabel.manpages new file mode 100644 index 0000000..d4c44be --- /dev/null +++ b/gpsbabel.manpages @@ -0,0 +1 @@ +debian/gpsbabel.1 diff --git a/patches/0006-Use-system-zlib.patch b/patches/0006-Use-system-zlib.patch new file mode 100644 index 0000000..3f52da7 --- /dev/null +++ b/patches/0006-Use-system-zlib.patch @@ -0,0 +1,921 @@ +From: Jochen Sprickerhof +Date: Thu, 30 May 2019 12:09:43 +0200 +Subject: Use system zlib + +--- + Makefile.in | 404 ++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 185 insertions(+), 219 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 5ace8da..be6f7d0 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -55,7 +55,7 @@ LRELEASE=@LRELEASE@ + # + #OPTIMIZATION=-O $(EXTRA_OPTIMIZATION) + #DEBUGGING=-g $(EXTRA_DEBUGGING) +-GBCFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) $(BUILD_CPP) @ZLIB_CPP@ @QT_INC_OPT@$(QT_INC) \ ++GBCFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) $(BUILD_CPP) @QT_INC_OPT@$(QT_INC) \ + $(OPTIMIZATION) -DHAVE_CONFIG_H + LDFLAGS=$(EXTRA_LDFLAGS) @LDFLAGS@ + PREFIX=@prefix@ +@@ -106,12 +106,6 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \ + + SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o + +-ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \ +- zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \ +- zlib/uncompr.o zlib/gzlib.o zlib/gzclose.o zlib/gzread.o \ +- zlib/gzwrite.o zlib/zutil.o +- +- + LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \ + csv_util.o strptime.o grtcirc.o util_crc.o xmlgeneric.o \ + formspec.o xmltag.o cet.o cet_util.o fatal.o rgbcolors.o \ +@@ -120,7 +114,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \ + src/core/textstream.o \ + src/core/usasciicodec.o \ + src/core/xmlstreamwriter.o \ +- $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS) ++ $(GARMIN) $(JEEPS) $(SHAPE) $(FMTS) $(FILTERS) + OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ + + DEPFILES = $(OBJS:.o=.d) +@@ -424,86 +418,86 @@ mac/libusb/libusb-1.0.a: + cd mac/libusb; $(QMAKE) @abs_srcdir@/mac/libusb/libusb.pro && $(MAKE) + + # Machine generated from here down. +-alan.o: alan.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++alan.o: alan.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-an1.o: an1.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++an1.o: an1.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + an1sym.h +-arcdist.o: arcdist.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++arcdist.o: arcdist.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + arcdist.h filter.h grtcirc.h src/core/logging.h +-bcr.o: bcr.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++bcr.o: bcr.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + csv_util.h garmin_tables.h +-bend.o: bend.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++bend.o: bend.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + bend.h filter.h grtcirc.h +-brauniger_iq.o: brauniger_iq.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++brauniger_iq.o: brauniger_iq.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h gbser.h +-bushnell.o: bushnell.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++bushnell.o: bushnell.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-bushnell_trl.o: bushnell_trl.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++bushnell_trl.o: bushnell_trl.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-cet.o: cet.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++cet.o: cet.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet.h +-cet_util.o: cet_util.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++cet_util.o: cet_util.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h cet_util.h src/core/logging.h +-compegps.o: compegps.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++compegps.o: compegps.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h cet_util.h csv_util.h jeeps/gpsmath.h \ + jeeps/gpsport.h +-cst.o: cst.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++cst.o: cst.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h +-csv_util.o: csv_util.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++csv_util.o: csv_util.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h csv_util.h src/core/logging.h +-delgpl.o: delgpl.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++delgpl.o: delgpl.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-destinator.o: destinator.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++destinator.o: destinator.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ + jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ + jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ + strptime.h +-dg-100.o: dg-100.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++dg-100.o: dg-100.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + dg-100.h format.h gbser.h +-discard.o: discard.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++discard.o: discard.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + discard.h filter.h +-dmtlog.o: dmtlog.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++dmtlog.o: dmtlog.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + jeeps/gpsmath.h jeeps/gpsport.h xmlgeneric.h +-duplicate.o: duplicate.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++duplicate.o: duplicate.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h duplicate.h filter.h +-easygps.o: easygps.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++easygps.o: easygps.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-energympro.o: energympro.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++energympro.o: energympro.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h energympro.h format.h +-enigma.o: enigma.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++enigma.o: enigma.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-exif.o: exif.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++exif.o: exif.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + garmin_tables.h jeeps/gpsmath.h jeeps/gpsport.h +-explorist_ini.o: explorist_ini.cc defs.h config.h zlib/zlib.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ ++explorist_ini.o: explorist_ini.cc defs.h config.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h explorist_ini.h +-f90g_track.o: f90g_track.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++f90g_track.o: f90g_track.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-fatal.o: fatal.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++fatal.o: fatal.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + src/core/logging.h +-filter_vecs.o: filter_vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++filter_vecs.o: filter_vecs.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h filter_vecs.h arcdist.h filter.h bend.h discard.h \ + duplicate.h height.h heightgrid.h interpolate.h nukedata.h polygon.h \ +@@ -518,17 +512,17 @@ filter_vecs.o: filter_vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h yahoo.h +-formspec.o: formspec.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++formspec.o: formspec.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-g7towin.o: g7towin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++g7towin.o: g7towin.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h csv_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ + jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ + jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ + garmin_tables.h strptime.h +-garmin.o: garmin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++garmin.o: garmin.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h format.h garmin_device_xml.h garmin_fs.h jeeps/gps.h \ + jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ +@@ -540,101 +534,101 @@ garmin.o: garmin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \ + qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \ + unicsv.h src/core/textstream.h xcsv.h yahoo.h +-garmin_device_xml.o: garmin_device_xml.cc defs.h config.h zlib/zlib.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ ++garmin_device_xml.o: garmin_device_xml.cc defs.h config.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h garmin_device_xml.h \ + xmlgeneric.h +-garmin_fit.o: garmin_fit.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++garmin_fit.o: garmin_fit.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h garmin_fit.h format.h jeeps/gpsmath.h \ + jeeps/gpsport.h src/core/logging.h +-garmin_fs.o: garmin_fs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++garmin_fs.o: garmin_fs.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ + jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ + jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ + garmin_tables.h +-garmin_gpi.o: garmin_gpi.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++garmin_gpi.o: garmin_gpi.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h garmin_gpi.h cet_util.h garmin_fs.h jeeps/gps.h \ + jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ + jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ + jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ + jeeps/gpsrqst.h +-garmin_tables.o: garmin_tables.cc defs.h config.h zlib/zlib.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ ++garmin_tables.o: garmin_tables.cc defs.h config.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h garmin_tables.h \ + jeeps/gpsmath.h jeeps/gpsport.h src/core/logging.h \ + garmin_icon_tables.h +-garmin_txt.o: garmin_txt.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++garmin_txt.o: garmin_txt.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h csv_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ + jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ + jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ + garmin_tables.h src/core/textstream.h src/core/file.h strptime.h +-garmin_xt.o: garmin_xt.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++garmin_xt.o: garmin_xt.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-gbfile.o: gbfile.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gbfile.o: gbfile.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + src/core/logging.h cet.h +-gbser.o: gbser.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gbser.o: gbser.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + gbser.h gbser_private.h +-gbser_posix.o: gbser_posix.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++gbser_posix.o: gbser_posix.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h gbser.h gbser_private.h +-gdb.o: gdb.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gdb.o: gdb.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h garmin_tables.h \ + grtcirc.h +-geo.o: geo.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++geo.o: geo.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + src/core/file.h +-geojson.o: geojson.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++geojson.o: geojson.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + geojson.h format.h src/core/file.h src/core/logging.h +-ggv_bin.o: ggv_bin.cc ggv_bin.h defs.h config.h zlib/zlib.h zlib/zconf.h \ ++ggv_bin.o: ggv_bin.cc ggv_bin.h defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h format.h +-ggv_log.o: ggv_log.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++ggv_log.o: ggv_log.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + grtcirc.h +-ggv_ovl.o: ggv_ovl.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++ggv_ovl.o: ggv_ovl.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + grtcirc.h +-globals.o: globals.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++globals.o: globals.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + gbversion.h +-globalsat_sport.o: globalsat_sport.cc defs.h config.h zlib/zlib.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ ++globalsat_sport.o: globalsat_sport.cc defs.h config.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h globalsat_sport.h format.h \ + gbser.h +-glogbook.o: glogbook.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++glogbook.o: glogbook.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h src/core/file.h xmlgeneric.h +-gnav_trl.o: gnav_trl.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++gnav_trl.o: gnav_trl.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-googledir.o: googledir.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++googledir.o: googledir.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h xmlgeneric.h +-gopal.o: gopal.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gopal.o: gopal.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h csv_util.h grtcirc.h jeeps/gpsmath.h jeeps/gpsport.h \ + strptime.h +-gpssim.o: gpssim.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gpssim.o: gpssim.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + nmea.h format.h +-gpsutil.o: gpsutil.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gpsutil.o: gpsutil.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h magellan.h +-gpx.o: gpx.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gpx.o: gpx.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + gpx.h format.h src/core/file.h src/core/xmlstreamwriter.h \ + src/core/xmltag.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ +@@ -642,88 +636,88 @@ gpx.o: gpx.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ + jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ + garmin_tables.h src/core/logging.h +-grtcirc.o: grtcirc.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++grtcirc.o: grtcirc.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + grtcirc.h +-gtm.o: gtm.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gtm.o: gtm.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + jeeps/gpsmath.h jeeps/gpsport.h +-gtrnctr.o: gtrnctr.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gtrnctr.o: gtrnctr.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + xmlgeneric.h +-height.o: height.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++height.o: height.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + height.h filter.h heightgrid.h +-hiketech.o: hiketech.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++hiketech.o: hiketech.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h src/core/xmlstreamwriter.h xmlgeneric.h +-holux.o: holux.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++holux.o: holux.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + holux.h +-html.o: html.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++html.o: html.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + jeeps/gpsmath.h jeeps/gpsport.h src/core/xmltag.h +-humminbird.o: humminbird.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++humminbird.o: humminbird.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-igc.o: igc.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++igc.o: igc.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h +-ignrando.o: ignrando.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++ignrando.o: ignrando.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h xmlgeneric.h +-igo8.o: igo8.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++igo8.o: igo8.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-ik3d.o: ik3d.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++ik3d.o: ik3d.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + xmlgeneric.h +-inifile.o: inifile.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++inifile.o: inifile.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + src/core/file.h +-internal_styles.o: internal_styles.cc defs.h config.h zlib/zlib.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ ++internal_styles.o: internal_styles.cc defs.h config.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h +-interpolate.o: interpolate.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++interpolate.o: interpolate.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h interpolate.h filter.h grtcirc.h \ + src/core/logging.h +-itracku.o: itracku.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++itracku.o: itracku.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + gbser.h + jeeps/gpsapp.o: jeeps/gpsapp.cc jeeps/gps.h jeeps/../defs.h config.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \ + jeeps/gpsserial.h jeeps/gpsusbint.h + jeeps/gpscom.o: jeeps/gpscom.cc jeeps/gps.h jeeps/../defs.h config.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h + jeeps/gpsdevice.o: jeeps/gpsdevice.cc jeeps/gps.h jeeps/../defs.h \ +- config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ config.h formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsserial.h + jeeps/gpsdevice_ser.o: jeeps/gpsdevice_ser.cc jeeps/gps.h jeeps/../defs.h \ +- config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ config.h formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsserial.h + jeeps/gpsdevice_usb.o: jeeps/gpsdevice_usb.cc jeeps/gps.h jeeps/../defs.h \ +- config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ config.h formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \ + jeeps/gpsusbcommon.h jeeps/gpsusbint.h + jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/libusb.h \ +- jeeps/../defs.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h \ ++ jeeps/../defs.h formspec.h inifile.h gbfile.h \ + defs.h session.h src/core/datetime.h src/core/optional.h \ + jeeps/garminusb.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpsport.h \ + jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \ +@@ -731,95 +725,95 @@ jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/libusb.h \ + jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsusbcommon.h \ + jeeps/../garmin_device_xml.h + jeeps/gpsmath.o: jeeps/gpsmath.cc jeeps/gps.h jeeps/../defs.h config.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsdatum.h + jeeps/gpsmem.o: jeeps/gpsmem.cc jeeps/gps.h jeeps/../defs.h config.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h + jeeps/gpsprot.o: jeeps/gpsprot.cc jeeps/gps.h jeeps/../defs.h config.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h + jeeps/gpsread.o: jeeps/gpsread.cc jeeps/gps.h jeeps/../defs.h config.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsserial.h + jeeps/gpsrqst.o: jeeps/gpsrqst.cc jeeps/gps.h jeeps/../defs.h config.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h + jeeps/gpssend.o: jeeps/gpssend.cc jeeps/gps.h jeeps/../defs.h config.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsserial.h + jeeps/gpsserial.o: jeeps/gpsserial.cc jeeps/gps.h jeeps/../defs.h \ +- config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ config.h formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/../gbser.h \ + jeeps/gpsserial.h gbser_posix.h + jeeps/gpsusbcommon.o: jeeps/gpsusbcommon.cc jeeps/gps.h jeeps/../defs.h \ +- config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ config.h formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \ + jeeps/gpsusbcommon.h + jeeps/gpsusbread.o: jeeps/gpsusbread.cc jeeps/garminusb.h \ +- jeeps/gpsdevice.h jeeps/gps.h jeeps/../defs.h config.h zlib/zlib.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h defs.h session.h \ ++ jeeps/gpsdevice.h jeeps/gps.h jeeps/../defs.h config.h \ ++ formspec.h inifile.h gbfile.h defs.h session.h \ + src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ + jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \ + jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \ + jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsusbint.h + jeeps/gpsusbsend.o: jeeps/gpsusbsend.cc jeeps/gps.h jeeps/../defs.h \ +- config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ config.h formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \ + jeeps/gpsusbint.h + jeeps/jgpsutil.o: jeeps/jgpsutil.cc jeeps/gps.h jeeps/../defs.h config.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h +-jogmap.o: jogmap.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++jogmap.o: jogmap.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + garmin_tables.h jeeps/gpsmath.h jeeps/gpsport.h xmlgeneric.h +-jtr.o: jtr.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++jtr.o: jtr.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + csv_util.h nmea.h format.h +-kml.o: kml.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++kml.o: kml.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + kml.h format.h src/core/file.h src/core/xmlstreamwriter.h xmlgeneric.h \ + grtcirc.h src/core/logging.h src/core/xmltag.h units.h +-lmx.o: lmx.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++lmx.o: lmx.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + xmlgeneric.h +-lowranceusr.o: lowranceusr.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++lowranceusr.o: lowranceusr.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h lowranceusr.h format.h src/core/logging.h +-maggeo.o: maggeo.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++maggeo.o: maggeo.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + csv_util.h magellan.h +-magproto.o: magproto.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++magproto.o: magproto.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h explorist_ini.h format.h gbser.h magellan.h vecs.h \ + dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \ +@@ -831,7 +825,7 @@ magproto.o: magproto.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ + jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ + jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ + jeeps/gpsrqst.h yahoo.h +-main.o: main.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++main.o: main.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h csv_util.h filter.h filter_vecs.h arcdist.h bend.h \ + discard.h duplicate.h height.h heightgrid.h interpolate.h nukedata.h \ +@@ -846,191 +840,191 @@ main.o: main.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ + jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h yahoo.h +-mapasia.o: mapasia.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++mapasia.o: mapasia.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-mapbar_track.o: mapbar_track.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++mapbar_track.o: mapbar_track.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-mapfactor.o: mapfactor.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++mapfactor.o: mapfactor.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h src/core/file.h src/core/xmlstreamwriter.h +-mapsend.o: mapsend.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++mapsend.o: mapsend.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + mapsend.h magellan.h +-mkshort.o: mkshort.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++mkshort.o: mkshort.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet.h +-mmo.o: mmo.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++mmo.o: mmo.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-mtk_locus.o: mtk_locus.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++mtk_locus.o: mtk_locus.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h gbser.h +-mtk_logger.o: mtk_logger.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++mtk_logger.o: mtk_logger.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h gbser.h + mynav.o: mynav.cc src/core/textstream.h src/core/file.h defs.h config.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h mynav.h format.h +-navicache.o: navicache.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++navicache.o: navicache.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h cet_util.h src/core/file.h +-naviguide.o: naviguide.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++naviguide.o: naviguide.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h csv_util.h jeeps/gpsmath.h jeeps/gpsport.h +-navilink.o: navilink.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++navilink.o: navilink.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h gbser.h jeeps/gpsmath.h jeeps/gpsport.h navilink.h +-navitel.o: navitel.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++navitel.o: navitel.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + jeeps/gpsmath.h jeeps/gpsport.h +-netstumbler.o: netstumbler.cc cet_util.h defs.h config.h zlib/zlib.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ ++netstumbler.o: netstumbler.cc cet_util.h defs.h config.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h csv_util.h +-nmea.o: nmea.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++nmea.o: nmea.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + nmea.h format.h cet_util.h gbser.h jeeps/gpsmath.h jeeps/gpsport.h \ + src/core/logging.h strptime.h +-nmn4.o: nmn4.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++nmn4.o: nmn4.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h csv_util.h +-nukedata.o: nukedata.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++nukedata.o: nukedata.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h nukedata.h filter.h +-osm.o: osm.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++osm.o: osm.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + osm.h format.h xmlgeneric.h +-ozi.o: ozi.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++ozi.o: ozi.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + csv_util.h jeeps/gpsmath.h jeeps/gpsport.h src/core/textstream.h \ + src/core/file.h +-parse.o: parse.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++parse.o: parse.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + jeeps/gpsmath.h jeeps/gpsport.h +-pcx.o: pcx.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++pcx.o: pcx.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h csv_util.h garmin_tables.h +-pocketfms_bc.o: pocketfms_bc.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++pocketfms_bc.o: pocketfms_bc.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-pocketfms_fp.o: pocketfms_fp.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++pocketfms_fp.o: pocketfms_fp.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h xmlgeneric.h +-pocketfms_wp.o: pocketfms_wp.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++pocketfms_wp.o: pocketfms_wp.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h csv_util.h +-polygon.o: polygon.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++polygon.o: polygon.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + polygon.h filter.h +-position.o: position.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++position.o: position.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h grtcirc.h position.h filter.h + qstarz_bl_1000.o: qstarz_bl_1000.cc qstarz_bl_1000.h defs.h config.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h format.h src/core/logging.h +-radius.o: radius.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++radius.o: radius.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + radius.h filter.h grtcirc.h +-random.o: random.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++random.o: random.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + random.h format.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ + jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ + jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h +-raymarine.o: raymarine.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++raymarine.o: raymarine.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h csv_util.h +-reverse_route.o: reverse_route.cc defs.h config.h zlib/zlib.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ ++reverse_route.o: reverse_route.cc defs.h config.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h reverse_route.h filter.h +-rgbcolors.o: rgbcolors.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++rgbcolors.o: rgbcolors.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-route.o: route.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++route.o: route.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + grtcirc.h +-saroute.o: saroute.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++saroute.o: saroute.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + grtcirc.h +-sbn.o: sbn.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++sbn.o: sbn.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + navilink.h +-sbp.o: sbp.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++sbp.o: sbp.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + navilink.h +-session.o: session.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++session.o: session.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-shape.o: shape.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++shape.o: shape.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + shape.h format.h shapelib/shapefil.h + shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h + shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h + shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h +-skyforce.o: skyforce.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++skyforce.o: skyforce.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-skytraq.o: skytraq.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++skytraq.o: skytraq.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + gbser.h +-smplrout.o: smplrout.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++smplrout.o: smplrout.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h smplrout.h filter.h grtcirc.h +-sort.o: sort.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++sort.o: sort.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + sort.h filter.h +-src/core/textstream.o: src/core/textstream.cc defs.h config.h zlib/zlib.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ ++src/core/textstream.o: src/core/textstream.cc defs.h config.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h src/core/textstream.h \ + src/core/file.h + src/core/usasciicodec.o: src/core/usasciicodec.cc src/core/usasciicodec.h + src/core/xmlstreamwriter.o: src/core/xmlstreamwriter.cc \ + src/core/xmlstreamwriter.h +-stackfilter.o: stackfilter.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++stackfilter.o: stackfilter.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h stackfilter.h filter.h +-stmsdf.o: stmsdf.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++stmsdf.o: stmsdf.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h csv_util.h grtcirc.h jeeps/gpsmath.h jeeps/gpsport.h \ + src/core/logging.h +-stmwpp.o: stmwpp.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++stmwpp.o: stmwpp.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h csv_util.h + strptime.o: strptime.c config.h strptime.h +-subrip.o: subrip.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++subrip.o: subrip.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + subrip.h format.h src/core/logging.h +-swapdata.o: swapdata.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++swapdata.o: swapdata.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h swapdata.h filter.h +-tef_xml.o: tef_xml.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++tef_xml.o: tef_xml.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + xmlgeneric.h +-teletype.o: teletype.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++teletype.o: teletype.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-text.o: text.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++text.o: text.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + jeeps/gpsmath.h jeeps/gpsport.h src/core/xmltag.h +-tiger.o: tiger.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++tiger.o: tiger.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h csv_util.h +-tmpro.o: tmpro.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++tmpro.o: tmpro.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h csv_util.h +-tomtom.o: tomtom.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++tomtom.o: tomtom.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-tpg.o: tpg.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++tpg.o: tpg.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + jeeps/gpsmath.h jeeps/gpsport.h +-tpo.o: tpo.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++tpo.o: tpo.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + jeeps/gpsmath.h jeeps/gpsport.h +-trackfilter.o: trackfilter.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++trackfilter.o: trackfilter.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h trackfilter.h filter.h grtcirc.h +-transform.o: transform.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++transform.o: transform.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h transform.h filter.h +-unicsv.o: unicsv.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++unicsv.o: unicsv.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + unicsv.h format.h src/core/textstream.h src/core/file.h csv_util.h \ + garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ +@@ -1038,22 +1032,22 @@ unicsv.o: unicsv.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h garmin_tables.h \ + src/core/logging.h +-units.o: units.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++units.o: units.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + units.h +-util.o: util.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++util.o: util.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet.h src/core/logging.h src/core/xmltag.h + util_crc.o: util_crc.cc +-v900.o: v900.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++v900.o: v900.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-validate.o: validate.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++validate.o: validate.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h validate.h filter.h +-vcf.o: vcf.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++vcf.o: vcf.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + jeeps/gpsmath.h jeeps/gpsport.h +-vecs.o: vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++vecs.o: vecs.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + vecs.h dg-100.h format.h energympro.h garmin_fit.h geojson.h \ + src/core/file.h ggv_bin.h globalsat_sport.h gpx.h \ +@@ -1065,32 +1059,32 @@ vecs.o: vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ + jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h yahoo.h \ + gbversion.h src/core/logging.h +-vidaone.o: vidaone.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++vidaone.o: vidaone.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-vitosmt.o: vitosmt.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++vitosmt.o: vitosmt.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + grtcirc.h +-vitovtt.o: vitovtt.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++vitovtt.o: vitovtt.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-vpl.o: vpl.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++vpl.o: vpl.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-waypt.o: waypt.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++waypt.o: waypt.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h grtcirc.h \ + src/core/logging.h +-wbt-200.o: wbt-200.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++wbt-200.o: wbt-200.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + gbser.h grtcirc.h +-wfff_xml.o: wfff_xml.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++wfff_xml.o: wfff_xml.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h xmlgeneric.h +-wintec_tes.o: wintec_tes.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++wintec_tes.o: wintec_tes.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-xcsv.o: xcsv.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++xcsv.o: xcsv.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + csv_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ +@@ -1098,46 +1092,18 @@ xcsv.o: xcsv.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h grtcirc.h \ + src/core/logging.h src/core/textstream.h src/core/file.h strptime.h \ + xcsv.h format.h xcsv_tokens.gperf +-xmlgeneric.o: xmlgeneric.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++xmlgeneric.o: xmlgeneric.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h xmlgeneric.h src/core/file.h +-xmltag.o: xmltag.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++xmltag.o: xmltag.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + src/core/xmltag.h +-xol.o: xol.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++xol.o: xol.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + garmin_tables.h jeeps/gpsmath.h jeeps/gpsport.h src/core/file.h \ + src/core/xmlstreamwriter.h xmlgeneric.h +-yahoo.o: yahoo.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++yahoo.o: yahoo.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + yahoo.h format.h xmlgeneric.h +-zlib/adler32.o: zlib/adler32.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \ +- config.h +-zlib/compress.o: zlib/compress.c zlib/zlib.h zlib/zconf.h config.h +-zlib/crc32.o: zlib/crc32.c zlib/zutil.h zlib/zlib.h zlib/zconf.h config.h \ +- zlib/crc32.h +-zlib/deflate.o: zlib/deflate.c zlib/deflate.h zlib/zutil.h zlib/zlib.h \ +- zlib/zconf.h config.h +-zlib/gzclose.o: zlib/gzclose.c zlib/gzguts.h zlib/zlib.h zlib/zconf.h \ +- config.h +-zlib/gzlib.o: zlib/gzlib.c zlib/gzguts.h zlib/zlib.h zlib/zconf.h \ +- config.h +-zlib/gzread.o: zlib/gzread.c zlib/gzguts.h zlib/zlib.h zlib/zconf.h \ +- config.h +-zlib/gzwrite.o: zlib/gzwrite.c zlib/gzguts.h zlib/zlib.h zlib/zconf.h \ +- config.h +-zlib/infback.o: zlib/infback.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \ +- config.h zlib/inftrees.h zlib/inflate.h zlib/inffast.h zlib/inffixed.h +-zlib/inffast.o: zlib/inffast.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \ +- config.h zlib/inftrees.h zlib/inflate.h zlib/inffast.h +-zlib/inflate.o: zlib/inflate.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \ +- config.h zlib/inftrees.h zlib/inflate.h zlib/inffast.h zlib/inffixed.h +-zlib/inftrees.o: zlib/inftrees.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \ +- config.h zlib/inftrees.h +-zlib/trees.o: zlib/trees.c zlib/deflate.h zlib/zutil.h zlib/zlib.h \ +- zlib/zconf.h config.h zlib/trees.h +-zlib/uncompr.o: zlib/uncompr.c zlib/zlib.h zlib/zconf.h config.h +-zlib/zutil.o: zlib/zutil.c zlib/zutil.h zlib/zlib.h zlib/zconf.h config.h \ +- zlib/gzguts.h + internal_styles.cc: mkstyle.sh $(srcdir)/style/*.style + $(srcdir)/mkstyle.sh > internal_styles.cc || (rm -f internal_styles.cc ; exit 1) diff --git a/patches/0007-Use-system-shapelib.patch b/patches/0007-Use-system-shapelib.patch new file mode 100644 index 0000000..43a601b --- /dev/null +++ b/patches/0007-Use-system-shapelib.patch @@ -0,0 +1,121 @@ +From: Jochen Sprickerhof +Date: Thu, 30 May 2019 12:10:23 +0200 +Subject: Use system shapelib + +--- + Makefile.in | 17 ++++++----------- + configure.ac | 3 +++ + shape.cc | 2 +- + shape.h | 2 +- + 4 files changed, 11 insertions(+), 13 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index be6f7d0..d277644 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -104,8 +104,6 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \ + # Extra modules in Jeeps that we don't use + # jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o + +-SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o +- + LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \ + csv_util.o strptime.o grtcirc.o util_crc.o xmlgeneric.o \ + formspec.o xmltag.o cet.o cet_util.o fatal.o rgbcolors.o \ +@@ -507,7 +505,7 @@ filter_vecs.o: filter_vecs.cc defs.h config.h \ + ggv_bin.h globalsat_sport.h gpx.h src/core/xmlstreamwriter.h \ + src/core/xmltag.h kml.h xmlgeneric.h legacyformat.h lowranceusr.h \ + mynav.h nmea.h osm.h qstarz_bl_1000.h random.h shape.h \ +- shapelib/shapefil.h subrip.h unicsv.h src/core/textstream.h xcsv.h \ ++ subrip.h unicsv.h src/core/textstream.h xcsv.h \ + garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ +@@ -532,7 +530,7 @@ garmin.o: garmin.cc defs.h config.h formspec.h \ + dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \ + globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \ + kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \ +- qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \ ++ qstarz_bl_1000.h random.h shape.h subrip.h \ + unicsv.h src/core/textstream.h xcsv.h yahoo.h + garmin_device_xml.o: garmin_device_xml.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h \ +@@ -819,7 +817,7 @@ magproto.o: magproto.cc defs.h config.h \ + dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \ + globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \ + kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \ +- qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \ ++ qstarz_bl_1000.h random.h shape.h subrip.h \ + unicsv.h src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h \ + jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ + jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ +@@ -835,7 +833,7 @@ main.o: main.cc defs.h config.h formspec.h \ + garmin_fit.h geojson.h ggv_bin.h globalsat_sport.h gpx.h \ + src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \ + legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \ +- random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \ ++ random.h shape.h subrip.h unicsv.h \ + src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ + jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ +@@ -955,10 +953,7 @@ session.o: session.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h + shape.o: shape.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ +- shape.h format.h shapelib/shapefil.h +-shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h +-shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h +-shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h ++ shape.h format.h + skyforce.o: skyforce.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +@@ -1053,7 +1048,7 @@ vecs.o: vecs.cc defs.h config.h formspec.h \ + src/core/file.h ggv_bin.h globalsat_sport.h gpx.h \ + src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \ + legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \ +- random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \ ++ random.h shape.h subrip.h unicsv.h \ + src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ + jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ +diff --git a/configure.ac b/configure.ac +index cdfe3f9..96316d4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -67,6 +67,9 @@ AC_ARG_ENABLE([shapefile], + [AS_VAR_SET([enable_shapefile], [yes])]) + AS_IF([test "$enable_shapefile" = "yes"], [ + AC_DEFINE(SHAPELIB_ENABLED, 1, [1 to enable shapefile support]) ++ PKG_CHECK_MODULES(SHAPELIB, shapelib) ++ CPPFLAGS="$CPPFLAGS $SHAPELIB_CFLAGS" ++ LIBS="$LIBS $SHAPELIB_LIBS" + ]) + AC_MSG_RESULT([$enable_shapefile]) + +diff --git a/shape.cc b/shape.cc +index 933eb95..6295599 100644 +--- a/shape.cc ++++ b/shape.cc +@@ -32,7 +32,7 @@ + + #include "defs.h" + #include "shape.h" +-#include "shapelib/shapefil.h" ++#include + + + #if SHAPELIB_ENABLED +diff --git a/shape.h b/shape.h +index 0ce05af..aa3a0bf 100644 +--- a/shape.h ++++ b/shape.h +@@ -27,7 +27,7 @@ + + #include "defs.h" // for arglist_t, ARGTYPE_STRING, Waypoint, route_head, CET_CHARSET_ASCII, FF_CAP_RW_ALL, ff_cap, ff_type, ff_type_file + #include "format.h" // for Format +-#include "shapelib/shapefil.h" // for DBFHandle, SHPAPI_CALL, SHPHandle ++#include // for DBFHandle, SHPAPI_CALL, SHPHandle + + + #if SHAPELIB_ENABLED diff --git a/patches/0009-Drop-mac-libusb-libusb.h-dependency.patch b/patches/0009-Drop-mac-libusb-libusb.h-dependency.patch new file mode 100644 index 0000000..196aa3f --- /dev/null +++ b/patches/0009-Drop-mac-libusb-libusb.h-dependency.patch @@ -0,0 +1,21 @@ +From: Jochen Sprickerhof +Date: Thu, 9 Jul 2020 21:59:38 +0200 +Subject: Drop mac/libusb/libusb.h dependency + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index d277644..b43e3d4 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -714,7 +714,7 @@ jeeps/gpsdevice_usb.o: jeeps/gpsdevice_usb.cc jeeps/gps.h jeeps/../defs.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \ + jeeps/gpsusbcommon.h jeeps/gpsusbint.h +-jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/libusb.h \ ++jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h \ + jeeps/../defs.h formspec.h inifile.h gbfile.h \ + defs.h session.h src/core/datetime.h src/core/optional.h \ + jeeps/garminusb.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpsport.h \ diff --git a/patches/cross.patch b/patches/cross.patch new file mode 100644 index 0000000..010e5a2 --- /dev/null +++ b/patches/cross.patch @@ -0,0 +1,12 @@ +--- gpsbabel-1.6.0+ds.orig/configure.ac ++++ gpsbabel-1.6.0+ds/configure.ac +@@ -304,7 +304,8 @@ + [AC_MSG_RESULT(rpath required)], + [AC_MSG_FAILURE(loader cannot find Qt library) + LDFLAGS="$OLDFLAGS"] +- )] ++ )], ++ [AC_MSG_RESULT(cross. assuming rpath not needed)] + ) + CPPFLAGS="$OCPPFLAGS" + LIBS="$OLIBS" diff --git a/patches/gmapbase.html-location b/patches/gmapbase.html-location new file mode 100644 index 0000000..bbfe44c --- /dev/null +++ b/patches/gmapbase.html-location @@ -0,0 +1,11 @@ +--- a/gui/map.cc ++++ b/gui/map.cc +@@ -90,7 +90,7 @@ Map::Map(QWidget* parent, + connect(mclicker, SIGNAL(logTime(QString)), this, SLOT(logTime(QString))); + #endif + +- QString baseFile = QApplication::applicationDirPath() + "/gmapbase.html"; ++ QString baseFile = "/usr/share/gpsbabel/gmapbase.html"; + if (!QFile(baseFile).exists()) { + QMessageBox::critical(nullptr, appName, + tr("Missing \"gmapbase.html\" file. Check installation")); diff --git a/patches/gpsbabelfe_disable_version_check b/patches/gpsbabelfe_disable_version_check new file mode 100644 index 0000000..60bd3a2 --- /dev/null +++ b/patches/gpsbabelfe_disable_version_check @@ -0,0 +1,47 @@ +Disable version mismatch check. + +--- a/gui/preferences.ui ++++ b/gui/preferences.ui +@@ -53,13 +53,6 @@ + + + +- +- +- +- Ignore mismatch between command line and GUI version. +- +- +- + + + +--- a/gui/preferences.cc ++++ b/gui/preferences.cc +@@ -43,7 +43,6 @@ Preferences::Preferences(QWidget* parent, QList& formatList, + + ui_.startupCheck->setChecked(babelData_.startupVersionCheck_); + ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_); +- ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_); + // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1. + if (VERSION == QString("1.4.1")) { + babelData_.ignoreVersionMismatch_ = false; +@@ -87,7 +86,6 @@ void Preferences::acceptClicked() + + babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked(); + babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked(); +- babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked(); + accept(); + } + +--- a/gui/babeldata.h ++++ b/gui/babeldata.h +@@ -67,7 +67,7 @@ public: + startupVersionCheck_(true), + reportStatistics_(true), + allowBetaUpgrades_(false), +- ignoreVersionMismatch_(false), ++ ignoreVersionMismatch_(true), + disableDonateDialog_(false), + donateSplashed_(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0))) + { diff --git a/patches/gpsbabelfe_do-not-check-for-newer-version b/patches/gpsbabelfe_do-not-check-for-newer-version new file mode 100644 index 0000000..80471a9 --- /dev/null +++ b/patches/gpsbabelfe_do-not-check-for-newer-version @@ -0,0 +1,110 @@ +Disable check for newer versions on start. + +--- a/gui/preferences.ui ++++ b/gui/preferences.ui +@@ -40,13 +40,6 @@ + + + +- +- +- Check for newer version on start. +- +- +- +- + + + Anonymously report usage data. +--- a/gui/preferences.cc ++++ b/gui/preferences.cc +@@ -41,7 +41,6 @@ Preferences::Preferences(QWidget* parent, QList& formatList, + { + ui_.setupUi(this); + +- ui_.startupCheck->setChecked(babelData_.startupVersionCheck_); + ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_); + // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1. + if (VERSION == QString("1.4.1")) { +@@ -84,7 +83,6 @@ void Preferences::acceptClicked() + formatList_[i].setHidden(item->checkState() == Qt::Unchecked); + } + +- babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked(); + babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked(); + accept(); + } +--- a/gui/babeldata.h ++++ b/gui/babeldata.h +@@ -64,7 +64,7 @@ public: + upgradeErrors_(0), + upgradeOffers_(0), + runCount_(0), +- startupVersionCheck_(true), ++ startupVersionCheck_(false), + reportStatistics_(false), + allowBetaUpgrades_(false), + ignoreVersionMismatch_(true), +--- a/gui/mainwinui.ui ++++ b/gui/mainwinui.ui +@@ -691,7 +691,6 @@ + + + +- + + + +@@ -720,11 +719,6 @@ + Preferences... + + +- +- +- Check for Upgrade +- +- + + + Visit Website... +--- a/gui/mainwindow.cc ++++ b/gui/mainwindow.cc +@@ -174,7 +174,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) + connect(ui_.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX())); + connect(ui_.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX())); + connect(ui_.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX())); +- connect(ui_.actionUpgradeCheck, SIGNAL(triggered()), this, SLOT(upgradeCheckActionX())); + connect(ui_.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX())); + + connect(ui_.inputFormatCombo, SIGNAL(currentIndexChanged(int)), +@@ -231,19 +230,7 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) + + //--- Restore from registry + restoreSettings(); +- + upgrade = new UpgradeCheck(parent, formatList_, babelData_); +- if (babelData_.startupVersionCheck_) { +- upgrade->checkForUpgrade(babelVersion_, babelData_.upgradeCheckTime_, +- allowBetaUpgrades()); +- } +- +- if (!babelData_.ignoreVersionMismatch_ && babelVersion_ != VERSION) { +- VersionMismatch vm(nullptr, babelVersion_, QString(VERSION)); +- +- vm.exec(); +- babelData_.ignoreVersionMismatch_ = vm.neverAgain(); +- } + } + + //------------------------------------------------------------------------ +@@ -1068,10 +1055,6 @@ void MainWindow::applyActionX() + //------------------------------------------------------------------------ + void MainWindow::closeActionX() + { +- QDateTime wt= upgrade->getUpgradeWarningTime(); +- if (wt.isValid()) { +- babelData_.upgradeCheckTime_ = wt; +- } + babelData_.runCount_++; + + QDateTime now = QDateTime::currentDateTime(); diff --git a/patches/gpsbabelfe_opt-in-for-usage-data-reporting b/patches/gpsbabelfe_opt-in-for-usage-data-reporting new file mode 100644 index 0000000..6cd4c20 --- /dev/null +++ b/patches/gpsbabelfe_opt-in-for-usage-data-reporting @@ -0,0 +1,12 @@ +Make statistics reporting an opt-in option. +--- a/gui/babeldata.h ++++ b/gui/babeldata.h +@@ -65,7 +65,7 @@ public: + upgradeOffers_(0), + runCount_(0), + startupVersionCheck_(true), +- reportStatistics_(true), ++ reportStatistics_(false), + allowBetaUpgrades_(false), + ignoreVersionMismatch_(true), + disableDonateDialog_(false), diff --git a/patches/htmldoc-location b/patches/htmldoc-location new file mode 100644 index 0000000..ea07cbd --- /dev/null +++ b/patches/htmldoc-location @@ -0,0 +1,40 @@ +--- a/gbversion.h.in ++++ b/gbversion.h.in +@@ -13,5 +13,5 @@ + #define VER_PRODUCT_STR "@GBMAJOR@.@GBMINOR@.@GBMICRO@@PACKAGE_RELEASE@" + #else + #define VERSION "@GBMAJOR@.@GBMINOR@.@GBMICRO@@PACKAGE_RELEASE@" +-#define WEB_DOC_DIR "https://www.gpsbabel.org/htmldoc-@DOCVERSION@" ++#define WEB_DOC_DIR "file:///usr/share/doc/gpsbabel/gpsbabel.html" + #endif +--- a/testo.d/serialization.test ++++ b/testo.d/serialization.test +@@ -7,7 +7,7 @@ + # the GUI and the document. + # We do a compare_nole as specific whitespace is part of deserialization. + gpsbabel -^3 > ${TMPDIR}/format3.txt +-sed 's,https://www.gpsbabel.org/htmldoc-.[^/]*/,https://www.gpsbabel.org/WEB_DOC_DIR/,' ${TMPDIR}/format3.txt >${TMPDIR}/format3.fiddled.txt ++sed 's,file:///usr/share/doc/gpsbabel/gpsbabel.html/,https://www.gpsbabel.org/WEB_DOC_DIR/,' ${TMPDIR}/format3.txt >${TMPDIR}/format3.fiddled.txt + compare_nole ${REFERENCE}/format3.txt ${TMPDIR}/format3.fiddled.txt + gpsbabel -^2 > ${TMPDIR}/format2.txt + compare_nole ${REFERENCE}/format2.txt ${TMPDIR}/format2.txt +@@ -16,7 +16,7 @@ compare_nole ${REFERENCE}/format1.txt ${TMPDIR}/format1.txt + gpsbabel -^0 > ${TMPDIR}/format0.txt + compare_nole ${REFERENCE}/format0.txt ${TMPDIR}/format0.txt + gpsbabel -%1 > ${TMPDIR}/filter1.txt +-sed 's,https://www.gpsbabel.org/htmldoc-.[^/]*/,https://www.gpsbabel.org/WEB_DOC_DIR/,' ${TMPDIR}/filter1.txt >${TMPDIR}/filter1.fiddled.txt ++sed 's,file:///usr/share/doc/gpsbabel/gpsbabel.html/,https://www.gpsbabel.org/WEB_DOC_DIR/,' ${TMPDIR}/filter1.txt >${TMPDIR}/filter1.fiddled.txt + compare_nole ${REFERENCE}/filter1.txt ${TMPDIR}/filter1.fiddled.txt + gpsbabel -%0 > ${TMPDIR}/filter0.txt + compare_nole ${REFERENCE}/filter0.txt ${TMPDIR}/filter0.txt +--- a/xmldoc/gpsbabel_man.xml ++++ b/xmldoc/gpsbabel_man.xml +@@ -118,7 +118,7 @@ or as the backend for other tools. + + + +- Lists of filters and formats are given in the doc at https://www.gpsbabel.org. ++ Lists of filters and formats are given in the doc at /usr/share/doc/gpsbabel/. + + + See Also diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..9eeb150 --- /dev/null +++ b/patches/series @@ -0,0 +1,9 @@ +gpsbabelfe_disable_version_check +gpsbabelfe_opt-in-for-usage-data-reporting +gpsbabelfe_do-not-check-for-newer-version +htmldoc-location +0006-Use-system-zlib.patch +0007-Use-system-shapelib.patch +cross.patch +gmapbase.html-location +0009-Drop-mac-libusb-libusb.h-dependency.patch diff --git a/rules b/rules new file mode 100755 index 0000000..056b7a2 --- /dev/null +++ b/rules @@ -0,0 +1,38 @@ +#!/usr/bin/make -f + +%: + dh $@ + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DOCTEMP = $(CURDIR)/debian/doctmp +include /usr/share/dpkg/pkg-info.mk + +# Extended precision on i386 results in weird bugs, so we build +# with -ffloat-store. +ifneq (,$(filter $(DEB_BUILD_ARCH),i386)) +CFLAGS += -ffloat-store +endif + +override_dh_auto_configure: + dh_auto_configure -- \ + --with-zlib=system \ + --with-doc=$(DOCTEMP) \ + --prefix=/usr + convert -resize 32x32 gui/images/appicon.png debian/gpsbabel.xpm + xsltproc --output debian/gpsbabel.1 /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl xmldoc/gpsbabel_man.xml + +override_dh_auto_build-arch: + dh_auto_build + if dpkg -s qtwebengine5-dev; then $(MAKE) gui; fi + +override_dh_auto_build-indep: + $(MAKE) doc + $(MAKE) gpsbabel.html + +# Ignore broken unit tests on some architectures +override_dh_auto_test: +ifneq (,$(filter $(DEB_BUILD_ARCH),i386 s390x sparc64)) + dh_auto_test || true +else + dh_auto_test +endif diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/watch b/watch new file mode 100644 index 0000000..720aa00 --- /dev/null +++ b/watch @@ -0,0 +1,3 @@ +version=4 +opts="uversionmangle=tr/_/./, repacksuffix=+ds, dversionmangle=s/\+ds//" \ +https://github.com/gpsbabel/gpsbabel/tags (?:.*?/)gpsbabel_(\d[\d_]*)\.tar\.gz -- 2.30.2