[Merge] lp:~hjd/ubuntu/wily/ninja-build/debian-merged into lp:ubuntu/ninja-build

[Hans Joachim Desserud]

Hans Joachim Desserud has proposed merging lp:~hjd/ubuntu/wily/ninja-build/debian-merged into lp:ubuntu/ninja-build.

Requested reviews:
  Ubuntu branches (ubuntu-branches)
Related bugs:
  Bug #1473680 in ninja-build (Ubuntu): "Please update Ninja from Debian"
  https://bugs.launchpad.net/ubuntu/+source/ninja-build/+bug/1473680

For more details, see:
https://code.launchpad.net/~hjd/ubuntu/wily/ninja-build/debian-merged/+merge/264494

Hello, this is my first merge. Since the Ubuntu delta was quite small for this package, I figured it might be a good place to start.

I started reading https://wiki.ubuntu.com/UbuntuDevelopment/Merging, but ended up at http://packaging.ubuntu.com/html/udd-merging.html since that was mentioned as the preferred way for the future.

I have built the package successfully in my local Wily vm.
-- 
Your team Ubuntu branches is requested to review the proposed merge of lp:~hjd/ubuntu/wily/ninja-build/debian-merged into lp:ubuntu/ninja-build.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 252362 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20150712/89fb00f4/attachment-0001.diff>