Resolve conflict

7 files changed, 129 insertions, 13 deletions

diff --git a/debian/antpm.manpages b/debian/antpm.manpages
index d229997..f1dcec0 100644
--- a/debian/antpm.manpages
+++ b/debian/antpm.manpages
@@ -1,4 +1,4 @@
 debian/antpm-downloader.1
 debian/antpm-fit2gpx.1
 debian/antpm-usbmon2ant.1
-debian/garmin-ant-downloader.1
\ No newline at end of file
+debian/antpm-garmin-ant-downloader.1
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 4d0836e..4cccc6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+antpm (1.16-2) UNRELEASED; urgency=low
+
+  [ RALOVICH, Kristof ]
+  * fix kFreebsd,Hurd FTBFS
+  * don't provide garmin-ant-downloader package for now
+  * rename garmin-ant-downloader to antpm-garmin-ant-downloader
+  * build antpm-dbg package too
+
+ -- Kristof Ralovich <ralovich@in.tum.de>  Sat, 05 Apr 2014 11:57:09 +0200
+
 antpm (1.16-1) unstable; urgency=low
 
   * Team upload
diff --git a/debian/control b/debian/control
index 6987c0e..360d85d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,6 @@ Vcs-Git: git://git.debian.org/git/pkg-running/antpm.git
 Vcs-Browser: http://git.debian.org/?p=pkg-running/antpm.git;a=summary
 
 Package: antpm
-Replaces: garmin-ant-downloader (<< 1.12-2)
-Breaks: garmin-ant-downloader (<< 1.12-2)
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libstdc++6 (>=4.4.0)
 Description: ANT+ information retrieval client for Garmin GPS products
@@ -33,9 +31,28 @@ Description: ANT+ information retrieval client for Garmin GPS products
  to avoid confusion with existing Java software.
 
 
