From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 15 Oct 2018 06:40:00 +0000 (+0200)
Subject: travis: fix mk-build-deps call by providing changelog file
X-Git-Tag: 4.16~17^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=refs%2Fpull%2F3456%2Fhead;p=i3%2Fi3

travis: fix mk-build-deps call by providing changelog file

mk-build-deps started using the changelog file to get the version number, but a
bug prevents it from falling back correctly to 1.0 if no changelog is
present. This has been fixed upstream in
https://salsa.debian.org/debian/devscripts/commit/4b15abd4f0cfe4accbf28f24546891867344a73c,
but we can just ship the changelog file until that fix lands.
---

diff --git a/travis/travis-base.Dockerfile b/travis/travis-base.Dockerfile
index 7eafb9fb..be3780d4 100644
--- a/travis/travis-base.Dockerfile
+++ b/travis/travis-base.Dockerfile
@@ -24,6 +24,7 @@ RUN apt-get update && \
 
 # Install i3 build dependencies.
 COPY debian/control /usr/src/i3-debian-packaging/control
+COPY debian/changelog /usr/src/i3-debian-packaging/changelog
 RUN apt-get update && \
     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/*