[hamradio-commits] [direwolf] 01/02: New revision, import patch from #803686

[Iain R. Learmonth]

This is an automated email from the git hooks/post-receive script.

irl pushed a commit to branch master
in repository direwolf.

commit 388a28e83777b29ee29d66a41e71c53fb27e0ea3
Author: Iain R. Learmonth <irl at debian.org>
Date:   Mon Nov 2 14:15:33 2015 +0000

    New revision, import patch from #803686
---
 debian/changelog              |  9 +++++++++
 debian/control                |  2 +-
 debian/patches/libgps22.patch | 14 ++++++++++++++
 debian/patches/series         |  1 +
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8626698..034df57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+direwolf (1.2-2) UNRELEASED; urgency=medium
+
+  * Allow building with gpsd API major version 6 (Closes: #803686)
+   - Thanks Bas Couwenberg!
+  * debian/control:
+   - Updated my email address in uploaders.
+
+ -- Iain R. Learmonth <irl at debian.org>  Mon, 02 Nov 2015 14:13:28 +0000
+
 direwolf (1.2-1) unstable; urgency=medium
 
   * Update to new upstream version 1.2.
diff --git a/debian/control b/debian/control
index da88a24..d218501 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: direwolf
 Section: hamradio
 Priority: optional
 Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
-Uploaders: Iain R. Learmonth <irl at fsfe.org>
+Uploaders: Iain R. Learmonth <irl at debian.org>
 Build-Depends: debhelper (>= 9), libasound2-dev, libgps-dev
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-hamradio/direwolf.git/
diff --git a/debian/patches/libgps22.patch b/debian/patches/libgps22.patch
new file mode 100644
index 0000000..07cb88d
--- /dev/null
+++ b/debian/patches/libgps22.patch
@@ -0,0 +1,14 @@
+Description: Enable building with libgps22 (GPSD_API_MAJOR_VERSION 6)
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/dwgps.c
++++ b/dwgps.c
+@@ -60,7 +60,7 @@
+ #if ENABLE_GPS
+ #include <gps.h>
+ 
+-#if GPSD_API_MAJOR_VERSION != 5
++#if GPSD_API_MAJOR_VERSION < 5 || GPSD_API_MAJOR_VERSION > 6
+ #error libgps API version might be incompatible.
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ab9aef9..d2698fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+libgps22.patch
 fix_start_script_paths.patch
 fix_documentation_path.patch
 fix_hardening-no-relro.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/direwolf.git