diff -Nru starpu-contrib-1.1.5/debian/changelog starpu-contrib-1.1.5/debian/changelog --- starpu-contrib-1.1.5/debian/changelog 2016-02-01 11:40:03.000000000 +0000 +++ starpu-contrib-1.1.5/debian/changelog 2016-03-30 19:33:58.000000000 +0000 @@ -1,3 +1,9 @@ +starpu-contrib (1.1.5-0ubuntu1) xenial; urgency=medium + + * Rebuild for CUDA 7.5, build with GCC 5, build everywhere. + + -- Graham Inggs Wed, 30 Mar 2016 21:33:41 +0200 + starpu-contrib (1.1.5-0build2) xenial; urgency=medium * No-change rebuild for openmpi transition. diff -Nru starpu-contrib-1.1.5/debian/control starpu-contrib-1.1.5/debian/control --- starpu-contrib-1.1.5/debian/control 2015-08-24 22:05:57.000000000 +0000 +++ starpu-contrib-1.1.5/debian/control 2016-03-30 19:33:31.000000000 +0000 @@ -1,6 +1,7 @@ Source: starpu-contrib Priority: extra -Maintainer: Samuel Thibault +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Samuel Thibault Build-Depends: debhelper (>= 7.0.50~), autotools-dev, dh-autoreconf, pkg-config, libnuma-dev [amd64 arm64 i386 ia64 mips mipsel powerpc ppc64el], @@ -18,8 +19,8 @@ # hardening-wrapper, valgrind [amd64 arm64 armhf i386 mips mipsel powerpc ppc64el s390x], guile-2.0, opencl-headers, ocl-icd-opencl-dev, -# gcc-5, g++-5, gfortran-5, gcc-5-plugin-dev, - gcc-4.9, g++-4.9, gfortran-4.9, gcc-4.9-plugin-dev, + gcc-5, g++-5, gfortran-5, gcc-5-plugin-dev, +# gcc-4.9, g++-4.9, gfortran-4.9, gcc-4.9-plugin-dev, help2man, nvidia-cuda-toolkit, #Build-Conflicts: gcc-4.9, g++-4.9, hardening-wrapper @@ -31,7 +32,7 @@ Package: libstarpu-contrib-dev Section: contrib/libdevel -Architecture: amd64 i386 +Architecture: any Depends: libstarpu-contrib-1.1-9 (= ${binary:Version}), libstarpu-contribfft-1.1-1 (= ${binary:Version}), libstarpu-contribmpi-1.1-3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${gccDeps}, libhwloc-dev, opencl-headers, ocl-icd-opencl-dev Conflicts: libstarpu-dev Provides: libstarpu-dev @@ -48,7 +49,7 @@ Package: libstarpu-contrib-1.1-9 Section: contrib/libs -Architecture: amd64 i386 +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libstarpu-1.1-9 Provides: libstarpu-1.1-9 @@ -65,7 +66,7 @@ Package: libstarpu-contribfft-1.1-1 Section: contrib/libs -Architecture: amd64 i386 +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libstarpufft-1.1-1 Provides: libstarpufft-1.1-1 @@ -82,7 +83,7 @@ Package: libstarpu-contribmpi-1.1-3 Section: contrib/libs -Architecture: amd64 i386 +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libstarpumpi-1.1-3 Provides: libstarpumpi-1.1-3 @@ -99,7 +100,7 @@ Package: starpu-contrib-tools Section: contrib/utils -Architecture: amd64 i386 +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: starpu-tools Provides: starpu-tools @@ -133,7 +134,7 @@ # Package: starpu-contrib-examples Section: contrib/science -Architecture: amd64 i386 +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: starpu-examples Provides: starpu-examples @@ -150,7 +151,7 @@ Package: libsocl-contrib-1.1-1 Section: contrib/libs -Architecture: amd64 i386 +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libsocl-1.1-1 Provides: libsocl-1.1-1 diff -Nru starpu-contrib-1.1.5/debian/rules starpu-contrib-1.1.5/debian/rules --- starpu-contrib-1.1.5/debian/rules 2015-08-24 22:00:18.000000000 +0000 +++ starpu-contrib-1.1.5/debian/rules 2016-03-07 15:08:19.000000000 +0000 @@ -13,7 +13,7 @@ GCC_VERSION := 5 # This is the best version that nvcc supports. -CONTRIB_GCC_VERSION := 4.9 +CONTRIB_GCC_VERSION := 5 ifeq ($(source),starpu) CC=gcc-$(GCC_VERSION)