[tor-commits] [arm/master] Setup changes to reflect stem and the gui

[atagar at torproject.org]

commit cb0c846a47eda9014c29d8e4a0cecd9241dedb76
Author: Damian Johnson <atagar at torproject.org>
Date:   Tue Dec 11 20:27:11 2012 -0800

    Setup changes to reflect stem and the gui
    
    Dropping the gui and adding stem to our 'setup.py'. I didn't try a build yet -
    that'll come later.
---
 setup.py |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 1f5d463..c94ac1f 100644
--- a/setup.py
+++ b/setup.py
@@ -6,8 +6,6 @@ import tempfile
 from src.version import VERSION
 from distutils.core import setup
 
-INCLUDE_CAGRAPH = False
-
 def getResources(dst, sourceDir):
   """
   Provides a list of tuples of the form...
@@ -95,9 +93,8 @@ if "install" in sys.argv:
 # When installing we include a bundled copy of TorCtl. However, when creating
 # a deb we have a dependency on the python-torctl package instead:
 # http://packages.debian.org/unstable/main/python-torctl
-installPackages = ['arm', 'arm.cli', 'arm.cli.graphing', 'arm.cli.connections', 'arm.cli.menu', 'arm.gui', 'arm.gui.connections', 'arm.gui.graphing', 'arm.util', 'arm.TorCtl']
+installPackages = ['arm', 'arm.cli', 'arm.cli.graphing', 'arm.cli.connections', 'arm.cli.menu', 'arm.util', 'arm.TorCtl', 'arm.stem']
 if isDebInstall: installPackages.remove('arm.TorCtl')
-if INCLUDE_CAGRAPH: installPackages += ['arm.cagraph', 'arm.cagraph.axis', 'arm.cagraph.series']
 
 setup(name='arm',
       version=VERSION,