Merge lp://staging/~xnox/bamf/fix-ftbfs into lp://staging/bamf/0.4
Proposed by
Dimitri John Ledkov
| Status: | Rejected |
|---|---|
| Rejected by: | Marco Trevisan (Treviño) |
| Proposed branch: | lp://staging/~xnox/bamf/fix-ftbfs |
| Merge into: | lp://staging/bamf/0.4 |
| Diff against target: |
37 lines (+11/-1) (has conflicts) 2 files modified
debian/changelog (+10/-0) lib/libbamf/Makefile.am (+1/-1) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://staging/~xnox/bamf/fix-ftbfs |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Dimitri John Ledkov (community) | Disapprove | ||
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
| Unity Team | Pending | ||
|
Review via email:
|
|||
Commit message
* Fix FTBFS against new g-ir-scanner. C-include is not actually needed, verified - no changes to the gir file from previous versions.
Description of the change
Fix FTBFS against new g-ir-scanner. C-include is not actually needed, verified - no changes to the gir file from previous versions.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Unmerged revisions
- 529. By Dimitri John Ledkov
-
add changelog
- 528. By Dimitri John Ledkov
-
Fix FTBFS against new g-ir-scanner. C-include is not actually needed, verified - no changes to the gir file from previous versions.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:529
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://