Merge lp:~allison/ubuntu/raring/gpsdrive/merge-debian-patches2 into lp:ubuntu/raring/gpsdrive

[Allison Randal]

Added comment to debian/changelog about preserved Ubuntu changes to config.guess and config.sub.

See earlier conversation on this merge at:

https://code.launchpad.net/~allison/ubuntu/raring/gpsdrive/merge-debian-patches/+merge/143035

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

[Micah Gersten (micahg)]

I think this is still wrong, but I see it was uploaded. I don't believe the config.* diff necessary to build the package as we're running autoconf during the build. I see the Debian package builds fine on Ubuntu without the changes

[Allison Randal (allison)]

I kept it because of the architecture-specific hints it provides. These weren't random changes, I carefully checked the old Debian versions of the package to make sure the diffs didn't creep in from an improperly made merge.

But, my plan next month is to update the Debian packages to 2.11. (See LP #819145.) After that, we should be able to drop all Ubuntu changes and simply sync the updated package.

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-02 09:52:13 +0000
+++ debian/changelog	2013-01-19 19:25:22 +0000
@@ -1,3 +1,41 @@
+gpsdrive (2.10~pre4-6.dfsg-5.2ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - scripts/geo-code: Changed executing environment from /bin/sh
+      to /bin/bash. Resequenced as debian/patches/106-lp-325288.dpatch
+    - Preserved config.{guess,sub} override.
+  * Dropped changes:
+    - debian/patches/107-fix-disable-mapnik.dpatch: now upstream in Debian.
+    - debian/patches/105-fix-xcursor-check.dpatch removed,
+      in Debian as 104-fix-xcursor-check.dpatch.
+    - debian/patches/106-add-boost-links.dpatch removed,
+      in Debian as 105-add-boost-links.dpatch.
+
+ -- Allison Randal <[e-mail]>  Sat, 19 Jan 2013 10:42:27 -0800
+
+gpsdrive (2.10~pre4-6.dfsg-5.2) unstable; urgency=low
+
+  * Non-maintainer upload
+
+  [ Allison Randal ]
+  * Disable optional mapnik libraries, gpsdrive is incompatible with
+    APIs of mapnik version 2.0.0.
+  * debian/patches/107-fix-disable-mapnik.dpatch:
+    Fix known bug with gpsdrive-2.10pre4 when disabling Mapnik library.
+
+ -- Christian Perrier <[e-mail]>  Sun, 07 Oct 2012 14:27:36 +0200
+
+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 <[e-mail]>  Thu, 01 Sep 2011 22:44:02 +0200
+
 gpsdrive (2.10~pre4-6.dfsg-5ubuntu4) precise; urgency=low
 
   * Disable optional mapnik libraries, gpsdrive is incompatible with
@@ -169,7 +207,6 @@
 
  -- Andreas Putzo <[e-mail]>  Sat, 19 Jul 2008 20:01:39 +0000
 
->>>>>>> .r2096
 gpsdrive (2.10~pre4-3) unstable; urgency=low
 
   * Fix regression of last upload in the mapnik handling.
 
=== modified file 'debian/patches/00list'
--- debian/patches/00list	2011-12-01 22:58:43 +0000
+++ debian/patches/00list	2013-01-19 19:25:22 +0000
@@ -19,7 +19,7 @@
 101-signalposreq
 102-unittest
 103-no-textquery
-104-lp-325288
-105-fix-xcursor-check.dpatch
-106-add-boost-links.dpatch
+104-fix-xcursor-check
+105-add-boost-links
+106-lp-325288
 107-fix-disable-mapnik.dpatch
 
=== added file 'debian/patches/104-fix-xcursor-check.dpatch'
--- debian/patches/104-fix-xcursor-check.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/104-fix-xcursor-check.dpatch	2013-01-19 19:25:22 +0000
@@ -0,0 +1,19 @@
+#! /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]>
+
+@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/105-add-boost-links.dpatch'
--- debian/patches/105-add-boost-links.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/105-add-boost-links.dpatch	2013-01-19 19:25:22 +0000
@@ -0,0 +1,19 @@
+#! /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]>
+
+@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 \
 
=== removed file 'debian/patches/105-fix-xcursor-check.dpatch'
--- debian/patches/105-fix-xcursor-check.dpatch	2011-11-23 23:34:54 +0000
+++ debian/patches/105-fix-xcursor-check.dpatch	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-#! /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
-     ])
 
=== removed file 'debian/patches/106-add-boost-links.dpatch'
--- debian/patches/106-add-boost-links.dpatch	2011-07-05 12:30:16 +0000
+++ debian/patches/106-add-boost-links.dpatch	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-#! /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 \
 
=== renamed file 'debian/patches/104-lp-325288.dpatch' => 'debian/patches/106-lp-325288.dpatch'
=== modified file 'debian/rules'
--- debian/rules	2011-12-01 22:58:43 +0000
+++ debian/rules	2013-01-19 19:25:22 +0000
@@ -58,7 +58,7 @@
 build: build-arch build-indep
 
 build-arch: config.status build-arch-stamp
-build-arch-stamp:
+build-arch-stamp: config.status
 	dh_testdir
 	$(MAKE)
 	touch $@