← 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-02-10 01:57:32 UTC
  • mfrom: (425 trunk)
  • mto: This revision was merged to the branch mainline in revision 426.
  • Revision ID: john@arbash-meinel.com-20110210015732-b3kkt1jp7bsqcv0v
Merge loggerhead trunk back into load-test to resolve
__init__.py conflicts from Jelmer's update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
18
18
 
19
19
"""Loggerhead is a web viewer for projects in bazaar"""
20
20
 
21
 
 
22
21
from distutils.core import setup
 
22
 
23
23
import loggerhead
24
24
 
25
25
 
34
34
    packages = ["loggerhead",
35
35
                "loggerhead/apps",
36
36
                "loggerhead/controllers",
37
 
                "loggerhead/templates"],
 
37
                "loggerhead/templates",
 
38
                "bzrlib.plugins.loggerhead"],
 
39
    package_dir={'bzrlib.plugins.loggerhead':'.'},
38
40
    package_data = {"loggerhead": ["templates/*.pt",
39
41
                                   "static/css/*.css",
40
42
                                   "static/javascript/*.js",