~ubuntu-branches/ubuntu/wily/imagemagick/wily-proposed

Viewing all changes in revision 43.

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2013-10-29 16:52:05 UTC
  • mfrom: (6.2.28 sid)
  • Revision ID: package-import@ubuntu.com-20131029165205-piqrh2arun6adncz
Tags: 8:6.7.7.10-6ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Make ufraw-batch (universe) a suggestion instead of a recommendation.
  - Don't set MAKEFLAGS in debian/rules; just pass it to the build.
  - Build-depend on libtiff5-dev instead of libtiff-dev.
  - Depend on fftw3-dev as it's in main, not fftw-dev.
  - Don't build-depend on graphicsmagick-imagemagick-compat (universe).
  - Don't use graphicmagick's convert executable just to convert our svg
    into a menu xpm.  Instead, run the convert we build.
  - Make libmagickcore-dev depend on liblcms2-dev rather than liblcms-dev.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: