merge with stable

.hgignore

@@ -30,6 +30,7 b' build'
 contrib/chg/chg
 contrib/hgsh/hgsh
 contrib/vagrant/.vagrant
+contrib/docker/debian-*
 contrib/docker/ubuntu-*
 dist
 packages

Makefile

@@ -203,10 +203,17 b' deb:'
 ppa:
 	contrib/builddeb --source-only
 
-docker-debian-jessie:
+contrib/docker/debian-%: contrib/docker/debian.template
+	sed "s/__CODENAME__/$*/" $< > $@
+
+docker-debian-jessie: contrib/docker/debian-jessie
 	mkdir -p packages/debian-jessie
 	contrib/dockerdeb debian jessie
 
+docker-debian-stretch: contrib/docker/debian-stretch
+	mkdir -p packages/debian-stretch
+	contrib/dockerdeb debian stretch
+
 contrib/docker/ubuntu-%: contrib/docker/ubuntu.template
 	sed "s/__CODENAME__/$*/" $< > $@
 
@@ -228,6 +235,12 b' docker-ubuntu-yakkety: contrib/docker/ub'
 docker-ubuntu-yakkety-ppa: contrib/docker/ubuntu-yakkety
 	contrib/dockerdeb ubuntu yakkety --source-only
 
+docker-ubuntu-zesty: contrib/docker/ubuntu-zesty
+	contrib/dockerdeb ubuntu zesty
+
+docker-ubuntu-zesty-ppa: contrib/docker/ubuntu-zesty
+	contrib/dockerdeb ubuntu zesty --source-only
+
 fedora20:
 	mkdir -p packages/fedora20
 	contrib/buildrpm
@@ -291,10 +304,11 b' linux-wheels-i686:'
 .PHONY: help all local build doc cleanbutpackages clean install install-bin \
 	install-doc install-home install-home-bin install-home-doc \
 	dist dist-notests check tests check-code update-pot \
-	osx deb ppa docker-debian-jessie \
+	osx deb ppa docker-debian-jessie docker-debian-stretch \
 	docker-ubuntu-trusty docker-ubuntu-trusty-ppa \
 	docker-ubuntu-xenial docker-ubuntu-xenial-ppa \
 	docker-ubuntu-yakkety docker-ubuntu-yakkety-ppa \
+	docker-ubuntu-zesty docker-ubuntu-zesty-ppa \
 	fedora20 docker-fedora20 fedora21 docker-fedora21 \
 	centos5 docker-centos5 centos6 docker-centos6 centos7 docker-centos7 \
 	linux-wheels

contrib/docker/debian.template

@@ -1,9 +1,10 b''
-FROM debian:jessie
+FROM debian:__CODENAME__
 RUN apt-get update && apt-get install -y \
   build-essential \
   debhelper \
   dh-python \
   devscripts \
+  less \
   python \
   python-all-dev \
   python-docutils \

contrib/docker/ubuntu.template

@@ -4,6 +4,7 b' RUN apt-get update && apt-get install -y'
   debhelper \
   dh-python \
   devscripts \
+  less \
   python \
   python-all-dev \
   python-docutils \