Merge lp:~jtaylor/ubuntu/oneiric/gpsdrive/fix-build into lp:ubuntu/oneiric/gpsdrive

[Julian Taylor]

fix oneiric build failure

[Stefano Rivera (stefanor)]

LGTM

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-26 06:41:40 +0000
+++ debian/changelog	2011-07-05 12:35:56 +0000
@@ -1,3 +1,12 @@
+gpsdrive (2.10~pre4-6.dfsg-5ubuntu2) oneiric; urgency=low
+
+  * debian/patches/105-fix-xcursor-check.dpatch: (Closes: #615653)
+    configure.ac searched in fontconfig for a symbol defined in Xcursor
+  * debian/patches/106-add-boost-links.dpatch: (LP: #749273)
+    link against boost-filesystem and boost-system
+
+ -- Julian Taylor <[e-mail]>  Tue, 05 Jul 2011 13:51:33 +0200
+
 gpsdrive (2.10~pre4-6.dfsg-5ubuntu1) maverick; urgency=low
 
   * Merge from Debian unstable (LP: #605350), remaining changes:

=== modified file 'debian/patches/00list'
--- debian/patches/00list	2010-07-26 06:41:40 +0000
+++ debian/patches/00list	2011-07-05 12:35:56 +0000
@@ -20,3 +20,5 @@
 102-unittest
 103-no-textquery
 104-lp-325288
+105-fix-xcursor-check.dpatch
+106-add-boost-links.dpatch

=== added file 'debian/patches/105-fix-xcursor-check.dpatch'
--- debian/patches/105-fix-xcursor-check.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/105-fix-xcursor-check.dpatch	2011-07-05 12:35:56 +0000
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Description: XcursorImageCreate is defined in Xcursor
+## Origin/Author: Julian Taylor <[e-mail]>
+## Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615653
+## fix-xcursor-check.dpatch by Julian Taylor <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gpsdrive~/configure.ac gpsdrive/configure.ac
+--- gpsdrive~/configure.ac	2011-07-05 13:43:55.000000000 +0200
++++ gpsdrive/configure.ac	2011-07-05 13:51:30.531707412 +0200
+@@ -471,7 +471,7 @@
+ if $PKG_CONFIG xcursor --atleast-version=1.1.2
+ then
+     AC_MSG_RESULT([yes])
+-    AC_CHECK_LIB(fontconfig, XcursorImageCreate, [], [
++    AC_CHECK_LIB(Xcursor, XcursorImageCreate, [], [
+     echo "Error with test of xcursor library not found"
+     exit -1
+     ])

=== added file 'debian/patches/106-add-boost-links.dpatch'
--- debian/patches/106-add-boost-links.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/106-add-boost-links.dpatch	2011-07-05 12:35:56 +0000
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Description: requires direct link against boost {file,}system
+## Origin/Author: Julian Taylor <[e-mail]>
+## Bug: https://bugs.launchpad.net/ubuntu/+source/gpsdrive/+bug/749273
+## 105-add-boost-links.dpatch by Julian Taylor <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gpsdrive~/src/Makefile.am gpsdrive/src/Makefile.am
+--- gpsdrive~/src/Makefile.am	2011-07-05 13:59:11.000000000 +0200
++++ gpsdrive/src/Makefile.am	2011-07-05 14:02:23.341707820 +0200
+@@ -42,7 +42,7 @@
+ INCLUDES = $(DBUS_CFLAGS) -DDBUS_API_SUBJECT_TO_CHANGE=1
+ endif
+ 
+-gpsdrive_LDADD=@LIBS@ $(LIBADD_DL) 
++gpsdrive_LDADD=@LIBS@ $(LIBADD_DL) -lboost_filesystem -lboost_system
+ 
+ PRGS = 	gpsdrive.c splash.c splash.h gpsdrive_config.c gpsdrive_config.h \
+ 	navigation.c \