widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/boost-dependencies into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1697192 in widelands: "Cleanup after move to boost.net"
  https://bugs.launchpad.net/widelands/+bug/1697192

For more details, see:
https://code.launchpad.net/~hjd/widelands/boost-dependencies/+merge/326369

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)
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/boost-dependencies into lp:widelands.

=== modified file '.travis.sh'
--- .travis.sh	2017-06-11 09:26:24 +0000
+++ .travis.sh	2017-06-27 17:05:19 +0000
@@ -23,7 +23,10 @@
 
 until sudo apt-get install -qq --force-yes -y \
    cmake \
-   libboost-all-dev \
+   libboost-dev \
+   libboost-regex-dev \
+   libboost-system-dev \
+   libboost-test-dev \
    libglew-dev \
    libicu-dev \
    libpng-dev \

=== modified file 'debian/changelog'
--- debian/changelog	2017-06-11 09:23:24 +0000
+++ debian/changelog	2017-06-27 17:05:19 +0000
@@ -5,6 +5,9 @@
         libboost-system-dev
       - No longer needed;
         libsdl2-net-dev
+      - Also dropped version-specific glew alternative.
+        1.6 doesn't seem to be around anymore and the versionless one
+        seems to work across the different distro releases we build for
   * Merged Debian packaging of Widelands 1:19+repack-3. Remaining changes:
     - Disabled all Debian-patches since applying them might cause conflicts as
       development moves along in latest trunk. They mostly concern 

=== modified file 'debian/control'
--- debian/control	2017-06-11 09:23:24 +0000
+++ debian/control	2017-06-27 17:05:19 +0000
@@ -17,7 +17,7 @@
   libboost-regex-dev, 
   libboost-system-dev, 
   libboost-test-dev, 
-  libglew1.6-dev | libglew-dev,
+  libglew-dev,
   libpng-dev, 
   libsdl2-dev, 
   libsdl2-image-dev,