From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 24 May 2016 18:07:01 +0000 (+0200)
Subject: travis: ubuntu: remove libxcb-xrm-dev from Build-Deps
X-Git-Tag: 4.13~74
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8dbdcde9a6fbc0cf04c4a2843af3b3e5f2ac3fc9;p=i3%2Fi3

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 ae6b7c82..4f11d02d 100644
--- 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 && \
+    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/*
 
diff --git a/travis/travis-base-ubuntu.Dockerfile b/travis/travis-base-ubuntu.Dockerfile
index 62b81283..2606f977 100644
--- 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 && \
+    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/*