ubuntuone-dev-tools

Merge lp:~dobey/ubuntuone-dev-tools/fix-913968 into lp:ubuntuone-dev-tools

  1. fix-913968
  2. Merge into trunk
Proposed by dobey on 2012-01-09
Status: Merged
Approved by: dobey on 2012-01-09
Approved revision: 53
Merged at revision: 53
Proposed branch: lp:~dobey/ubuntuone-dev-tools/fix-913968
Merge into: lp:ubuntuone-dev-tools
Diff against target: 13 lines (+2/-1)
1 file modified
setup.py (+2/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-dev-tools/fix-913968
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) 2012-01-09 Approve on 2012-01-09
Review via email: mp+87983@code.launchpad.net

Commit Message

Add missing squid.conf.in to setup.py

To post a comment you must log in.
Alejandro J. Cura (alecu) wrote :

Thanks for working on this so fast!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2011-12-22 21:09:15 +0000
3+++ setup.py 2012-01-09 21:07:24 +0000
4@@ -60,7 +60,8 @@
5 ],
6 data_files=[('share/%s' % PACKAGE,
7 ['pylintrc',
8- 'data/dbus-session.conf.in']),
9+ 'data/dbus-session.conf.in',
10+ 'data/squid.conf.in']),
11 ('share/man/man1',
12 ['man/u1lint.1',
13 'man/u1trial.1']),

Subscribers

People subscribed via source and target branches

to all changes: