← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: John Arbash Meinel
  • Date: 2011-03-16 11:40:05 UTC
  • mfrom: (434 trunk-rich)
  • mto: This revision was merged to the branch mainline in revision 435.
  • Revision ID: john@arbash-meinel.com-20110316114005-1rdrmdu9hda30xak
Merge trunk to resolve text conflict in deleting setup_logging

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
30
30
    license = "GNU GPL v2 or later",
31
31
    maintainer = "Michael Hudson",
32
32
    maintainer_email = "michael.hudson@canonical.com",
33
 
    scripts = ["start-loggerhead", "stop-loggerhead", "serve-branches"],
 
33
    scripts = ["serve-branches"],
34
34
    packages = ["loggerhead",
35
35
                "loggerhead/apps",
36
36
                "loggerhead/controllers",
64
64
                                   "static/javascript/yui/build/yui-base/*",
65
65
                                   "static/images/*"]},
66
66
    data_files = [
67
 
        ('share/man/man1', ['start-loggerhead.1',
68
 
                            'stop-loggerhead.1',
69
 
                            'serve-branches.1']),
70
 
        ('share/doc/loggerhead', ['loggerhead.conf.example']),
 
67
        ('share/man/man1', ['serve-branches.1']),
71
68
        ],
72
69
    )