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

Proposed by Allison Randal
Status: Merged
Merge reported by: Iain Lane
Merged at revision: not available
Proposed branch: lp:~allison/ubuntu/raring/gpsdrive/merge-debian-patches2
Merge into: lp:ubuntu/raring/gpsdrive
Diff against target: 184 lines (+80/-49)
7 files modified
debian/changelog (+38/-1)
debian/patches/00list (+3/-3)
debian/patches/104-fix-xcursor-check.dpatch (+19/-0)
debian/patches/105-add-boost-links.dpatch (+19/-0)
debian/patches/105-fix-xcursor-check.dpatch (+0/-22)
debian/patches/106-add-boost-links.dpatch (+0/-22)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~allison/ubuntu/raring/gpsdrive/merge-debian-patches2
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Ubuntu branches Pending
Review via email: mp+143996@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve
Revision history for this message
Micah Gersten (micahg) wrote :

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

Revision history for this message
Allison Randal (allison) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-12-02 09:52:13 +0000
3+++ debian/changelog 2013-01-19 19:25:22 +0000
4@@ -1,3 +1,41 @@
5+gpsdrive (2.10~pre4-6.dfsg-5.2ubuntu1) raring; urgency=low
6+
7+ * Merge from Debian unstable, remaining changes:
8+ - scripts/geo-code: Changed executing environment from /bin/sh
9+ to /bin/bash. Resequenced as debian/patches/106-lp-325288.dpatch
10+ - Preserved config.{guess,sub} override.
11+ * Dropped changes:
12+ - debian/patches/107-fix-disable-mapnik.dpatch: now upstream in Debian.
13+ - debian/patches/105-fix-xcursor-check.dpatch removed,
14+ in Debian as 104-fix-xcursor-check.dpatch.
15+ - debian/patches/106-add-boost-links.dpatch removed,
16+ in Debian as 105-add-boost-links.dpatch.
17+
18+ -- Allison Randal <allison@ubuntu.com> Sat, 19 Jan 2013 10:42:27 -0800
19+
20+gpsdrive (2.10~pre4-6.dfsg-5.2) unstable; urgency=low
21+
22+ * Non-maintainer upload
23+
24+ [ Allison Randal ]
25+ * Disable optional mapnik libraries, gpsdrive is incompatible with
26+ APIs of mapnik version 2.0.0.
27+ * debian/patches/107-fix-disable-mapnik.dpatch:
28+ Fix known bug with gpsdrive-2.10pre4 when disabling Mapnik library.
29+
30+ -- Christian Perrier <bubulle@debian.org> Sun, 07 Oct 2012 14:27:36 +0200
31+
32+gpsdrive (2.10~pre4-6.dfsg-5.1) unstable; urgency=medium
33+
34+ * Non-maintainer upload.
35+ * debian/patches/104-fix-xcursor-check.dpatch:
36+ - Define Xcursor within AC_CHECK_LIB, fix FTBFS.
37+ (Closes: #615653, 628310)
38+ * debian/patches/105-add-boost-links.dpatch:
39+ - Link against boost-filesystem and boost-system.
40+
41+ -- Luca Falavigna <dktrkranz@debian.org> Thu, 01 Sep 2011 22:44:02 +0200
42+
43 gpsdrive (2.10~pre4-6.dfsg-5ubuntu4) precise; urgency=low
44
45 * Disable optional mapnik libraries, gpsdrive is incompatible with
46@@ -169,7 +207,6 @@
47
48 -- Andreas Putzo <andreas@putzo.net> Sat, 19 Jul 2008 20:01:39 +0000
49
50->>>>>>> .r2096
51 gpsdrive (2.10~pre4-3) unstable; urgency=low
52
53 * Fix regression of last upload in the mapnik handling.
54
55=== modified file 'debian/patches/00list'
56--- debian/patches/00list 2011-12-01 22:58:43 +0000
57+++ debian/patches/00list 2013-01-19 19:25:22 +0000
58@@ -19,7 +19,7 @@
59 101-signalposreq
60 102-unittest
61 103-no-textquery
62-104-lp-325288
63-105-fix-xcursor-check.dpatch
64-106-add-boost-links.dpatch
65+104-fix-xcursor-check
66+105-add-boost-links
67+106-lp-325288
68 107-fix-disable-mapnik.dpatch
69
70=== added file 'debian/patches/104-fix-xcursor-check.dpatch'
71--- debian/patches/104-fix-xcursor-check.dpatch 1970-01-01 00:00:00 +0000
72+++ debian/patches/104-fix-xcursor-check.dpatch 2013-01-19 19:25:22 +0000
73@@ -0,0 +1,19 @@
74+#! /bin/sh /usr/share/dpatch/dpatch-run
75+## Description: XcursorImageCreate is defined in Xcursor
76+## Origin/Author: Julian Taylor <jtaylor.debian@googlemail.com>
77+## Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615653
78+## fix-xcursor-check.dpatch by Julian Taylor <jtaylor.debian@googlemail.com>
79+
80+@DPATCH@
81+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gpsdrive~/configure.ac gpsdrive/configure.ac
82+--- gpsdrive~/configure.ac 2011-07-05 13:43:55.000000000 +0200
83++++ gpsdrive/configure.ac 2011-07-05 13:51:30.531707412 +0200
84+@@ -471,7 +471,7 @@
85+ if $PKG_CONFIG xcursor --atleast-version=1.1.2
86+ then
87+ AC_MSG_RESULT([yes])
88+- AC_CHECK_LIB(fontconfig, XcursorImageCreate, [], [
89++ AC_CHECK_LIB(Xcursor, XcursorImageCreate, [], [
90+ echo "Error with test of xcursor library not found"
91+ exit -1
92+ ])
93
94=== added file 'debian/patches/105-add-boost-links.dpatch'
95--- debian/patches/105-add-boost-links.dpatch 1970-01-01 00:00:00 +0000
96+++ debian/patches/105-add-boost-links.dpatch 2013-01-19 19:25:22 +0000
97@@ -0,0 +1,19 @@
98+#! /bin/sh /usr/share/dpatch/dpatch-run
99+## Description: requires direct link against boost {file,}system
100+## Origin/Author: Julian Taylor <jtaylor.debian@googlemail.com>
101+## Bug: https://bugs.launchpad.net/ubuntu/+source/gpsdrive/+bug/749273
102+## 105-add-boost-links.dpatch by Julian Taylor <jtaylor.debian@googlemail.com>
103+
104+@DPATCH@
105+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gpsdrive~/src/Makefile.am gpsdrive/src/Makefile.am
106+--- gpsdrive~/src/Makefile.am 2011-07-05 13:59:11.000000000 +0200
107++++ gpsdrive/src/Makefile.am 2011-07-05 14:02:23.341707820 +0200
108+@@ -42,7 +42,7 @@
109+ INCLUDES = $(DBUS_CFLAGS) -DDBUS_API_SUBJECT_TO_CHANGE=1
110+ endif
111+
112+-gpsdrive_LDADD=@LIBS@ $(LIBADD_DL)
113++gpsdrive_LDADD=@LIBS@ $(LIBADD_DL) -lboost_filesystem -lboost_system
114+
115+ PRGS = gpsdrive.c splash.c splash.h gpsdrive_config.c gpsdrive_config.h \
116+ navigation.c \
117
118=== removed file 'debian/patches/105-fix-xcursor-check.dpatch'
119--- debian/patches/105-fix-xcursor-check.dpatch 2011-11-23 23:34:54 +0000
120+++ debian/patches/105-fix-xcursor-check.dpatch 1970-01-01 00:00:00 +0000
121@@ -1,22 +0,0 @@
122-#! /bin/sh /usr/share/dpatch/dpatch-run
123-## Description: XcursorImageCreate is defined in Xcursor
124-## Origin/Author: Julian Taylor <jtaylor.debian@googlemail.com>
125-## Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615653
126-## fix-xcursor-check.dpatch by Julian Taylor <jtaylor.debian@googlemail.com>
127-##
128-## All lines beginning with `## DP:' are a description of the patch.
129-## DP: No description.
130-
131-@DPATCH@
132-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gpsdrive~/configure.ac gpsdrive/configure.ac
133---- gpsdrive~/configure.ac 2011-07-05 13:43:55.000000000 +0200
134-+++ gpsdrive/configure.ac 2011-07-05 13:51:30.531707412 +0200
135-@@ -471,7 +471,7 @@
136- if $PKG_CONFIG xcursor --atleast-version=1.1.2
137- then
138- AC_MSG_RESULT([yes])
139-- AC_CHECK_LIB(fontconfig, XcursorImageCreate, [], [
140-+ AC_CHECK_LIB(Xcursor, XcursorImageCreate, [], [
141- echo "Error with test of xcursor library not found"
142- exit -1
143- ])
144
145=== removed file 'debian/patches/106-add-boost-links.dpatch'
146--- debian/patches/106-add-boost-links.dpatch 2011-07-05 12:30:16 +0000
147+++ debian/patches/106-add-boost-links.dpatch 1970-01-01 00:00:00 +0000
148@@ -1,22 +0,0 @@
149-#! /bin/sh /usr/share/dpatch/dpatch-run
150-## Description: requires direct link against boost {file,}system
151-## Origin/Author: Julian Taylor <jtaylor.debian@googlemail.com>
152-## Bug: https://bugs.launchpad.net/ubuntu/+source/gpsdrive/+bug/749273
153-## 105-add-boost-links.dpatch by Julian Taylor <jtaylor.debian@googlemail.com>
154-##
155-## All lines beginning with `## DP:' are a description of the patch.
156-## DP: No description.
157-
158-@DPATCH@
159-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gpsdrive~/src/Makefile.am gpsdrive/src/Makefile.am
160---- gpsdrive~/src/Makefile.am 2011-07-05 13:59:11.000000000 +0200
161-+++ gpsdrive/src/Makefile.am 2011-07-05 14:02:23.341707820 +0200
162-@@ -42,7 +42,7 @@
163- INCLUDES = $(DBUS_CFLAGS) -DDBUS_API_SUBJECT_TO_CHANGE=1
164- endif
165-
166--gpsdrive_LDADD=@LIBS@ $(LIBADD_DL)
167-+gpsdrive_LDADD=@LIBS@ $(LIBADD_DL) -lboost_filesystem -lboost_system
168-
169- PRGS = gpsdrive.c splash.c splash.h gpsdrive_config.c gpsdrive_config.h \
170- navigation.c \
171
172=== renamed file 'debian/patches/104-lp-325288.dpatch' => 'debian/patches/106-lp-325288.dpatch'
173=== modified file 'debian/rules'
174--- debian/rules 2011-12-01 22:58:43 +0000
175+++ debian/rules 2013-01-19 19:25:22 +0000
176@@ -58,7 +58,7 @@
177 build: build-arch build-indep
178
179 build-arch: config.status build-arch-stamp
180-build-arch-stamp:
181+build-arch-stamp: config.status
182 dh_testdir
183 $(MAKE)
184 touch $@

Subscribers

People subscribed via source and target branches