commit 054b1f29b1e651bf8141287c98da7e428b8129c7 Author: Damian Johnson atagar@torproject.org Date: Thu Sep 29 08:27:53 2011 -0700

Switching deb build from adding to removing pkgs

It makes more sense for the deb flag to remove packages from the base install rather than the omission adding. The rpm builds will be doing something similar so making the tweak now so we can add the rpm flag to the torctl removal check. --- setup.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py index bc97d00..1f5d463 100644 --- a/setup.py +++ b/setup.py @@ -95,8 +95,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'] -if not isDebInstall: installPackages.append('arm.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'] +if isDebInstall: installPackages.remove('arm.TorCtl') if INCLUDE_CAGRAPH: installPackages += ['arm.cagraph', 'arm.cagraph.axis', 'arm.cagraph.series']

setup(name='arm',