Patchwork [1,of,4] docker: install less as a build-time dependency in deb-based distros

login
register
mail settings
Submitter Anton Shestakov
Date June 23, 2017, 5:43 a.m.
Message ID <8d8b512ac6bc39fd1d88.1498196593@neuro>
Download mbox | patch
Permalink /patch/21625/
State Accepted
Headers show

Comments

Anton Shestakov - June 23, 2017, 5:43 a.m.
# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1498183501 -28800
#      Fri Jun 23 10:05:01 2017 +0800
# Node ID 8d8b512ac6bc39fd1d887840a85bbf37f088c250
# Parent  573baab2a7972a4ff8afa28d7792056727965c56
docker: install less as a build-time dependency in deb-based distros

It's needed since 387a76cac28e, otherwise dpkg-checkbuilddeps errors out.
Yuya Nishihara - June 24, 2017, 6:45 a.m.
On Fri, 23 Jun 2017 13:43:13 +0800, Anton Shestakov wrote:
> # HG changeset patch
> # User Anton Shestakov <av6@dwimlabs.net>
> # Date 1498183501 -28800
> #      Fri Jun 23 10:05:01 2017 +0800
> # Node ID 8d8b512ac6bc39fd1d887840a85bbf37f088c250
> # Parent  573baab2a7972a4ff8afa28d7792056727965c56
> docker: install less as a build-time dependency in deb-based distros
> 
> It's needed since 387a76cac28e, otherwise dpkg-checkbuilddeps errors out.

Queued these for stable since 387a76cac28e is also in stable, and it's
probably good idea to support building stable packages. Thanks.

Patch

diff --git a/contrib/docker/debian-jessie b/contrib/docker/debian-jessie
--- a/contrib/docker/debian-jessie
+++ b/contrib/docker/debian-jessie
@@ -4,6 +4,7 @@  RUN apt-get update && apt-get install -y
   debhelper \
   dh-python \
   devscripts \
+  less \
   python \
   python-all-dev \
   python-docutils \
diff --git a/contrib/docker/ubuntu.template b/contrib/docker/ubuntu.template
--- a/contrib/docker/ubuntu.template
+++ b/contrib/docker/ubuntu.template
@@ -4,6 +4,7 @@  RUN apt-get update && apt-get install -y
   debhelper \
   dh-python \
   devscripts \
+  less \
   python \
   python-all-dev \
   python-docutils \