Ubuntu One Client

Merge lp:~dobey/ubuntuone-client/fix-debug-logging into lp:ubuntuone-client

  1. fix-debug-logging
  2. Merge into trunk
Proposed by dobey
Status: Superseded
Proposed branch: lp:~dobey/ubuntuone-client/fix-debug-logging
Merge into: lp:ubuntuone-client
Diff against target: 27 lines (+3/-3)
1 file modified
data/Makefile.am (+3/-3)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/fix-debug-logging
Reviewer Review Type Date Requested Status
Shane Fagan (community) Approve
Eric Casteleijn (community) Approve
Review via email: mp+59088@code.launchpad.net

This proposal has been superseded by a proposal from 2011-04-26.

Commit message

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

To post a comment you must log in.
Revision history for this message
Eric Casteleijn (thisfred) :
review: Approve
Revision history for this message
Shane Fagan (shanepatrickfagan) :
review: Approve
lp:~dobey/ubuntuone-client/fix-debug-logging updated
969. By dobey

Fix the clean rules to not remove syncdaemon.conf

970. By dobey

Merge with trunk

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2011-01-05 21:36:43 +0000
3+++ data/Makefile.am 2011-04-26 15:35:39 +0000
4@@ -6,8 +6,8 @@
5 crashdb_DATA = ubuntuone-client-crashdb.conf
6
7 configdir = $(sysconfdir)/xdg/ubuntuone
8-config_in_files = logging.conf.in
9-config_DATA = syncdaemon.conf $(config_in_files:.conf.in=.conf)
10+config_in_files = logging.conf.in syncdaemon.conf
11+config_DATA = $(config_in_files:.conf.in=.conf)
12
13 autostartdir = $(sysconfdir)/xdg/autostart
14 autostart_in_files = ubuntuone-launch.desktop.in
15@@ -128,11 +128,11 @@
16 $(icon_in_files) \
17 $(icon_cache) \
18 stamp-render \
19- $(config_DATA) \
20 $(apport_DATA) \
21 $(crashdb_DATA)
22
23 CLEANFILES = \
24+ $(config_DATA) \
25 $(autostart_DATA) \
26 $(service_DATA) \
27 $(emblem_files) \

Subscribers

People subscribed via source and target branches