Merge lp://staging/~manishsinha/scratch/move-to-zeitgeist2 into lp://staging/~elementary-apps/scratch/scratch

Status: Merged
Approved by: Mario Guerriero
Approved revision: 1187
Merged at revision: 1206
Proposed branch: lp://staging/~manishsinha/scratch/move-to-zeitgeist2
Merge into: lp://staging/~elementary-apps/scratch/scratch
Diff against target: 318 lines (+42/-36)
18 files modified
CMakeLists.txt (+1/-1)
README (+1/-1)
plugins/brackets-completion/CMakeLists.txt (+1/-1)
plugins/browser-preview/CMakeLists.txt (+1/-1)
plugins/contractor/CMakeLists.txt (+1/-1)
plugins/filemanager/CMakeLists.txt (+1/-1)
plugins/folder-manager/CMakeLists.txt (+1/-1)
plugins/open-with/CMakeLists.txt (+1/-1)
plugins/outline/CMakeLists.txt (+1/-1)
plugins/pastebin/CMakeLists.txt (+1/-1)
plugins/source-tree/CMakeLists.txt (+1/-1)
plugins/spell/CMakeLists.txt (+1/-1)
plugins/strip-trailing-save/CMakeLists.txt (+1/-1)
plugins/terminal/CMakeLists.txt (+1/-1)
plugins/vim-emulation/CMakeLists.txt (+1/-1)
plugins/word-completion/CMakeLists.txt (+1/-1)
src/MainWindow.vala (+4/-4)
src/Services/ZeitgeistLogger.vala (+22/-16)
To merge this branch: bzr merge lp://staging/~manishsinha/scratch/move-to-zeitgeist2
Reviewer Review Type Date Requested Status
Mario Guerriero (community) Approve
Review via email: mp+180729@code.staging.launchpad.net

Commit message

Move from libzeitgeist-1.0 to libzeitgeist-2.0

Description of the change

Move from libzeitgeist-1.0 to libzeitgeist-2.0

To post a comment you must log in.
Revision history for this message
Mario Guerriero (mefrio-g) :
review: Approve
Revision history for this message
Mario Guerriero (mefrio-g) :
review: Approve
Revision history for this message
Mario Guerriero (mefrio-g) :
review: Approve
Revision history for this message
Mario Guerriero (mefrio-g) :
review: Approve
Revision history for this message
Cody Garver (codygarver) wrote :

Does this work in precise? Scratch 2.0.1 targets precise

Revision history for this message
Mario Guerriero (mefrio-g) wrote :

I don't think so but I am starting to have some doubts on releasing a new version for Precise. Moreover a similary libgtk-spell branch was merged. What do you think?

Revision history for this message
Manish Sinha (मनीष सिन्हा) (manishsinha) wrote :

This will work on Ubuntu 13.04 and later

Revision history for this message
Cody Garver (codygarver) wrote :

I've seen emails of reports saying Scratch is Luna has problems. If you don't want 2.0.1 to be in Luna anymore, can you address a problem or two in the Luna branch?

Revision history for this message
Mario Guerriero (mefrio-g) wrote :

If it has problems I will release a 2.0.1 as soon as possible. In conclusion this branch will be merged after 2.0.1 and I have to revert the the libgtk-spell one.

    —
Sent from Mailbox for iPhone

On Sun, Aug 18, 2013 at 10:47 AM, Cody Garver <email address hidden>
wrote:

> I've seen emails of reports saying Scratch is Luna has problems. If you don't want 2.0.1 to be in Luna anymore, can you address a problem or two in the Luna branch?
> --
> https://code.launchpad.net/~manishsinha/scratch/move-to-zeitgeist2/+merge/180729
> You are reviewing the proposed merge of lp:~manishsinha/scratch/move-to-zeitgeist2 into lp:scratch.

Revision history for this message
Manish Sinha (मनीष सिन्हा) (manishsinha) wrote :

This branch is only for ubuntu 0.9.12 and above (which comes with libzeitgeist-2.0)

If the next release of scratch targets release below ubuntu 13.04, then this MP can be delayed till scratch targets only saucy

Revision history for this message
Mario Guerriero (mefrio-g) wrote :

I will merge it after Scratch 2.0.1

    —
Sent from Mailbox for iPhone

On Sun, Aug 18, 2013 at 10:56 AM, Manish Sinha (मनीष सिन्हा
<email address hidden> wrote:

> This branch is only for ubuntu 0.9.12 and above (which comes with libzeitgeist-2.0)
> If the next release of scratch targets release below ubuntu 13.04, then this MP can be delayed till scratch targets only saucy
> --
> https://code.launchpad.net/~manishsinha/scratch/move-to-zeitgeist2/+merge/180729
> You are reviewing the proposed merge of lp:~manishsinha/scratch/move-to-zeitgeist2 into lp:scratch.

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