Package: imagemagick Version: 8:6.9.9.39+dfsg-1 Severity: normal Tags: patch
This patch turns imagemagick into a dependency package and adds imagemagick-extra and imagemagick-*-extra packages. This brings the following benefits: 1. A user who wants to use display/convert/... can install imagemagick and will always get the imagemagick version from a new Debian stable installed. 2. A user who wants e.g. SVG support can install imagemagick-extra, and will always have SVG support in his imagemagick installed. Currently there is no way to install -extra support in a way that the matching -extra will always automatically get installed when upgrading to a new Debian stable. 3. A package that requires display/convert/... can depend and/or build depend on imagemagick. 4. A package that requires imagemagick with e.g. SVG support can depend and/or build depend on imagemagick-extra. Currently there is no way to properly express this, resulting in FTBFS issues like #893538 (during imagemagick transitions there are several packages providing libmagickcore-6.q16-3-extra in unstable).
diff -Nru imagemagick-6.9.9.39+dfsg/debian/control.d/compat.in imagemagick-6.9.9.39+dfsg/debian/control.d/compat.in --- imagemagick-6.9.9.39+dfsg/debian/control.d/compat.in 2018-03-19 18:03:39.000000000 +0200 +++ imagemagick-6.9.9.39+dfsg/debian/control.d/compat.in 2018-04-04 20:06:03.000000000 +0300 @@ -105,25 +106,23 @@ . This is a dummy package. You can safely purge or remove it. -# compatibility package (remove after jessie+2) # due to bug #813455 arch:any Package: imagemagick Architecture: any Multi-Arch: foreign -Section: oldlibs +Section: graphics Depends: ${misc:Depends}, imagemagick-${IMVERSION}.${DEFAULTQUANTUMDEPTH} (>= 8:6.9.2.10+dfsg-2~) -Description: image manipulation programs -- binaries - ImageMagick is a software suite to create, edit, and compose bitmap images. - It can read, convert and write images in a variety of formats (over 100) - including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, - SVG, and TIFF. Use ImageMagick to translate, flip, mirror, rotate, scale, - shear and transform images, adjust image colors, apply various special - effects, or draw text, lines, polygons, ellipses and Bézier curves. - All manipulations can be achieved through shell commands as well as through - an X11 graphical interface (display). - . - This package include links to channel depth specific binaries and manual - pages. - . - This is a dummy package. You can safely purge or remove it. +Description: image manipulation programs -- dependency package + Installing this package installs the default variant of ImageMagick. + +# due to bug #813455 arch:any +Package: imagemagick-extra +Architecture: any +Multi-Arch: foreign +Section: graphics +Depends: ${misc:Depends}, + imagemagick-${IMVERSION}.${DEFAULTQUANTUMDEPTH}-extra (>= 8:6.9.2.10+dfsg-2~) +Description: image manipulation programs -- dependency package with extra codecs + Installing this package installs the default variant of ImageMagick + plus support for SVG, WMF, OpenEXR, DjVu and Graphviz. diff -Nru imagemagick-6.9.9.39+dfsg/debian/control.d/quantum.in imagemagick-6.9.9.39+dfsg/debian/control.d/quantum.in --- imagemagick-6.9.9.39+dfsg/debian/control.d/quantum.in 2018-03-19 18:03:39.000000000 +0200 +++ imagemagick-6.9.9.39+dfsg/debian/control.d/quantum.in 2018-04-04 20:06:03.000000000 +0300 @@ -23,7 +24,7 @@ an X11 graphical interface (display). . For working with the SVG, WMF, OpenEXR, DjVu and Graphviz formats, - you need to install the libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-${CORESOVERSION}-extra package. + you need to install the imagemagick-${IMVERSION}.${QUANTUMDEPTH}-extra package. . This version of imagemagick is compiled for a channel depth of ${DESC_QUANTUM} (${UCQUANTUMDEPTH}). @@ -60,10 +61,6 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Enhances: libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-${CORESOVERSION} -Provides: libmagickcore-extra, libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-1-extra, - libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-2-extra, - libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-3-extra, - libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-4-extra, Suggests: inkscape Recommends: libjxr-tools Description: low-level image manipulation library - extra codecs (${UCQUANTUMDEPTH}) @@ -208,3 +205,15 @@ . This package provides the perl Image::Magick::${UCQUANTUMDEPTH} class. +# due to bug #813455 arch:any +Package: imagemagick-${IMVERSION}.${QUANTUMDEPTH}-extra +Architecture: any +Multi-Arch: foreign +Section: graphics +Depends: ${misc:Depends}, + imagemagick-${IMVERSION}.${QUANTUMDEPTH}, + libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-${CORESOVERSION}-extra +Description: image manipulation programs -- dependency package with extra codecs + Installing this package installs ImageMagick compiled for a channel + depth of ${DESC_QUANTUM} (${UCQUANTUMDEPTH}) plus support + for SVG, WMF, OpenEXR, DjVu and Graphviz.