From 39a19cacbb9a44c5ceadd254463ea87c588a82a3 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Thu, 27 Jun 2013 23:43:49 -0400
Subject: [PATCH] Move Mercurial from stage 3 to 5 (Python dependency)

---
 config/dependencies              | 2 ++
 stage3/hv-install-1              | 1 -
 stage3/packages-update           | 1 -
 stage5/hv-install-1              | 2 ++
 {stage3 => stage5}/misc/hgrc     | 0
 stage5/packages-update           | 2 ++
 {stage3 => stage5}/pkg/mercurial | 0
 7 files changed, 6 insertions(+), 2 deletions(-)
 rename {stage3 => stage5}/misc/hgrc (100%)
 rename {stage3 => stage5}/pkg/mercurial (100%)

diff --git a/config/dependencies b/config/dependencies
index 53a5347..0a0b5a0 100644
--- a/config/dependencies
+++ b/config/dependencies
@@ -173,3 +173,5 @@ ${MYSQL}: ${CMAKE}
 ${LIBX264}: ${YASM}
 
 ${GST_FFMPEG}: ${YASM}
+
+${MERCURIAL}: ${PYTHON}
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index a3a10da..b6e004d 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -99,7 +99,6 @@ ipkg -m noac ${COLORDIFF}
 ipkg ${INTLTOOL}
 
 ipkg -m acnb ${GIT} "--libexecdir=/usr/lib --with-gitconfig=/etc/gitconfig"
-ipkg -m noac ${MERCURIAL}
 
 ipkg ${DIALOG}
 
diff --git a/stage3/packages-update b/stage3/packages-update
index 6b09287..cb99a2e 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -74,7 +74,6 @@ fpkg -e "tar.gz" ${DOSFSTOOLS} "http://fossies.org/linux/misc"
 fpkg -e "tar.gz" ${GIT} "http://git-core.googlecode.com/files"
 fpkg -e "tar.gz" "git-manpages-$(get_pkg_ver ${GIT})" \
     "http://git-core.googlecode.com/files"
-fpkg -e "tar.gz" ${MERCURIAL} "http://mercurial.selenic.com/release"
 
 fpkg -e "tar.gz" ${DIALOG} "ftp://ftp.us.debian.org/debian/pool/main/d/dialog"
 
diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 90062f9..4c3b61a 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -229,6 +229,8 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${ABIWORD} "--disable-spellcheck"
 fi
 
+ipkg -m noac ${MERCURIAL}
+
 ipkg ${INDENT}
 
 if [ "x${USE_SAMBA}" = "xyes" ]; then
diff --git a/stage3/misc/hgrc b/stage5/misc/hgrc
similarity index 100%
rename from stage3/misc/hgrc
rename to stage5/misc/hgrc
diff --git a/stage5/packages-update b/stage5/packages-update
index 6da4eb0..7887002 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -171,6 +171,8 @@ fpkg -e "tar.gz" ${SAMBA} "ftp://ftp.samba.org/pub/samba/old-versions"
 
 fpkg ${PHP}   "http://us2.php.net/distributions"
 
+fpkg -e "tar.gz" ${MERCURIAL} "http://mercurial.selenic.com/release"
+
 fpkg -m gnu ${INDENT}
 
 fpkg -e "tgz" ${LTSP_UTILS} "http://ltsp.mirrors.tds.net/pub/ltsp/utils"
diff --git a/stage3/pkg/mercurial b/stage5/pkg/mercurial
similarity index 100%
rename from stage3/pkg/mercurial
rename to stage5/pkg/mercurial
-- 
2.20.1