-Package: garmin-ant-downloader
-Depends: antpm, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
+Package: antpm-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends:
+ antpm (= ${binary:Version}),
+ ${misc:Depends},
+Description: ANT+ information retrieval client for Garmin GPS products
+ This software uses the Garmin ANT+ proprietary USB keys and
+ communication protocol to retrieve information (such as GPS traces)
+ from some Garmin Forerunner watches such as Forerunner 405 and 310XT.
+ .
+ The underlying ANT+minus implements the ANT/ANT+/ANT-FS protocols to
+ provide these tools: garmin-ant-downloader, antpm-downloader,
+ antpm-fit2gpx, and antpm-usbmon2ant.
+ .
+ ANT+minus is a userspace implementation of a wire protocol similar
+ to the ANT/ANT+/ANT-FS protocols. The goal is to be able to communicate
+ with any ANT capable device in order to e.g. retrieve sports tracks. The
+ c++ implementation is currently available under both linux and win.
+ Communication with watches other than the 310XT might work, but are
+ untested. Please report your experience to help improving the software. 
+ .
+ The software was originally named "gant" but renamed when packaged
+ to avoid confusion with existing Java software.
diff --git a/debian/patches/02-try-fixing-FTBFS-under-hurd-i386-kfreebsd-amd64-kfre b/debian/patches/02-try-fixing-FTBFS-under-hurd-i386-kfreebsd-amd64-kfre
new file mode 100644
index 0000000..658cc91
--- /dev/null
+++ b/debian/patches/02-try-fixing-FTBFS-under-hurd-i386-kfreebsd-amd64-kfre
@@ -0,0 +1,44 @@
+From bf990a5e81f2af5c33583cc500eb655ad1bf173d Mon Sep 17 00:00:00 2001
+From: "RALOVICH, Kristof" <tade60@freemail.hu>
+Date: Thu, 27 Mar 2014 09:42:48 +0100
+Subject: [PATCH 1/2] try fixing FTBFS under hurd-i386, kfreebsd-amd64,
+ kfreebsd-i386
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+                from /«PKGBUILDDIR»/src/common.cpp:20:
+/«PKGBUILDDIR»/src/Log.hpp: In constructor 'antpm::Log::Log(const char*)':
+/«PKGBUILDDIR»/src/Log.hpp:176:8: error: '::access' has not been declared
+     if(::access(logFileName, 0x00) != -1)
+        ^
+make[4]: *** [CMakeFiles/antpm.dir/common.cpp.o] Error 1
+make[4]: *** Waiting for unfinished jobs....
+make[4]: Leaving directory `/«PKGBUILDDIR»/cmake-build'
+make[3]: *** [CMakeFiles/antpm.dir/all] Error 2
+make[3]: Leaving directory `/«PKGBUILDDIR»/cmake-build'
+make[2]: *** [all] Error 2
+make[2]: Leaving directory `/«PKGBUILDDIR»/cmake-build'
+make[1]: *** [override_dh_auto_build] Error 2
+make[1]: Leaving directory `/«PKGBUILDDIR»'
+make: *** [build-arch] Error 2
+---
+ src/Log.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Log.hpp b/src/Log.hpp
+index 066b758..f2c1f72 100644
+--- a/src/Log.hpp
++++ b/src/Log.hpp
+@@ -29,7 +29,7 @@
+ # include <crtdbg.h>
+ # include <io.h>
+ #endif
+-#ifdef __linux__
++#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD__)
+ # include <unistd.h>
+ #endif
+ #include <iostream>
+-- 
+1.8.3.2
+
diff --git a/debian/patches/03-gant-try-fixing-FTBFS-under-hurd-i386 b/debian/patches/03-gant-try-fixing-FTBFS-under-hurd-i386
new file mode 100644
index 0000000..0c3266d
--- /dev/null
+++ b/debian/patches/03-gant-try-fixing-FTBFS-under-hurd-i386
@@ -0,0 +1,41 @@
+From ac496ff03df3ecb6fb447021aa5fd66dbe20824d Mon Sep 17 00:00:00 2001
+From: "RALOVICH, Kristof" <tade60@freemail.hu>
+Date: Sat, 5 Apr 2014 11:37:55 +0200
+Subject: [PATCH] gant: try fixing FTBFS under hurd-i386
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+> /«PKGBUILDDIR»/src/gant/antlib.c:415:73: error: 'IUCLC' undeclared (first use in this function)
+---
+ src/gant/antlib.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/gant/antlib.c b/src/gant/antlib.c
+index 26e880f..283eb10 100644
+--- a/src/gant/antlib.c
++++ b/src/gant/antlib.c
+@@ -1,5 +1,11 @@
+ /* copyright 2008 paul@ant.sbrk.co.uk. released under GPLv3 */
+ /* vers 0.6t */
++
++#define _XOPEN_SOURCE 500
++#define _BSD_SOURCE
++#if defined(__GNU__) /* Hurd */
++# define _GNU_SOURCE
++#endif
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -9,6 +15,8 @@
+ #include <pthread.h>
+ #include <termios.h>
+ #include <stdlib.h>
++#include <strings.h> /* bzero */
++#include <sys/select.h> /* fd_set */
+ 
+ #define __declspec(X)
+ 
+-- 
+1.8.3.2
+
diff --git a/debian/patches/series b/debian/patches/series
index 67f9505..8f15f63 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 01-include-cstdint
+02-try-fixing-FTBFS-under-hurd-i386-kfreebsd-amd64-kfre
+03-gant-try-fixing-FTBFS-under-hurd-i386
diff --git a/debian/rules b/debian/rules
index 8436764..e61c83f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,18 +18,20 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 	dh $@
 
 override_dh_auto_configure:
-	# echo -e "\n\n\nCMAKE\n\n\n"
-	# echo $(NUMCPUS)
 	mkdir cmake-build
 	cd cmake-build && cmake ../src -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} $(CFLAGS)" -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} $(CXXFLAGS)"
 
 override_dh_auto_build:
 	cd cmake-build && $(MAKE) -j$(NUMCPUS)
 
+override_dh_strip:
+	dh_strip --dbg-package=antpm-dbg
+	dh_strip -s --remaining-packages
+
 DESTDIR=../debian/antpm/
 override_dh_install:
 	cd cmake-build && $(MAKE) install DESTDIR=$(DESTDIR)
-	mv debian/antpm/usr/bin/gant debian/antpm/usr/bin/garmin-ant-downloader
+	mv debian/antpm/usr/bin/gant debian/antpm/usr/bin/antpm-garmin-ant-downloader
 	dh_installudev 
 
 build:
@@ -37,4 +39,4 @@ build:
 	cp src/antpm-downloader.1 debian/
 	cp src/antpm-fit2gpx.1 debian/
 	cp src/antpm-usbmon2ant.1 debian/
-	cp src/gant/gant.1 debian/garmin-ant-downloader.1
+	cp src/gant/gant.1 debian/antpm-garmin-ant-downloader.1