loggerhead

Merge lp:~toshio/loggerhead/sdist-post-1.8.1 into lp:loggerhead

  1. sdist-post-1.8.1
  2. Merge into trunk-rich
Proposed by Toshio Kuratomi
Status: Merged
Merged at revision: 483
Proposed branch: lp:~toshio/loggerhead/sdist-post-1.8.1
Merge into: lp:loggerhead
Diff against target: 39 lines (+9/-2)
2 files modified
MANIFEST.in (+6/-0)
setup.py (+3/-2)
To merge this branch: bzr merge lp:~toshio/loggerhead/sdist-post-1.8.1
Reviewer Review Type Date Requested Status
Cruz Bishop (community) code Approve
Richard Harding (community) code* Approve
Review via email: mp+91952@code.launchpad.net

Description of the change

This patch adds the loggerhead/middleware directory (with a profiler) to the install and a few other files (documentation, tests, and example start script) to the sdist.

To post a comment you must log in.
lp:~toshio/loggerhead/sdist-post-1.8.1 updated
469. By Toshio Kuratomi

Remove loggerhead.example.conf as it's no longer shipped

Revision history for this message
Richard Harding (rharding) wrote :

Thanks Toshio, this looks like a good update of the packaging as things seem to have fallen out of sync.

review: Approve (code*)
Revision history for this message
Cruz Bishop (cruzjbishop) wrote :

I can't see any problems with this. Thanks

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2012-02-02 04:58:46 +0000
3+++ MANIFEST.in 2012-02-08 01:41:27 +0000
4@@ -1,6 +1,12 @@
5+include COPYING.txt
6+include HACKING
7 include NEWS
8 include README.txt
9 include apache-loggerhead.conf
10 include bazaar.conf
11 include loggerhead.conf.example
12+include loggerheadd
13+include Makefile
14+recursive-include docs *
15 recursive-include loggerhead/static *
16+recursive-include loggerhead/tests/ *.py *.pt
17
18=== modified file 'setup.py'
19--- setup.py 2012-02-02 04:58:46 +0000
20+++ setup.py 2012-02-08 01:41:27 +0000
21@@ -37,6 +37,7 @@
22 packages = ["loggerhead",
23 "loggerhead/apps",
24 "loggerhead/controllers",
25+ "loggerhead/middleware",
26 "loggerhead/templates",
27 "bzrlib.plugins.loggerhead"],
28 package_dir={'bzrlib.plugins.loggerhead':'.'},
29@@ -68,8 +69,8 @@
30 "static/images/*"]},
31 data_files = [
32 ('share/man/man1', ['serve-branches.1']),
33- ('share/doc/loggerhead', ['loggerhead.conf.example',
34- 'apache-loggerhead.conf',
35+ ('share/doc/loggerhead', ['apache-loggerhead.conf',
36+ 'loggerheadd',
37 'bazaar.conf']),
38 ],
39 )

Subscribers

People subscribed via source and target branches