Ubuntu
nautilus package

Merge lp://qastaging/~manishsinha/ubuntu/saucy/nautilus/move-to-zeitgeist2 into lp://qastaging/ubuntu/saucy/nautilus

  1. Saucy (13.10)
  2. move-to-zeitgeist2
  3. Merge into saucy
Status: Work in progress
Proposed branch: lp://qastaging/~manishsinha/ubuntu/saucy/nautilus/move-to-zeitgeist2
Merge into: lp://qastaging/ubuntu/saucy/nautilus
Diff against target: 143 lines (+20/-12)
6 files modified
.pc/ubuntu_revert_no_wallpaper.patch/libnautilus-private/Makefile.am (+2/-2)
debian/changelog (+8/-0)
debian/patches/zg_activity_logging.patch (+5/-5)
libnautilus-private/Makefile.am (+2/-2)
test/Makefile.am (+2/-2)
test/run-zeitgeist-test.sh (+1/-1)
To merge this branch: bzr merge lp://qastaging/~manishsinha/ubuntu/saucy/nautilus/move-to-zeitgeist2
Reviewer Review Type Date Requested Status
Martin Pitt Needs Fixing
Jeremy Bícha Needs Fixing
Review via email: mp+173099@code.qastaging.launchpad.net

Description of the change

* debian/patches/zg_activity_logging.patch
  - updated to use zeitgeist-2.0
    (LP: #1197569)

To post a comment you must log in.
Revision history for this message
Jeremy Bícha (jbicha) wrote :

Could you propose this against the ubuntu-desktop packaging-only branch instead?

https://code.launchpad.net/~ubuntu-desktop/nautilus/ubuntu

Thanks!

review: Needs Fixing
Reply
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks! I applied the relevant part of the diff to the real packaging branch, together with the corresponding build dependency change: http://bazaar.launchpad.net/~ubuntu-desktop/nautilus/ubuntu/revision/394

Doing build/test/upload now. Thanks!

I won't literally merge this into the UDD branch, so I'm closing the MP.

review: Approve
Reply
Revision history for this message
Martin Pitt (pitti) wrote :

Backing out the commit as this fails to build:

test-nautilus-zeitgeist.o: In function `assert_results_as_expected':
/tmp/build-area/nautilus-3.8.2/test/test-nautilus-zeitgeist.c:122: undefined reference to `zeitgeist_result_set_next'

review: Needs Fixing
Reply

Unmerged revisions

333. By Manish Sinha (मनीष सिन्हा)

* debian/patches/zg_activity_logging.patch
  - updated to use zeitgeist-2.0
    (LP: #1197569)

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