Merge lp://qastaging/~l3on/ubuntu/trusty/wyrd/ftbfs-1281275 into lp://qastaging/ubuntu/trusty/wyrd
Proposed by
Leo Iannacone
| Status: | Merged |
|---|---|
| Merge reported by: | Martin Pitt |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~l3on/ubuntu/trusty/wyrd/ftbfs-1281275 |
| Merge into: | lp://qastaging/ubuntu/trusty/wyrd |
| Diff against target: |
108 lines (+57/-4) 6 files modified
debian/changelog (+11/-0) debian/patches/01_editor.dpatch (+7/-3) debian/patches/02_fix-ftbfs-ocaml-4.patch (+36/-0) debian/patches/series (+2/-0) debian/rules (+0/-1) debian/source/format (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~l3on/ubuntu/trusty/wyrd/ftbfs-1281275 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Pitt | Approve | ||
|
Review via email:
|
|||
Description of the change
* Use quilt instead of dpatch (deprecated):
+ added debian/
+ removed include dpatch.mk from debian/rules
* Imported patch from upstream to fix FTBFS with
Ocalm 4: 02_fix-
* Refreshed 01_editor.dpatch
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks! Uploaded.