diff -Nru php-imagick-3.4.0~rc6/debian/changelog php-imagick-3.4.0~rc6/debian/changelog --- php-imagick-3.4.0~rc6/debian/changelog 2016-02-20 22:14:34.000000000 -0800 +++ php-imagick-3.4.0~rc6/debian/changelog 2016-03-06 19:58:23.000000000 -0800 @@ -1,3 +1,20 @@ +php-imagick (3.4.0~rc6-1ubuntu2) xenial; urgency=medium + + * Fix failures in autopkgtests (LP: #1549942) + - d/tests/control: run phpunit from tests/ subdirectory to pick up + the SKIP helper. + - d/tests/control: add gsfonts and libmagickcore-6.q16-2-extra as + test dependencies. + + [ Steve Langasek ] + * Use libmagickwand-6.q16-dev | libmagickwand-dev as the test dependency + instead of hard-coding an soname that will require us to update the tests + file for each new ABI. + * debian/patches/no-openmp-threads.patch: limit the number of openmp + threads used to 1. + + -- Nishanth Aravamudan Wed, 24 Feb 2016 19:10:58 -0800 + php-imagick (3.4.0~rc6-1ubuntu1) xenial; urgency=medium * debian/tests/control: update for php7. diff -Nru php-imagick-3.4.0~rc6/debian/patches/no-openmp-threads.patch php-imagick-3.4.0~rc6/debian/patches/no-openmp-threads.patch --- php-imagick-3.4.0~rc6/debian/patches/no-openmp-threads.patch 1969-12-31 16:00:00.000000000 -0800 +++ php-imagick-3.4.0~rc6/debian/patches/no-openmp-threads.patch 2016-03-06 19:57:39.000000000 -0800 @@ -0,0 +1,23 @@ +Description: limit the number of openmp threads used to 1 + The php-imagick 3.4.0 test suite fails with various segfaults when openmp + threads are in use. Force the openmp thread count to 1 to avoid this + problem. + . + This patch is a workaround only; it is currently unknown if the root bug + lies in php-imagick or in imagemagick. +Author: Steve Langasek +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1549942 + +Index: php-imagick-3.4.0~rc6/imagick-3.4.0RC6/imagick.c +=================================================================== +--- php-imagick-3.4.0~rc6.orig/imagick-3.4.0RC6/imagick.c ++++ php-imagick-3.4.0~rc6/imagick-3.4.0RC6/imagick.c +@@ -3579,6 +3579,8 @@ + checkImagickVersion(); + } + ++ SetMagickResourceLimit(ThreadResource, 1); ++ + return SUCCESS; + } + diff -Nru php-imagick-3.4.0~rc6/debian/patches/series php-imagick-3.4.0~rc6/debian/patches/series --- php-imagick-3.4.0~rc6/debian/patches/series 2016-02-16 02:14:51.000000000 -0800 +++ php-imagick-3.4.0~rc6/debian/patches/series 2016-03-06 19:36:20.000000000 -0800 @@ -1 +1,2 @@ 0001-Hardcode-path-to-usrsharefontstruetypettf-dejavuDeja.patch +no-openmp-threads.patch diff -Nru php-imagick-3.4.0~rc6/debian/tests/control php-imagick-3.4.0~rc6/debian/tests/control --- php-imagick-3.4.0~rc6/debian/tests/control 2016-02-20 22:14:31.000000000 -0800 +++ php-imagick-3.4.0~rc6/debian/tests/control 2016-03-06 01:06:39.000000000 -0800 @@ -1,2 +1,2 @@ -Test-Command: cd imagick-* && phpunit --verbose tests -Depends: php-cli, php-imagick, phpunit +Test-Command: cd imagick-*/tests && phpunit --verbose . +Depends: php-cli, php-imagick, gsfonts, libmagickwand-6.q16-dev | libmagickwand-dev, phpunit