Merge lp:~dobey/ubuntuone-client/fix-debug-logging-16 into lp:ubuntuone-client/stable-1-6

Proposed by Rodney Dawes on 2011-04-27
Status: Merged
Approved by: Rodney Dawes on 2011-04-27
Approved revision: 963
Merged at revision: 964
Proposed branch: lp:~dobey/ubuntuone-client/fix-debug-logging-16
Merge into: lp:ubuntuone-client/stable-1-6
Diff against target: 30 lines (+5/-1) 1 file modified
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/fix-debug-logging-16
Reviewer Review Type Date Requested Status
Shane Fagan (community) Approve on 2011-04-27
Alejandro J. Cura 2011-04-27 Approve on 2011-04-27
Review via email: mp+59232@code.launchpad.net

Commit Message

Don't dist the generated logging.conf, to ensure it gets built from tarball

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

Preview Diff

1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2011-01-05 21:36:43 +0000
3+++ data/Makefile.am 2011-04-27 14:15:55 +0000
4@@ -7,7 +7,9 @@
5
6 configdir = $(sysconfdir)/xdg/ubuntuone
7 config_in_files = logging.conf.in
8-config_DATA = syncdaemon.conf $(config_in_files:.conf.in=.conf)
9+config_out_files = $(config_in_files:.conf.in=.conf)
10+config_files = syncdaemon.conf
11+config_DATA = $(config_files) $(config_out_files)
12
13 autostartdir = $(sysconfdir)/xdg/autostart
14 autostart_in_files = ubuntuone-launch.desktop.in
15@@ -122,6 +124,7 @@
16
17 EXTRA_DIST = \
18 $(config_in_files) \
19+ $(config_files) \
20 $(autostart_in_files) \
21 $(service_in_files) \
22 $(emblem_in_files) \
23@@ -133,6 +136,7 @@
24 $(crashdb_DATA)
25
26 CLEANFILES = \
27+ $(config_out_files) \
28 $(autostart_DATA) \
29 $(service_DATA) \
30 $(emblem_files) \

Subscribers

People subscribed via source and target branches