← Back to branch summary

~didrocks/ubuntuone-client/use_result_var

« back to all changes in this revision

Viewing changes to data/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Rodney Dawes
  • Date: 2011-01-07 10:36:49 UTC
  • mfrom: (1.1.42 upstream)
  • Revision ID: james.westby@ubuntu.com-20110107103649-wy7te58dl47kwfgs
Tags: 1.5.2-0ubuntu1
https://launchpad.net/bugs/692566
https://launchpad.net/bugs/657850
https://launchpad.net/bugs/692496
https://launchpad.net/bugs/697211
* New upstream release.
  - ImportError: No module named tools (LP: #692566)
  - Preferences doesn't display info properly (LP: #657850)
  - Ubuntu One crashes in scan() (LP: #692496)A
  - Provide a specific login D-Bus service (LP: #697211)

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/Makefile.am
9
9
config_in_files = logging.conf.in
10
10
config_DATA = syncdaemon.conf $(config_in_files:.conf.in=.conf)
11
11
 
12
 
memenudir = $(datadir)/indicators/me
13
 
memenu_in_files = ubuntuone.menu.in
14
 
memenu_DATA = $(memenu_in_files:.menu.in=.menu)
15
 
 
16
 
%.menu: %.menu.in
17
 
        @sed -e "s|\@DATADIR\@|$(datadir)|" $< > $@
18
 
 
19
 
desktopdir = $(datadir)/applications
20
 
desktop_in_files = ubuntuone-preferences.desktop.in
21
 
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
22
 
 
23
12
autostartdir = $(sysconfdir)/xdg/autostart
24
13
autostart_in_files = ubuntuone-launch.desktop.in
25
14
autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
42
31
 
43
32
servicedir = $(DBUS_SERVICES_DIR)
44
33
service_in_files = \
45
 
        com.ubuntuone.SyncDaemon.service.in
 
34
        com.ubuntuone.SyncDaemon.service.in     \
 
35
        com.ubuntuone.Credentials.service.in
46
36
service_DATA = $(service_in_files:.service.in=.service)
47
37
 
48
38
%.service: %.service.in
132
122
 
133
123
EXTRA_DIST =                    \
134
124
        $(config_in_files)      \
135
 
        $(memenu_in_files)      \
136
 
        $(desktop_in_files)     \
137
125
        $(autostart_in_files)     \
138
126
        $(service_in_files)     \
139
127
        $(emblem_in_files)      \
145
133
        $(crashdb_DATA)
146
134
 
147
135
CLEANFILES =            \
148
 
        $(memenu_DATA)  \
149
 
        $(desktop_DATA) \
150
136
        $(autostart_DATA) \
151
137
        $(service_DATA) \
152
138
        $(emblem_files) \