--- a/.hgignore	Sat May 12 12:12:12 2018 -0700
+++ b/.hgignore	Sat May 12 13:17:01 2018 -0700
@@ -31,8 +31,8 @@
 contrib/chg/chg
 contrib/hgsh/hgsh
 contrib/vagrant/.vagrant
-contrib/docker/debian-*
-contrib/docker/ubuntu-*
+contrib/packaging/docker/debian-*
+contrib/packaging/docker/ubuntu-*
 dist
 packages
 doc/common.txt

--- a/Makefile	Sat May 12 12:12:12 2018 -0700
+++ b/Makefile	Sat May 12 13:17:01 2018 -0700
@@ -209,40 +209,40 @@
 ppa:
 	contrib/builddeb --source-only
 
-contrib/docker/debian-%: contrib/docker/debian.template
+contrib/packaging/docker/debian-%: contrib/packaging/docker/debian.template
 	sed "s/__CODENAME__/$*/" $< > $@
 
-docker-debian-jessie: contrib/docker/debian-jessie
+docker-debian-jessie: contrib/packaging/docker/debian-jessie
 	contrib/dockerdeb debian jessie
 
-docker-debian-stretch: contrib/docker/debian-stretch
+docker-debian-stretch: contrib/packaging/docker/debian-stretch
 	contrib/dockerdeb debian stretch
 
-contrib/docker/ubuntu-%: contrib/docker/ubuntu.template
+contrib/packaging/docker/ubuntu-%: contrib/packaging/docker/ubuntu.template
 	sed "s/__CODENAME__/$*/" $< > $@
 
-docker-ubuntu-trusty: contrib/docker/ubuntu-trusty
+docker-ubuntu-trusty: contrib/packaging/docker/ubuntu-trusty
 	contrib/dockerdeb ubuntu trusty
 
-docker-ubuntu-trusty-ppa: contrib/docker/ubuntu-trusty
+docker-ubuntu-trusty-ppa: contrib/packaging/docker/ubuntu-trusty
 	contrib/dockerdeb ubuntu trusty --source-only
 
-docker-ubuntu-xenial: contrib/docker/ubuntu-xenial
+docker-ubuntu-xenial: contrib/packaging/docker/ubuntu-xenial
 	contrib/dockerdeb ubuntu xenial
 
-docker-ubuntu-xenial-ppa: contrib/docker/ubuntu-xenial
+docker-ubuntu-xenial-ppa: contrib/packaging/docker/ubuntu-xenial
 	contrib/dockerdeb ubuntu xenial --source-only
 
-docker-ubuntu-artful: contrib/docker/ubuntu-artful
+docker-ubuntu-artful: contrib/packaging/docker/ubuntu-artful
 	contrib/dockerdeb ubuntu artful
 
-docker-ubuntu-artful-ppa: contrib/docker/ubuntu-artful
+docker-ubuntu-artful-ppa: contrib/packaging/docker/ubuntu-artful
 	contrib/dockerdeb ubuntu artful --source-only
 
-docker-ubuntu-bionic: contrib/docker/ubuntu-bionic
+docker-ubuntu-bionic: contrib/packaging/docker/ubuntu-bionic
 	contrib/dockerdeb ubuntu bionic
 
-docker-ubuntu-bionic-ppa: contrib/docker/ubuntu-bionic
+docker-ubuntu-bionic-ppa: contrib/packaging/docker/ubuntu-bionic
 	contrib/dockerdeb ubuntu bionic --source-only
 
 fedora20:

