Merge lp://qastaging/~noskcaj/ubuntu/utopic/jquery/merge into lp://qastaging/ubuntu/utopic/jquery
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/utopic/jquery/merge |
| Merge into: | lp://qastaging/ubuntu/utopic/jquery |
| Diff against target: |
291 lines (+34/-157) 11 files modified
.pc/applied-patches (+0/-1) .pc/no-min.diff/Makefile (+0/-137) Makefile (+1/-1) debian/changelog (+19/-0) debian/control (+2/-2) debian/links (+0/-1) debian/patches/build.patch (+9/-2) debian/patches/no-min.diff (+0/-11) debian/patches/series (+0/-1) debian/rules (+2/-1) debian/source.lintian-overrides (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/utopic/jquery/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
Merge from debian + fix build with make 4.0
To post a comment you must log in.
Revision history for this message
| Dmitry Shachnev (mitya57) wrote | # |
Revision history for this message
| Jackson Doak (noskcaj) wrote | # |
Unmerged revisions
- 23. By Jackson Doak
-
debian/rules: Add fix from debian for make 4.0
- 22. By Jackson Doak
-
* Merge from debian. Remaining change:
- debian/control: Suggest rather than recommend javascript-common;
it's in universe and we don't necessarily need to publish these
scripts via http
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.