Ubuntu One Client

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

Proposed by dobey on 2011-04-27

Status:

Merged

Approved by:

dobey on 2011-04-27

Approved revision:

963

Merged at revision:

964

Proposed branch:

Merge into:

Diff against target:

1 file modified

data/Makefile.am (+5/-1)

To merge this branch:

bzr merge lp:~dobey/ubuntuone-client/fix-debug-logging-16

Reviewer	Date Requested	Status
Shane Fagan (community)		Approve on 2011-04-27
Alejandro J. Cura (community)	2011-04-27	Approve on 2011-04-27
Review via email: mp+59232@code.launchpad.net

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

Revision history for this message

review: Approve

Revision history for this message

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

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) \