Ubuntu One Control Panel

Merge lp:~thisfred/ubuntuone-control-panel/add-service into lp:ubuntuone-control-panel

  1. add-service
  2. Merge into trunk
Proposed by Eric Casteleijn
Status: Merged
Approved by: Eric Casteleijn
Approved revision: 107
Merged at revision: 106
Proposed branch: lp:~thisfred/ubuntuone-control-panel/add-service
Merge into: lp:ubuntuone-control-panel
Diff against target: 43 lines (+7/-4)
2 files modified
com.ubuntuone.controlpanel.gui.service.in (+1/-1)
setup.py (+6/-3)
To merge this branch: bzr merge lp:~thisfred/ubuntuone-control-panel/add-service
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
dobey (community) Approve
Review via email: mp+54273@code.launchpad.net

Commit message

Use the new service.in file in setup.py

Description of the change

Use the new service.in file in setup.py

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

+GUI_SERVICE_FILE = 'com.ubuntuone.controlpanel.gui.service.in'

This should not have the .in in the string it appears.

review: Needs Fixing
lp:~thisfred/ubuntuone-control-panel/add-service updated
106. By Eric Casteleijn

oops no in

Revision history for this message
dobey (dobey) wrote :

You also need to change the service.in to use "@prefix@/bin" instead of "@bindir@" as @prefix@ is what gets replaced by the command in setup.py.

review: Needs Fixing
Revision history for this message
Eric Casteleijn (thisfred) wrote :

fix pushed in r107

lp:~thisfred/ubuntuone-control-panel/add-service updated
107. By Eric Casteleijn

user @prefix@

Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Very good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'com.ubuntuone.controlpanel.gui.service.in'
2--- com.ubuntuone.controlpanel.gui.service.in 2011-03-04 22:00:58 +0000
3+++ com.ubuntuone.controlpanel.gui.service.in 2011-03-22 13:06:41 +0000
4@@ -1,3 +1,3 @@
5 [D-BUS Service]
6 Name=com.ubuntuone.controlpanel.gui
7-Exec=@bindir@/ubuntuone-control-panel-gtk
8+Exec=@prefix@/bin/ubuntuone-control-panel-gtk
9
10=== modified file 'setup.py'
11--- setup.py 2011-03-21 14:01:51 +0000
12+++ setup.py 2011-03-22 13:06:41 +0000
13@@ -32,16 +32,19 @@
14
15 POT_FILE = 'po/ubuntuone-control-panel.pot'
16 SERVICE_FILE = 'com.ubuntuone.controlpanel.service'
17+GUI_SERVICE_FILE = 'com.ubuntuone.controlpanel.gui.service'
18 MESSAGE_ENTRY = 'ubuntuone-control-panel'
19 CONSTANTS = 'ubuntuone/controlpanel/constants.py'
20
21-CLEANFILES = [SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS, POT_FILE, 'MANIFEST']
22+CLEANFILES = [
23+ SERVICE_FILE, GUI_SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS, POT_FILE,
24+ 'MANIFEST']
25
26
27 def replace_prefix(prefix):
28 """Replace every '@prefix@' with prefix within 'filename' content."""
29 # replace .service file, DATA_DIR constant
30- for filename in (SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS):
31+ for filename in (SERVICE_FILE, GUI_SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS):
32 with open(filename + '.in') as in_file:
33 content = in_file.read()
34 with open(filename, 'w') as out_file:
35@@ -90,7 +93,7 @@
36 data_files=[
37 ('lib/ubuntuone-control-panel',
38 ['bin/ubuntuone-control-panel-backend']),
39- ('share/dbus-1/services/', [SERVICE_FILE]),
40+ ('share/dbus-1/services/', [SERVICE_FILE, GUI_SERVICE_FILE]),
41 ('share/indicators/messages/applications/', [MESSAGE_ENTRY]),
42 ],
43 cmdclass={

Subscribers

People subscribed via source and target branches