commit bcb4729c2238e5520e158905b8ba242d2d00722b Author: Damian Johnson atagar@torproject.org Date: Wed Apr 20 18:44:21 2011 -0700

Excluding TorCtl from install when building deb Dererk is maintaining a deb for TorCtl (python-torctl, http://packages.debian.org/unstable/main/python-torctl) which will be a requirement for arm. Hence, there's no reason to continue bundling TorCtl for that platform. --- setup.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/setup.py b/setup.py index 2176a1c..39497aa 100644 --- a/setup.py +++ b/setup.py @@ -72,6 +72,12 @@ if "install" in sys.argv: except IOError, exc: print "Unable to compress man page: %s" % exc

+# 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.interface', 'arm.interface.graphing', 'arm.interface.connections', 'arm.util'] +if not isDebInstall: installPackages.append('arm.TorCtl') + setup(name='arm', version=VERSION, description='Terminal tor status monitor', @@ -79,7 +85,7 @@ setup(name='arm', author='Damian Johnson', author_email='atagar@torproject.org', url='http://www.atagar.com/arm/', - packages=['arm', 'arm.interface', 'arm.interface.graphing', 'arm.interface.connections', 'arm.util', 'arm.TorCtl'], + packages=installPackages, package_dir={'arm': 'src'}, data_files=[("/usr/bin", ["arm"]), ("/usr/share/man/man1", [manFilename]),