travis: ubuntu: remove libxcb-xrm-dev from Build-Deps

It’s installed separately.

This should fix the failing travis build.

diff --git a/travis/travis-base-ubuntu-386.Dockerfile b/travis/travis-base-ubuntu-386.Dockerfile
index ae6b7c82d884eac9c00e8e699a6911539c543f16..4f11d02d573fe209befc6d14c44e3b629818248c 100644 (file)
--- a/travis/travis-base-ubuntu-386.Dockerfile
+++ b/travis/travis-base-ubuntu-386.Dockerfile
@@ -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 && \
 # 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/*
 
     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/*
 

diff --git a/travis/travis-base-ubuntu.Dockerfile b/travis/travis-base-ubuntu.Dockerfile
index 62b81283923914664e474563dd2ba6725de3258a..2606f97712b3945a7dc7ee03a379cd27c1c9e74c 100644 (file)
--- a/travis/travis-base-ubuntu.Dockerfile
+++ b/travis/travis-base-ubuntu.Dockerfile
@@ -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 && \
 # 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/*
 
     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/*