diff -Nru intel-mkl-2020.4.304/debian/changelog intel-mkl-2020.4.304/debian/changelog --- intel-mkl-2020.4.304/debian/changelog 2022-03-09 04:39:18.000000000 +0000 +++ intel-mkl-2020.4.304/debian/changelog 2022-04-06 20:35:20.000000000 +0000 @@ -1,3 +1,16 @@ +intel-mkl (2020.4.304-2ubuntu3) jammy; urgency=medium + + * Fix all test deps, not just the first ones found + + -- Steve Langasek Wed, 06 Apr 2022 20:35:20 +0000 + +intel-mkl (2020.4.304-2ubuntu2) jammy; urgency=medium + + * Remove test deps on obsolete versioned libomp*-dev and libgcc*-dev + packages. + + -- Steve Langasek Wed, 06 Apr 2022 11:12:59 -0700 + intel-mkl (2020.4.304-2ubuntu1) jammy; urgency=medium * (Build-)depend on libtbb2-dev instead of libtbb-dev. diff -Nru intel-mkl-2020.4.304/debian/control intel-mkl-2020.4.304/debian/control --- intel-mkl-2020.4.304/debian/control 2022-03-09 04:38:37.000000000 +0000 +++ intel-mkl-2020.4.304/debian/control 2022-04-06 18:12:59.000000000 +0000 @@ -5,7 +5,8 @@ Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/science-team/intel-mkl Vcs-Git: https://salsa.debian.org/science-team/intel-mkl.git -Maintainer: Debian Science Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Science Maintainers Uploaders: Mo Zhou , Build-Depends: debhelper-compat (= 11), dh-exec, diff -Nru intel-mkl-2020.4.304/debian/tests/control intel-mkl-2020.4.304/debian/tests/control --- intel-mkl-2020.4.304/debian/tests/control 2022-03-09 04:39:12.000000000 +0000 +++ intel-mkl-2020.4.304/debian/tests/control 2022-04-06 20:35:06.000000000 +0000 @@ -7,13 +7,13 @@ # mkl_rt, LP64, iomp Test-Command: g++ debian/tests/test-gemm.cc -I/usr/include/mkl -Wl,--no-as-needed -lmkl_rt -lpthread -lm -ldl -o tester; MKL_THREADING_LAYER=intel MKL_INTERFACE_LAYER=lp64 ./tester -Depends: intel-mkl, build-essential, g++, libomp-7-dev | libomp-8-dev | libomp-dev, +Depends: intel-mkl, build-essential, g++, libomp-dev, Restrictions: allow-stderr # mkl_rt, LP64, gomp Test-Command: g++ debian/tests/test-gemm.cc -I/usr/include/mkl -Wl,--no-as-needed -lmkl_rt -lpthread -lm -ldl -o tester -fopenmp; MKL_THREADING_LAYER=gnu MKL_INTERFACE_LAYER=lp64 ./tester -Depends: intel-mkl, build-essential, g++, libgcc-8-dev | libgcc-7-dev | libgcc-6-dev, +Depends: intel-mkl, build-essential, g++, libgcc-12-dev, Restrictions: allow-stderr # mkl_rt, LP64, tbb @@ -33,14 +33,14 @@ Test-Command: if test $(dpkg --print-architecture) = 'amd64'; then true; else exit 0; fi; g++ debian/tests/test-gemm.cc -DMKL_ILP64 -I/usr/include/mkl -Wl,--no-as-needed -lmkl_rt -lpthread -lm -ldl -o tester; MKL_THREADING_LAYER=intel MKL_INTERFACE_LAYER=ilp64 ./tester -Depends: intel-mkl, build-essential, g++, libomp-7-dev | libomp-8-dev | libomp-dev, +Depends: intel-mkl, build-essential, g++, libomp-dev, Restrictions: allow-stderr # mkl_rt, ILP64, gomp Test-Command: if test $(dpkg --print-architecture) = 'amd64'; then true; else exit 0; fi; g++ debian/tests/test-gemm.cc -DMKL_ILP64 -I/usr/include/mkl -Wl,--no-as-needed -lmkl_rt -lpthread -lm -ldl -o tester -fopenmp; MKL_THREADING_LAYER=gnu MKL_INTERFACE_LAYER=ilp64 ./tester -Depends: intel-mkl, build-essential, g++, libgcc-8-dev | libgcc-7-dev | libgcc-6-dev, +Depends: intel-mkl, build-essential, g++, libgcc-12-dev, Restrictions: allow-stderr # mkl_rt, ILP64, tbb @@ -61,14 +61,14 @@ Test-Command: if test $(dpkg --print-architecture) = 'amd64'; then true; else exit 0; fi; g++ debian/tests/test-gemm.cc -I/usr/include/mkl -Wl,--no-as-needed -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread -lm -ldl -o tester; ./tester -Depends: intel-mkl, build-essential, g++, libomp-7-dev | libomp-8-dev | libomp-dev, +Depends: intel-mkl, build-essential, g++, libomp-dev, Restrictions: allow-stderr # dynamic, LP64, gomp Test-Command: if test $(dpkg --print-architecture) = 'amd64'; then true; else exit 0; fi; g++ debian/tests/test-gemm.cc -I/usr/include/mkl -Wl,--no-as-needed -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl -o tester; ./tester -Depends: intel-mkl, build-essential, g++, libgcc-8-dev | libgcc-7-dev | libgcc-6-dev, +Depends: intel-mkl, build-essential, g++, libgcc-12-dev, Restrictions: allow-stderr # dynamic, LP64, tbb @@ -89,14 +89,14 @@ Test-Command: if test $(dpkg --print-architecture) = 'amd64'; then true; else exit 0; fi; g++ debian/tests/test-gemm.cc -DMKL_ILP64 -I/usr/include/mkl -Wl,--no-as-needed -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread -lm -ldl -o tester; ./tester -Depends: intel-mkl, build-essential, g++, libomp-7-dev | libomp-8-dev | libomp-dev, +Depends: intel-mkl, build-essential, g++, libomp-dev, Restrictions: allow-stderr # dynamic, ILP64, gomp Test-Command: if test $(dpkg --print-architecture) = 'amd64'; then true; else exit 0; fi; g++ debian/tests/test-gemm.cc -DMKL_ILP64 -I/usr/include/mkl -Wl,--no-as-needed -lmkl_intel_ilp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl -o tester; ./tester -Depends: intel-mkl, build-essential, g++, libgcc-8-dev | libgcc-7-dev | libgcc-6-dev, +Depends: intel-mkl, build-essential, g++, libgcc-12-dev, Restrictions: allow-stderr # dynamic, ILP64, tbb @@ -108,11 +108,11 @@ # dlsym, LP64, iomp (default) Test-Command: gcc debian/tests/abi-blas.c -ldl -DBlasInt=__int32_t -o tester; MKL_INTERFACE_LAYER=lp64 ./tester -Depends: libmkl-rt, build-essential, libomp-7-dev | libomp-8-dev | libomp-dev, +Depends: libmkl-rt, build-essential, libomp-dev, Restrictions: allow-stderr # dlsym, ILP64, iomp (default) Test-Command: if test $(dpkg --print-architecture) = 'amd64'; then true; else exit 0; fi; gcc debian/tests/abi-blas.c -ldl -DBlasInt=__int64_t -o tester; MKL_INTERFACE_LAYER=ilp64 ./tester -Depends: libmkl-rt, build-essential, libomp-7-dev | libomp-8-dev | libomp-dev, +Depends: libmkl-rt, build-essential, libomp-dev, Restrictions: allow-stderr