Merge lp:~hjd/widelands/boost-dependencies into lp:widelands

Proposed by Hans Joachim Desserud
Status: Merged
Merged at revision: 8390
Proposed branch: lp:~hjd/widelands/boost-dependencies
Merge into: lp:widelands
Diff against target: 42 lines (+8/-2)
3 files modified
.travis.sh (+4/-1)
debian/changelog (+3/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~hjd/widelands/boost-dependencies
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+326369@code.launchpad.net

Description of the change

Things take time...

but as promised here are the changes which align the dependencies used for travis and our PPA a bit more.

I'm probably repeating myself a bit, but the reason the PPA broke while we didn't notice anything on travis is that the latter installed libboost-all-dev. This is a metapackage which install all parts of boost including stuff we don't use, so didn't notice that we had picked up a new dependency. The PPA on the other hand installs only the parts of boost we use, and this list hadn't been updated when the new requirement was merged to trunk.

I've changed it now so that travis also only install the parts we need, so that if we suddenly start using boost-foo tomorrow the build will break, prompting an update of required dependencies. We might also save some time on the travis builds since we need to install less packages. (Probably a minimal difference though, if it is noticable in practice)

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks for taking care of this :)

review: Approve
Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 2386. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/247635343.
Appveyor build 2214. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_hjd_widelands_boost_dependencies-2214.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.travis.sh'
2--- .travis.sh 2017-06-11 09:26:24 +0000
3+++ .travis.sh 2017-06-27 17:05:19 +0000
4@@ -23,7 +23,10 @@
5
6 until sudo apt-get install -qq --force-yes -y \
7 cmake \
8- libboost-all-dev \
9+ libboost-dev \
10+ libboost-regex-dev \
11+ libboost-system-dev \
12+ libboost-test-dev \
13 libglew-dev \
14 libicu-dev \
15 libpng-dev \
16
17=== modified file 'debian/changelog'
18--- debian/changelog 2017-06-11 09:23:24 +0000
19+++ debian/changelog 2017-06-27 17:05:19 +0000
20@@ -5,6 +5,9 @@
21 libboost-system-dev
22 - No longer needed;
23 libsdl2-net-dev
24+ - Also dropped version-specific glew alternative.
25+ 1.6 doesn't seem to be around anymore and the versionless one
26+ seems to work across the different distro releases we build for
27 * Merged Debian packaging of Widelands 1:19+repack-3. Remaining changes:
28 - Disabled all Debian-patches since applying them might cause conflicts as
29 development moves along in latest trunk. They mostly concern
30
31=== modified file 'debian/control'
32--- debian/control 2017-06-11 09:23:24 +0000
33+++ debian/control 2017-06-27 17:05:19 +0000
34@@ -17,7 +17,7 @@
35 libboost-regex-dev,
36 libboost-system-dev,
37 libboost-test-dev,
38- libglew1.6-dev | libglew-dev,
39+ libglew-dev,
40 libpng-dev,
41 libsdl2-dev,
42 libsdl2-image-dev,

Subscribers

People subscribed via source and target branches

to status/vote changes: