Merge lp:~dcaro/clicompanion/fix-802298 into lp:clicompanion

Proposed by David Caro
Status: Merged
Merged at revision: 95
Proposed branch: lp:~dcaro/clicompanion/fix-802298
Merge into: lp:clicompanion
Diff against target: 13 lines (+1/-1)
1 file modified
setup.py (+1/-1)
To merge this branch: bzr merge lp:~dcaro/clicompanion/fix-802298
Reviewer Review Type Date Requested Status
David Caro Approve
Review via email: mp+87172@code.launchpad.net

Description of the change

Only applied the patch, for merging with trunk

To post a comment you must log in.
Revision history for this message
David Caro (dcaro) wrote :

Patch already approved, merging directly.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'clicompanion' (properties changed: -x to +x)
2=== modified file 'setup.py'
3--- setup.py 2011-12-23 21:47:22 +0000
4+++ setup.py 2011-12-30 23:18:23 +0000
5@@ -39,7 +39,7 @@
6 data_files=[('/etc/clicompanion.d/', ['data/clicompanion2.config']),
7 ('/usr/share/pixmaps', ['data/clicompanion.16.png']),
8 ('/usr/share/applications', ['data/clicompanion.desktop']),
9- ('share/clicompanion/locale/', glob.glob('locale/*/LC_MESSAGES/*.mo')),
10+ ('/usr/share/clicompanion/locale/', glob.glob('locale/*/LC_MESSAGES/*.mo')),
11 ],
12
13 cmdclass = { 'build' : build_extra.build_extra,

Subscribers

People subscribed via source and target branches