]> git.sur5r.net Git - i3/i3/commitdiff
travis: ubuntu: remove libxcb-xrm-dev from Build-Deps
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 24 May 2016 18:07:01 +0000 (20:07 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 24 May 2016 18:07:01 +0000 (20:07 +0200)
It’s installed separately.

This should fix the failing travis build.

travis/travis-base-ubuntu-386.Dockerfile
travis/travis-base-ubuntu.Dockerfile

index ae6b7c82d884eac9c00e8e699a6911539c543f16..4f11d02d573fe209befc6d14c44e3b629818248c 100644 (file)
@@ -25,6 +25,7 @@ RUN linux32 apt-get update && \
 # Install i3 build dependencies.
 COPY debian/control /usr/src/i3-debian-packaging/control
 RUN linux32 apt-get update && \
+    sed -i '/^\s*libxcb-xrm-dev/d' /usr/src/i3-debian-packaging/control && \
     DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \
     rm -rf /var/lib/apt/lists/*
 
index 62b81283923914664e474563dd2ba6725de3258a..2606f97712b3945a7dc7ee03a379cd27c1c9e74c 100644 (file)
@@ -26,6 +26,7 @@ RUN apt-get update && \
 # Install i3 build dependencies.
 COPY debian/control /usr/src/i3-debian-packaging/control
 RUN apt-get update && \
+    sed -i '/^\s*libxcb-xrm-dev/d' /usr/src/i3-debian-packaging/control && \
     DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \
     rm -rf /var/lib/apt/lists/*