--- a/contrib/docker/centos5	Sat May 12 12:12:12 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-FROM centos:centos5
-RUN \
-	sed -i 's/^mirrorlist/#mirrorlist/' /etc/yum.repos.d/*.repo && \
-	sed -i 's/^#\(baseurl=\)http:\/\/mirror.centos.org\/centos/\1http:\/\/vault.centos.org/' /etc/yum.repos.d/*.repo && \
-	sed -i 's/\$releasever/5.11/' /etc/yum.repos.d/*.repo
-
-RUN yum install -y \
-	gcc \
-	gettext \
-	make \
-	python-devel \
-	python-docutils \
-	rpm-build \
-	tar
-
-# For creating repo meta data
-RUN yum install -y \
-	bzip2-devel \
-	createrepo \
-	ncurses-devel \
-	openssl-devel \
-	readline-devel \
-	zlib-devel

--- a/contrib/docker/centos6	Sat May 12 12:12:12 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-FROM centos:centos6
-RUN yum install -y \
-	gcc \
-	gettext \
-	make \
-	python-devel \
-	python-docutils \
-	rpm-build \
-	tar
-
-# For creating repo meta data
-RUN yum install -y createrepo
-
-# For python
-RUN yum install -y \
-	bzip2-devel \
-	ncurses-devel \
-	openssl-devel \
-	readline-devel \
-	zlib-devel

--- a/contrib/docker/centos7	Sat May 12 12:12:12 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-FROM centos:centos7
-RUN yum install -y \
-	gcc \
-	gettext \
-	make \
-	python-devel \
-	python-docutils \
-	rpm-build \
-	tar
-
-# For creating repo meta data
-RUN yum install -y createrepo

--- a/contrib/docker/debian.template	Sat May 12 12:12:12 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-FROM debian:__CODENAME__
-RUN apt-get update && apt-get install -y \
-  build-essential \
-  debhelper \
-  devscripts \
-  dh-python \
-  less \
-  python \
-  python-all-dev \
-  python-docutils \
-  unzip \
-  zip

--- a/contrib/docker/fedora20	Sat May 12 12:12:12 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-FROM fedora:20
-RUN yum install -y \
-	gcc \
-	gettext \
-	make \
-	python-devel \
-	python-docutils \
-	rpm-build
-
-# For creating repo meta data
-RUN yum install -y createrepo

--- a/contrib/docker/fedora21	Sat May 12 12:12:12 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-FROM fedora:21
-RUN yum install -y \
-	gcc \
-	gettext \
-	make \
-	python-devel \
-	python-docutils \
-	rpm-build
-
-# For creating repo meta data
-RUN yum install -y createrepo

--- a/contrib/docker/ubuntu.template	Sat May 12 12:12:12 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-FROM ubuntu:__CODENAME__
-RUN apt-get update && apt-get install -y \
-  build-essential \
-  debhelper \
-  devscripts \
-  dh-python \
-  less \
-  python \
-  python-all-dev \
-  python-docutils \
-  unzip \
-  zip

--- a/contrib/dockerlib.sh	Sat May 12 12:12:12 2018 -0700
+++ b/contrib/dockerlib.sh	Sat May 12 13:17:01 2018 -0700
@@ -22,7 +22,7 @@
 function initcontainer() {
   [ "$1" ] || { echo "Error: platform name must be specified"; exit 1; }
 
-  DFILE="$ROOTDIR/contrib/docker/$1"
+  DFILE="$ROOTDIR/contrib/packaging/docker/$1"
   [ -f "$DFILE" ] || { echo "Error: docker file $DFILE not found"; exit 1; }
 
   CONTAINER="hg-dockerrpm-$1"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/packaging/docker/centos5	Sat May 12 13:17:01 2018 -0700
@@ -0,0 +1,23 @@
+FROM centos:centos5
+RUN \
+	sed -i 's/^mirrorlist/#mirrorlist/' /etc/yum.repos.d/*.repo && \
+	sed -i 's/^#\(baseurl=\)http:\/\/mirror.centos.org\/centos/\1http:\/\/vault.centos.org/' /etc/yum.repos.d/*.repo && \
+	sed -i 's/\$releasever/5.11/' /etc/yum.repos.d/*.repo
+
+RUN yum install -y \
+	gcc \
+	gettext \
+	make \
+	python-devel \
+	python-docutils \
+	rpm-build \
+	tar
+
+# For creating repo meta data
+RUN yum install -y \
+	bzip2-devel \
+	createrepo \
+	ncurses-devel \
+	openssl-devel \
+	readline-devel \
+	zlib-devel

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/packaging/docker/centos6	Sat May 12 13:17:01 2018 -0700
@@ -0,0 +1,20 @@
+FROM centos:centos6
+RUN yum install -y \
+	gcc \
+	gettext \
+	make \
+	python-devel \
+	python-docutils \
+	rpm-build \
+	tar
+
+# For creating repo meta data
+RUN yum install -y createrepo
+
+# For python
+RUN yum install -y \
+	bzip2-devel \
+	ncurses-devel \
+	openssl-devel \
+	readline-devel \
+	zlib-devel

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/packaging/docker/centos7	Sat May 12 13:17:01 2018 -0700
@@ -0,0 +1,12 @@
+FROM centos:centos7
+RUN yum install -y \
+	gcc \
+	gettext \
+	make \
+	python-devel \
+	python-docutils \
+	rpm-build \
+	tar
+
+# For creating repo meta data
+RUN yum install -y createrepo

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/packaging/docker/debian.template	Sat May 12 13:17:01 2018 -0700
@@ -0,0 +1,12 @@
+FROM debian:__CODENAME__
+RUN apt-get update && apt-get install -y \
+  build-essential \
+  debhelper \
+  devscripts \
+  dh-python \
+  less \
+  python \
+  python-all-dev \
+  python-docutils \
+  unzip \
+  zip

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/packaging/docker/fedora20	Sat May 12 13:17:01 2018 -0700
@@ -0,0 +1,11 @@
+FROM fedora:20
+RUN yum install -y \
+	gcc \
+	gettext \
+	make \
+	python-devel \
+	python-docutils \
+	rpm-build
+
+# For creating repo meta data
+RUN yum install -y createrepo

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/packaging/docker/fedora21	Sat May 12 13:17:01 2018 -0700
@@ -0,0 +1,11 @@
+FROM fedora:21
+RUN yum install -y \
+	gcc \
+	gettext \
+	make \
+	python-devel \
+	python-docutils \
+	rpm-build
+
+# For creating repo meta data
+RUN yum install -y createrepo

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/packaging/docker/ubuntu.template	Sat May 12 13:17:01 2018 -0700
@@ -0,0 +1,12 @@
+FROM ubuntu:__CODENAME__
+RUN apt-get update && apt-get install -y \
+  build-essential \
+  debhelper \
+  devscripts \
+  dh-python \
+  less \
+  python \
+  python-all-dev \
+  python-docutils \
+  unzip \
+  zip