Merge lp://qastaging/~noskcaj/ubuntu/wily/libjpeg6b/merge into lp://qastaging/ubuntu/wily/libjpeg6b
Status: | Rejected |
---|---|
Rejected by: | Robert Ancell |
Proposed branch: | lp://qastaging/~noskcaj/ubuntu/wily/libjpeg6b/merge |
Merge into: | lp://qastaging/ubuntu/wily/libjpeg6b |
Diff against target: |
1762 lines (+115/-1508) 13 files modified
.pc/applied-patches (+1/-1) .pc/fix-CVE-2013-6629_6630/jdmarker.c (+0/-1360) README.6b1 (+0/-29) README.6b2 (+42/-0) configure.ac (+1/-1) debian/changelog (+34/-0) debian/control (+2/-2) debian/copyright (+1/-1) debian/patches/automake-Wno-obsolete (+19/-0) debian/patches/fix-CVE-2013-6629_6630 (+0/-108) debian/patches/series (+1/-1) debian/rules (+11/-5) jdmarker.c (+3/-0) |
To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/wily/libjpeg6b/merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Ancell (community) | Needs Information | ||
Till Kamppeter | Pending | ||
Review via email:
|
Description of the change
Merge from debian
Unmerged revisions
- 20. By Jackson Doak
-
* Merge from Debian. Remaining changes:
- debian/rules: Remove "-Bsymbolic-functions" from LDFLAGS.
* Bump epoch to recover from libjpeg-turbo hijacking of libjpeg62.
* debian/control:
- Bump standard version to 3.9.6.
* New bugfix upstream release
- patch fix-CVE-2013-6629_ 6630: removed
* debian/watch: added
* debian/rules:
- Use dh_prep instead of dh_clean -k
- Do not use -D_REENTRANT
- Add -Wl,-z,relro to LDFLAGS
* debian/copyright:
- Add new upstream URL
* debian/control:
- Bump standard version to 3.9.5.
* debian/control, debian/rules:
- Apply patch by Mauricio Faria de Oliveira to use dh_autoreconf
closes: #753362
I looked at the difference between Debian and Ubuntu and there's no -Bsymbolic flags set. Not sure how long ago that changed!
The difference is we drop: -Wl,-z, relro
LDFLAGS=
Which may not actually be a problem.
I think we need Till to tell us if the stock Debian package still has an issue with the HP printer drivers as that was the original issue that got us to diverge (bug 777670).