From 731727cb3804533ed444973661c6b80405f409ef Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 22 Nov 2014 02:52:03 +0100
Subject: [PATCH 1/3] Install Augeas using setuptools

---
 README.md |  2 +-
 setup.py  | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index dc60451f8..7bc1a283f 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Apache, though we will be expanding it to other platforms.
 
 ```
 sudo apt-get install python python-setuptools python-virtualenv \
-  python-dev python-augeas gcc swig dialog libssl-dev
+  python-dev gcc swig dialog libssl-dev
 virtualenv --system-site-packages venv
 ./venv/bin/python setup.py install
 sudo ./venv/bin/letsencrypt
diff --git a/setup.py b/setup.py
index 3966bdccf..cb7ba0b1e 100755
--- a/setup.py
+++ b/setup.py
@@ -15,18 +15,20 @@ setup(
         'letsencrypt.scripts',
     ],
     install_requires=[
-        #'dialog',
-        'requests',
         'jsonschema',
         'M2Crypto',
         'pycrypto',
-        #'python-augeas',
+        'python-augeas',
         'python2-pythondialog',
+        'requests',
+    dependency_links=[
+        # http://augeas.net/download.html
+        'https://fedorahosted.org/released/python-augeas/',
     ],
     entry_points={
         'console_scripts': [
-            'letsencrypt = letsencrypt.scripts.main:main'
-        ]
+            'letsencrypt = letsencrypt.scripts.main:main',
+        ],
     },
     zip_safe=False,
     include_package_data=True,

From d2ef9ea5526ba23008ff01b4ce44e21f99254af8 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 22 Nov 2014 02:53:48 +0100
Subject: [PATCH 2/3] virtualenv --no-site-packages

Now, that all packages are installable using setuptools,
`--system-site-packages` is no longer necessary, and it's better to use
saner `--no-site-packages`.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7bc1a283f..dd750d0f4 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Apache, though we will be expanding it to other platforms.
 ```
 sudo apt-get install python python-setuptools python-virtualenv \
   python-dev gcc swig dialog libssl-dev
-virtualenv --system-site-packages venv
+virtualenv --no-site-packages venv
 ./venv/bin/python setup.py install
 sudo ./venv/bin/letsencrypt
 ```

From 1343cfa4654810edcda775a889acc6395ebc5af5 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 22 Nov 2014 03:10:22 +0100
Subject: [PATCH 3/3] Add missing line of code (merge/rebase effect).

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index cb7ba0b1e..b39a8230d 100755
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,7 @@ setup(
         'python-augeas',
         'python2-pythondialog',
         'requests',
+    ],
     dependency_links=[
         # http://augeas.net/download.html
         'https://fedorahosted.org/released/python-augeas/',