lp://staging/~noskcaj/ubuntu/wily/libjpeg6b/merge

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/ubuntu/wily/libjpeg6b

Robert Ancell: Needs Information on 2015-08-12

Till Kamppeter: Pending requested 2015-08-12

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

20. By Jackson Doak on 2015-07-21

* 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

19. By Logan Rosen on 2013-12-10

* Merge from Debian unstable (LP: #1011177). Remaining changes:
  - debian/rules: Remove "-Bsymbolic-functions" from LDFLAGS.

18. By oussama on 2012-11-15

* Merge from Debian. Remaining changes:
  - debian/rules: Remove "-Bsymbolic-functions" from LDFLAGS.

17. By Benjamin Drung on 2012-11-29

Fix typo in changelog entry.

16. By Benjamin Drung on 2012-11-29

Drop remaining difference in multiarch support.

15. By oussama on 2012-11-15

change target distribution from precise to raring

14. By oussama on 2012-11-15

* Merge from Debian. Rmaining changes:
  - debian/rules: Remove "-Bsymbolic-functions" from LDFLAGS.
* Add multiarch support (similar to libjpeg8). closes: #642079
* Ship file README.6b1 in doc.
* debian/control:
  - Bump Standards-Version to 3.9.3.
  - move libjpeg62, libjpeg62-dev and libjpeg62-dbg to section oldlibs

13. By Colin Watson on 2012-10-05

Rebuild for new armel compiler default of ARMv5t.

12. By Matthias Klose on 2011-10-11

* Merge with Debian; remaining changes:
  - debian/rules: Remove "-Bsymbolic-functions" from LDFLAGS.
  - Enable multiarch build (LP: #733501).

11. By James Westby on 2011-08-08

Import packaging changes for version 6b1-1ubuntu2