tags 615653 + patch pending tags 628310 + patch pending thanks
Dear maintainer, I've prepared an NMU for gpsdrive (versioned as 2.10~pre4-6.dfsg-5.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. Luca Falavigna
diff -u gpsdrive-2.10~pre4-6.dfsg/debian/changelog gpsdrive-2.10~pre4-6.dfsg/debian/changelog --- gpsdrive-2.10~pre4-6.dfsg/debian/changelog +++ gpsdrive-2.10~pre4-6.dfsg/debian/changelog @@ -1,3 +1,14 @@ +gpsdrive (2.10~pre4-6.dfsg-5.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches/104-fix-xcursor-check.dpatch: + - Define Xcursor within AC_CHECK_LIB, fix FTBFS. + (Closes: #615653, 628310) + * debian/patches/105-add-boost-links.dpatch: + - Link against boost-filesystem and boost-system. + + -- Luca Falavigna <dktrkr...@debian.org> Thu, 01 Sep 2011 22:44:02 +0200 + gpsdrive (2.10~pre4-6.dfsg-5) unstable; urgency=low * Added 103-no-textquery patch to remove Text::Query use. Removed diff -u gpsdrive-2.10~pre4-6.dfsg/debian/patches/00list gpsdrive-2.10~pre4-6.dfsg/debian/patches/00list --- gpsdrive-2.10~pre4-6.dfsg/debian/patches/00list +++ gpsdrive-2.10~pre4-6.dfsg/debian/patches/00list @@ -21,0 +22,2 @@ +104-fix-xcursor-check +105-add-boost-links only in patch2: unchanged: --- gpsdrive-2.10~pre4-6.dfsg.orig/debian/patches/104-fix-xcursor-check.dpatch +++ gpsdrive-2.10~pre4-6.dfsg/debian/patches/104-fix-xcursor-check.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## Description: XcursorImageCreate is defined in Xcursor +## Origin/Author: Julian Taylor <jtaylor.deb...@googlemail.com> +## Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615653 +## fix-xcursor-check.dpatch by Julian Taylor <jtaylor.deb...@googlemail.com> + +@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 + ]) only in patch2: unchanged: --- gpsdrive-2.10~pre4-6.dfsg.orig/debian/patches/105-add-boost-links.dpatch +++ gpsdrive-2.10~pre4-6.dfsg/debian/patches/105-add-boost-links.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## Description: requires direct link against boost {file,}system +## Origin/Author: Julian Taylor <jtaylor.deb...@googlemail.com> +## Bug: https://bugs.launchpad.net/ubuntu/+source/gpsdrive/+bug/749273 +## 105-add-boost-links.dpatch by Julian Taylor <jtaylor.deb...@googlemail.com> + +@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 \
