diff -pruN 2020.4.304-2/debian/changelog 2020.4.304-2ubuntu3/debian/changelog --- 2020.4.304-2/debian/changelog 2021-02-11 05:41:53.000000000 +0000 +++ 2020.4.304-2ubuntu3/debian/changelog 2022-04-06 20:35:20.000000000 +0000 @@ -1,3 +1,22 @@ +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. + + -- Matthias Klose Wed, 09 Mar 2022 05:39:18 +0100 + intel-mkl (2020.4.304-2) unstable; urgency=medium * Make auto-generated lintian overrides reproducible. (Closes: #980518) diff -pruN 2020.4.304-2/debian/control 2020.4.304-2ubuntu3/debian/control --- 2020.4.304-2/debian/control 2021-02-11 05:41:23.000000000 +0000 +++ 2020.4.304-2ubuntu3/debian/control 2022-04-06 18:12:59.000000000 +0000 @@ -5,7 +5,8 @@ Priority: optional 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, @@ -234,7 +235,7 @@ Recommends: # for gomp libgcc-10-dev | libgcc-11-dev | libgcc-12-dev, # for tbb - libtbb-dev + libtbb2-dev Enhances: libblas.so, libblas64.so, liblapack.so, liblapack64.so, Suggests: intel-mkl-doc (= ${source:Version}), @@ -267,7 +268,7 @@ Architecture: amd64 i386 Multi-Arch: same Depends: ${misc:Depends}, libmkl-meta-threading (= ${binary:Version}), -Recommends: libtbb-dev, libomp-dev | libomp-x.y-dev, +Recommends: libtbb2-dev, libomp-dev | libomp-x.y-dev, Description: Static libs of intel-MKL: Threading Layer Intel® Math Kernel Library (Intel® MKL) is a computing math library of highly optimized, extensively threaded routines for applications that require @@ -339,7 +340,7 @@ Recommends: # for gomp libgcc-10-dev | libgcc-11-dev | libgcc-12-dev, # for tbb - libtbb-dev + libtbb2-dev Enhances: libblas.so.3, libblas64.so.3, liblapack.so.3, liblapack64.so.3, Description: Intel® MKL: Single Dynamic Library (SDL) diff -pruN 2020.4.304-2/debian/tests/control 2020.4.304-2ubuntu3/debian/tests/control --- 2020.4.304-2/debian/tests/control 2019-07-25 06:02:13.000000000 +0000 +++ 2020.4.304-2ubuntu3/debian/tests/control 2022-04-06 20:35:06.000000000 +0000 @@ -7,19 +7,19 @@ Restrictions: allow-stderr # 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 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=tbb MKL_INTERFACE_LAYER=lp64 ./tester -Depends: intel-mkl, build-essential, g++, libtbb-dev, +Depends: intel-mkl, build-essential, g++, libtbb2-dev, Restrictions: allow-stderr # mkl_rt, ILP64, sequential @@ -33,21 +33,21 @@ Restrictions: allow-stderr 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 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=tbb MKL_INTERFACE_LAYER=ilp64 ./tester -Depends: intel-mkl, build-essential, g++, libtbb-dev, +Depends: intel-mkl, build-essential, g++, libtbb2-dev, Restrictions: allow-stderr # dynamic, LP64, sequential @@ -61,21 +61,21 @@ Restrictions: allow-stderr 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 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_tbb_thread -lmkl_core -ltbb -lstdc++ -lpthread -lm -ldl -o tester; ./tester -Depends: intel-mkl, build-essential, g++, libtbb-dev, +Depends: intel-mkl, build-essential, g++, libtbb2-dev, Restrictions: allow-stderr # dynamic, ILP64, sequential @@ -89,30 +89,30 @@ Restrictions: allow-stderr 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 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_tbb_thread -lmkl_core -ltbb -lstdc++ -lpthread -lm -ldl -o tester; ./tester -Depends: intel-mkl, build-essential, g++, libtbb-dev, +Depends: intel-mkl, build-essential, g++, libtbb2-dev, Restrictions: allow-stderr # 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