Merge lp:~dholbach/help-app/1434125 into lp:help-app
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 119 | ||||
| Proposed branch: | lp:~dholbach/help-app/1434125 | ||||
| Merge into: | lp:help-app | ||||
| Prerequisite: | lp:~dholbach/help-app/1429896 | ||||
| Diff against target: |
1402 lines (+559/-350) 4 files modified
HACKING (+6/-1) Makefile (+7/-1) internals/web-publish (+21/-0) po/de.po (+525/-348) |
||||
| To merge this branch: | bzr merge lp:~dholbach/help-app/1434125 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve on 2015-03-24 | ||
| Nicholas Skaggs | Approve on 2015-03-23 | ||
| Ubuntu Phone Apps Jenkins Bot | continuous-integration | Needs Fixing on 2015-03-23 | |
| Michael Vogt (community) | Approve on 2015-03-20 | ||
| David Planella | 2015-03-20 | Pending | |
|
Review via email:
|
|||
This proposal supersedes a proposal from 2015-03-19.
Commit Message
add publish-web makefile
Description of the Change
add publish-web makefile
- 127. By Daniel Holbach on 2015-03-20
-
use trap (http://
redsymbol. net/articles/ bash-exit- traps/), thanks mvo! don't test rc of 'bzr commit', we use 'set -e' already - 128. By Daniel Holbach on 2015-03-20
-
merge from trunk
- 129. By Daniel Holbach on 2015-03-20
-
update .po files
- 130. By Daniel Holbach on 2015-03-20
-
we need bzrtools, thanks Nick!
| Nicholas Skaggs (nskaggs) wrote : | # |
My guess is you'll get to the issue first.
bzr import make[1]: Entering directory '/home/
/home/nskaggs/
Sorry I'm always breaking your stuff :-)
| Daniel Holbach (dholbach) wrote : | # |
Oops, sorry - I pushed changes to the wrong branch...
| Daniel Holbach (dholbach) wrote : | # |
Ignore the last change. Overwrote the branch with old contents again.
- 131. By Daniel Holbach on 2015-03-23
-
fix logic to obtain OUTPUTDIR_WEB value from Makefile
FAILED: Continuous integration, rev:131
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
FAILED: Continuous integration, rev:131
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://

Thanks! Added inline comments.