From ee77f107eae1d1d0c34897c41e26cc5a709acf63 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Sun, 4 May 2014 16:10:27 +0530
Subject: [PATCH] Remove cheetah as a dependency

---
 INSTALL    | 7 ++-----
 Makefile   | 2 +-
 fabfile.py | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/INSTALL b/INSTALL
index a8d6138d6..3df4655b0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,10 +2,9 @@
 
 ## Installing Plinth
 
-Install the python-cheetah package, pandoc, python-augeas, and
-bjsonrpc:
+Install the pandoc, python-augeas, and bjsonrpc:
 
-apt-get install python-cheetah pandoc python-augeas python-bjsonrpc python-cherrypy3 python-simplejson
+apt-get install augeas-tools libpython2.7 pandoc psmisc python2.7 python-augeas python-bcrypt python-bjsonrpc python-cherrypy3 python-django python-passlib python-simplejson sudo
 
 Unzip and untar the source into a directory.  Change to the directory
 containing the program. Run:
@@ -23,8 +22,6 @@ and the default password is "secret".
 
 * cherrypy - python web engine v3+
 
-* cheetah - Debian has python-cheetah package
-
 * python - tested with version 2.6.6
 
 * *GNU Make* is used to build the templates and such.
diff --git a/Makefile b/Makefile
index 5031ec688..b2211c6d3 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ default: config dirs css docs
 all: default
 
 predepend:
-	sudo sh -c "apt-get install augeas-tools libpython2.7 pandoc psmisc python2.7 python-augeas python-bcrypt python-bjsonrpc python-cheetah python-cherrypy3 python-django python-passlib python-simplejson sudo"
+	sudo sh -c "apt-get install augeas-tools libpython2.7 pandoc psmisc python2.7 python-augeas python-bcrypt python-bjsonrpc python-cherrypy3 python-django python-passlib python-simplejson sudo"
 	git submodule init
 	git submodule update
 	touch predepend
diff --git a/fabfile.py b/fabfile.py
index 7801834aa..cbffef8b2 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -150,7 +150,7 @@ def apache():
 @task
 def deps():
    "Basic plinth dependencies"
-   sudo('apt-get install --no-install-recommends -y python make python-cheetah pandoc python-simplejson python-pyme python-augeas python-bjsonrpc')
+   sudo('apt-get install --no-install-recommends -y python make pandoc python-simplejson python-pyme python-augeas python-bjsonrpc python-django')
 
 @task
 def update():