diff options
| author | hut <hut@lavabit.com> | 2011-10-11 22:34:21 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2011-10-11 22:34:21 +0200 |
| commit | 30a35e6a7b95a06709590dc56afb96ea7ccecb62 (patch) | |
| tree | c44a71f9502dd08e5f1917ceb0f0f33fe3efe57f /setup.py | |
| parent | 6524d00c5ce0d1169645a879fe581ee29d91b33c (diff) | |
| parent | 6f695ffeafd1d2f1cb7c0c201b395582a1f7ce4e (diff) | |
| download | ranger-30a35e6a7b95a06709590dc56afb96ea7ccecb62.tar.gz | |
Merge branch 'master' into stable
Conflicts: ranger/defaults/options.py
Diffstat (limited to 'setup.py')
| -rwxr-xr-x | setup.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/setup.py b/setup.py index e63e28d2..ec782794 100755 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2009, 2010 Roman Zimbelmann <romanz@lavabit.com> +# Copyright (C) 2009, 2010, 2011 Roman Zimbelmann <romanz@lavabit.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,9 +27,9 @@ if __name__ == '__main__': author_email=ranger.__email__, license=ranger.__license__, url='http://savannah.nongnu.org/projects/ranger', - scripts=['scripts/ranger'], + scripts=['ranger/data/ranger'], data_files=[('share/man/man1', ['doc/ranger.1'])], - package_data={'ranger': ['data/*']}, + package_data={'ranger': ['data/*', 'defaults/rc.conf']}, packages=('ranger', 'ranger.api', 'ranger.colorschemes', @@ -39,5 +39,4 @@ if __name__ == '__main__': 'ranger.ext', 'ranger.fsobject', 'ranger.gui', - 'ranger.gui.widgets', - 'ranger.help')) + 'ranger.gui.widgets')) |