Unity Home Scope

Merge lp://qastaging/~jbicha/unity-scope-home/build-with-valac into lp://qastaging/unity-scope-home

  1. build-with-valac
  2. Merge into trunk
Proposed by Jeremy Bícha
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 130
Merged at revision: 130
Proposed branch: lp://qastaging/~jbicha/unity-scope-home/build-with-valac
Merge into: lp://qastaging/unity-scope-home
Diff against target: 12 lines (+1/-1)
1 file modified
debian/control (+1/-1)
To merge this branch: bzr merge lp://qastaging/~jbicha/unity-scope-home/build-with-valac
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Paweł Stołowski (community) Approve
Review via email: mp+168273@code.qastaging.launchpad.net

Commit message

Build with default vala

Description of the change

I test-built this with valac 0.18 (the current default) and .20.

It seemed to build ok but it failed on my computer with the tests (the builder didn't have permission to write to /run/user) but building master failed the tests too so I think this merge is ok.

To post a comment you must log in.
lp://qastaging/~jbicha/unity-scope-home/build-with-valac updated
117. By PS Jenkins bot

Releasing 6.8.0daily13.06.10-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

118. By David Callé

Use the books icon for the Books master scope.

Approved by PS Jenkins bot, Pawel Stolowski.

119. By Michal Hruby

Remove the static declarations of all Master scopes and use the protocol library to parse everything from the .scope files.

Approved by PS Jenkins bot, Pawel Stolowski.

120. By Jeremy Bícha

capitalize More Suggestions.

Approved by PS Jenkins bot, Michael Terry.

121. By Michal Hruby

Extract form-factor from search hints and pass it to SSS.

Approved by PS Jenkins bot, Pawel Stolowski.

122. By Michal Hruby

Capitalize S in "More Suggestions".

Approved by PS Jenkins bot, Pawel Stolowski.

123. By Michal Hruby

Revert r120.

Approved by PS Jenkins bot, Łukasz Zemczak.

124. By PS Jenkins bot

Releasing 6.8.0daily13.06.19-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

125. By Michal Hruby

As per design guidelines, use capital letters only for first words.

Approved by PS Jenkins bot, Pawel Stolowski.

126. By PS Jenkins bot

Releasing 6.8.0daily13.06.21-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

127. By Didier Roche-Tolomelli

ship definition of master scopes in unity-scopes-master-default.

Approved by PS Jenkins bot, Michal Hruby.

128. By Michal Hruby

Take renderer definitions from .scope files if present.

Approved by PS Jenkins bot, Pawel Stolowski.

129. By PS Jenkins bot

Releasing 6.8.1+13.10.20130702-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

Revision history for this message
Paweł Stołowski (stolowski) wrote :

There is a merge conflict, can you merge trunk please?

review: Needs Fixing
Revision history for this message
Paweł Stołowski (stolowski) wrote :

For some reason building the deb fails for me if I only have valac-0.20.1 (the current one in S), and uninstall valac-0.18:

% dpkg-buildpackage -us -uc -b
dpkg-buildpackage: source package unity-scope-home
dpkg-buildpackage: source version 6.8.0daily13.06.05-0ubuntu1
dpkg-buildpackage: source changed by Ubuntu daily release <email address hidden>
dpkg-buildpackage: host architecture amd64
 dpkg-source --before-build build-with-valac
dpkg-checkbuilddeps: Unmet build dependencies: valac (>= 0.18.0)
dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting
dpkg-buildpackage: warning: (Use -d flag to override.)
saucy:/home/pawel/src/ubuntu/home-scope/build-with-valac% valac --version
Vala 0.20.1

review: Needs Fixing
lp://qastaging/~jbicha/unity-scope-home/build-with-valac updated
130. By Jeremy Bícha

build with default valac

Revision history for this message
Jeremy Bícha (jbicha) wrote :

Rebased against trunk.

Make sure you have the valac package installed and not just valac-0.20. If you use something like sbuild or pbuilder it should handle installing dependencies automatically.

Revision history for this message
Paweł Stołowski (stolowski) wrote :

Works fine. +1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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

to all changes: