Activity Log Manager

Merge lp://staging/~ev/activity-log-manager/split-out-diagnostics-service into lp://staging/activity-log-manager

  1. split-out-diagnostics-service
  2. Merge into redesign
Proposed by Evan
Status: Merged
Merged at revision: 82
Proposed branch: lp://staging/~ev/activity-log-manager/split-out-diagnostics-service
Merge into: lp://staging/activity-log-manager
Diff against target: 660 lines (+19/-498)
11 files modified
configure.ac (+3/-7)
data/Makefile.am (+6/-1)
po/POTFILES.in (+1/-2)
src/Makefile.am (+8/-11)
src/diagnostics-widget.c (+1/-1)
src/diagnostics/Makefile.am (+0/-50)
src/diagnostics/com.ubuntu.WhoopsiePreferences.conf (+0/-26)
src/diagnostics/com.ubuntu.WhoopsiePreferences.service (+0/-4)
src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in (+0/-18)
src/diagnostics/whoopsie-preferences.c (+0/-363)
src/diagnostics/whoopsie-preferences.xml (+0/-15)
To merge this branch: bzr merge lp://staging/~ev/activity-log-manager/split-out-diagnostics-service
Reviewer Review Type Date Requested Status
Manish Sinha (मनीष सिन्हा) merge-conflict, distcheck Needs Fixing
Review via email: mp+175820@code.staging.launchpad.net

Description of the change

This branch removes the code for the whoopsie-preferences DBus service as it now lives in the whoopsie-preferences package (http://bazaar.launchpad.net/~ev/whoopsie-preferences/trunk/files).

See also:
https://bugs.launchpad.net/ubuntu/+source/activity-log-manager/+bug/1203042

To post a comment you must log in.
Revision history for this message
Manish Sinha (मनीष सिन्हा) (manishsinha) wrote :

First, it give a conflict that it cannot delete directory src/diagnostic

Second, even after I manually delete the folder and resolve conflict, distcheck fails because 2 files in po/POTFILES.in still reference the older ui file and C file in diagnostic folder

Please take care of these two issues and make sure that it still works as you expected it to work

review: Needs Fixing (merge-conflict, distcheck)
lp://staging/~ev/activity-log-manager/split-out-diagnostics-service updated
81. By Evan

Merge with trunk.

82. By Evan

Point at the right locations for whoopsie in the translations.

Revision history for this message
Evan (ev) wrote :

I just tried merging it against lp:activity-log-manager locally and it went fine. It'd also show conflicts here if there were some.

I've merged the branch against tip and updated the references in POTFILES.in. make distcheck is now working fine locally.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches