Merge lp://staging/~noskcaj/ubuntu/trusty/jquery/merge into lp://staging/ubuntu/trusty/jquery
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~noskcaj/ubuntu/trusty/jquery/merge |
| Merge into: | lp://staging/ubuntu/trusty/jquery |
| Diff against target: |
442 lines (+35/-297) 12 files modified
.pc/applied-patches (+0/-2) .pc/build.patch/Makefile (+0/-137) .pc/no-min.diff/Makefile (+0/-137) Makefile (+4/-4) debian/changelog (+18/-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 (+1/-0) debian/source.lintian-overrides (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/trusty/jquery/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
Merge from debian
To post a comment you must log in.
Unmerged revisions
- 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
This adds node-uglify as build-dep, which is in universe. We either need to work around it or follow https:/