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

[Allison Randal]

Ubuntu patches merged upstream to Debian. Different names for identical patches in Debian/Ubuntu was causing the automatic merge to double-apply patches and fail. Renamed patches to match Debian upstream to allow future automatic merges.

[Micah Gersten (micahg)]

Looks fine, will upload if it builds, thanks

review: Approve

[Micah Gersten (micahg)]

Sorry, the bash patch rename didn't make it through in the merge. Also, there's a config.sub and config.guess diff that's not documented here.

review: Needs Fixing

[Micah Gersten (micahg)]

I wonder if the config.* diff is not needed since autoconf is run during the build.

[Allison Randal (allison)]

The patch file rename of 104-lp-325288.dpatch to 106-lp-325288.dpatch is in bzr as a File rename. Are you referring to some other patch?

The config.* changes came from Debian, there weren't any local Ubuntu changes there.

[Andrew Starr-Bochicchio (andrewsomething)]

The patch rename looks correct AFAICT. Though I do see the config.* diff. Try running:

bzr diff -r tag:2.10~pre4-6.dfsg-5.2 config.*

[Micah Gersten (micahg)]

Sorry, I used the download diff feature which apparently doesn't include the rename, I'll file an LP bug for that.

[Allison Randal (allison)]

Okay, I've run several debdiffs to find the source of the config.* changes:

debdiff gpsdrive_2.10~pre4-6.dfsg-5.2.dsc gpsdrive_2.10~pre4-6.dfsg-5.2ubuntu1.dsc

Shows that there are changes in config.guess and config.sub between this merged version of the package and the current debian version of the package. However, comparing the two Ubuntu packages:

debdiff gpsdrive_2.10~pre4-6.dfsg-5ubuntu4.dsc gpsdrive_2.10~pre4-6.dfsg-5.2ubuntu1.dsc

Shows no changes in the config.* files between the previous Ubuntu version of the package and this merged version. So the merge merely preserved changes made in an earlier release of the package. To confirm this:

debdiff gpsdrive_2.10~pre4-6.dfsg-5.dsc gpsdrive_2.10~pre4-6.dfsg-5ubuntu4.dsc

Shows that these changes already existed in the last Ubuntu release.

A search through the bzr repo for gps drive shows the changes to config.guess and config.sub were introduced for the package version 2.10~pre4-6.dfsg-3ubuntu4, with the reason given "Rebuild with libmysqlclient16-dev", and no annotation in the changelog about the Ubuntu changes to config.* files:

http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/raring/gpsdrive/raring/revision/18

Based on this review, I conclude that the merge was correct in preserving the Ubuntu-specific changes to config.guess and config.sub, and so am preserving them in this merge proposal. However I've added a comment to the changelog about the preserved changes, to aid in future merges.

See new merge request at:

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

Closing this one.

Unmerged revisions

25. By Allison Randal on 2013-01-12

* 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
* 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.
* Non-maintainer upload
* 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.
* 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.

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-02 09:52:13 +0000
+++ debian/changelog	2013-01-12 23:56:22 +0000
@@ -1,3 +1,40 @@
+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
+  * 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, 12 Jan 2013 15:28:02 -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 +206,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-12 23:56: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-12 23:56: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-12 23:56: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-12 23:56: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 $@