Merge lp://qastaging/~noskcaj/ubuntu/trusty/torque/merge into lp://qastaging/ubuntu/trusty/torque
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/trusty/torque/merge |
| Merge into: | lp://qastaging/ubuntu/trusty/torque |
| Diff against target: |
20653 lines (+491/-19927) 28 files modified
.pc/applied-patches (+0/-5) .pc/c90string.patch/src/resmom/mom_main.c (+0/-8362) .pc/c90string.patch/src/server/pbsd_main.c (+0/-3044) .pc/freebsd5_manpages.patch/doc/Makefile.am (+0/-141) .pc/freebsd5_manpages.patch/doc/Makefile.in (+0/-1012) .pc/gnu_fixes.patch/src/gui/Ccode/xpbs_scriptload.c (+0/-1119) .pc/gnu_fixes.patch/src/pam/pam_pbssimpleauth.c (+0/-246) .pc/gnu_fixes.patch/src/resmom/linux/mom_mach.c (+0/-4468) .pc/gnu_fixes.patch/src/resmom/mom_inter.c (+0/-793) .pc/tcl85.patch/src/tools/xpbsmon/entry.tk (+0/-358) .pc/xpbs_xpbsmon_tclIndex.patch/src/gui/buildindex.src (+0/-159) .pc/xpbs_xpbsmon_tclIndex.patch/src/tools/xpbsmon/buildindex.src (+0/-159) debian/changelog (+38/-0) debian/patches/CVE-2013-4319.patch (+41/-0) debian/patches/CVE-2013-4495.patch (+382/-0) debian/patches/fix-FTBFS-on-kfreebsd.patch (+20/-0) debian/patches/series (+3/-0) doc/Makefile.am (+1/-3) doc/Makefile.in (+1/-3) src/gui/Ccode/xpbs_scriptload.c (+1/-1) src/gui/buildindex.src (+0/-1) src/pam/pam_pbssimpleauth.c (+0/-7) src/resmom/linux/mom_mach.c (+0/-42) src/resmom/mom_inter.c (+1/-1) src/resmom/mom_main.c (+1/-1) src/server/pbsd_main.c (+1/-1) src/tools/xpbsmon/buildindex.src (+0/-1) src/tools/xpbsmon/entry.tk (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/torque/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian to fix multiple RC bugs
To post a comment you must log in.
Unmerged revisions
- 16. By Jackson Doak
-
* Merge from debian. Remaining changes:
- Build using dh-autoreconf.
- Specified multiarch Tcl and Tk locations during configure,
fixing FTBFS.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.