diff -Nru libccp4-6.5.1/debian/changelog libccp4-6.5.1/debian/changelog --- libccp4-6.5.1/debian/changelog 2020-06-05 03:52:40.000000000 +0000 +++ libccp4-6.5.1/debian/changelog 2020-07-31 09:49:00.000000000 +0000 @@ -1,3 +1,18 @@ +libccp4 (6.5.1-4) unstable; urgency=medium + + * Installing files to binary packages using debian/*.install files. + + -- Andrius Merkys Fri, 31 Jul 2020 05:49:00 -0400 + +libccp4 (6.5.1-3) unstable; urgency=medium + + * Adding a patch to fix type mismatch problems with GCC-10. + * Bumping debhelper-compat. Adding debian/not-installed. + * Ignoring argument mismatch for gfortran as a workaround for #957430. + * Updating copyright years. + + -- Andrius Merkys Thu, 30 Jul 2020 09:06:08 -0400 + libccp4 (6.5.1-2) unstable; urgency=medium [ Andrius Merkys ] diff -Nru libccp4-6.5.1/debian/control libccp4-6.5.1/debian/control --- libccp4-6.5.1/debian/control 2020-06-05 03:51:44.000000000 +0000 +++ libccp4-6.5.1/debian/control 2020-07-31 09:18:20.000000000 +0000 @@ -6,7 +6,7 @@ Section: science Priority: optional Build-Depends: - debhelper-compat (= 12), + debhelper-compat (= 13), gfortran, libmmdb2-dev, m4, diff -Nru libccp4-6.5.1/debian/copyright libccp4-6.5.1/debian/copyright --- libccp4-6.5.1/debian/copyright 2020-06-05 03:52:09.000000000 +0000 +++ libccp4-6.5.1/debian/copyright 2020-07-31 09:18:20.000000000 +0000 @@ -8,7 +8,8 @@ License: LGPL-3 Files: debian/* -Copyright: Picca Frédéric-Emmanuel +Copyright: 2012-2020, Picca Frédéric-Emmanuel + 2018-2020, Andrius Merkys License: LGPL-3 Files: ccp4/ccp4_file_err.h diff -Nru libccp4-6.5.1/debian/libccp4c0.install libccp4-6.5.1/debian/libccp4c0.install --- libccp4-6.5.1/debian/libccp4c0.install 1970-01-01 00:00:00.000000000 +0000 +++ libccp4-6.5.1/debian/libccp4c0.install 2020-07-31 09:45:19.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/libccp4c*.so.* diff -Nru libccp4-6.5.1/debian/libccp4-data.install libccp4-6.5.1/debian/libccp4-data.install --- libccp4-6.5.1/debian/libccp4-data.install 1970-01-01 00:00:00.000000000 +0000 +++ libccp4-6.5.1/debian/libccp4-data.install 2020-07-31 09:44:15.000000000 +0000 @@ -0,0 +1 @@ +usr/share diff -Nru libccp4-6.5.1/debian/libccp4-dev.install libccp4-6.5.1/debian/libccp4-dev.install --- libccp4-6.5.1/debian/libccp4-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ libccp4-6.5.1/debian/libccp4-dev.install 2020-07-31 09:44:55.000000000 +0000 @@ -0,0 +1,3 @@ +usr/include/* +usr/lib/*/lib*.so +usr/lib/*/pkgconfig diff -Nru libccp4-6.5.1/debian/libccp4f0.install libccp4-6.5.1/debian/libccp4f0.install --- libccp4-6.5.1/debian/libccp4f0.install 1970-01-01 00:00:00.000000000 +0000 +++ libccp4-6.5.1/debian/libccp4f0.install 2020-07-31 09:45:41.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/libccp4f*.so.* diff -Nru libccp4-6.5.1/debian/not-installed libccp4-6.5.1/debian/not-installed --- libccp4-6.5.1/debian/not-installed 1970-01-01 00:00:00.000000000 +0000 +++ libccp4-6.5.1/debian/not-installed 2020-07-31 09:18:20.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/${DEB_HOST_MULTIARCH}/libccp4*.la diff -Nru libccp4-6.5.1/debian/patches/0002-fix-ftbfs-with-gcc-10.patch libccp4-6.5.1/debian/patches/0002-fix-ftbfs-with-gcc-10.patch --- libccp4-6.5.1/debian/patches/0002-fix-ftbfs-with-gcc-10.patch 1970-01-01 00:00:00.000000000 +0000 +++ libccp4-6.5.1/debian/patches/0002-fix-ftbfs-with-gcc-10.patch 2020-07-31 09:18:20.000000000 +0000 @@ -0,0 +1,43 @@ +Description: Fixing argument mismatches in Fortran code, addressing #957430. +Author: Andrius Merkys +Forwarded: ccp4-dev@dl.ac.uk +--- a/fortran/pack_f.f ++++ b/fortran/pack_f.f +@@ -106,7 +106,7 @@ + endif + 10 continue + filnarray(len(filn) + 1) = 0 +- call pack_wordimage_f(data, x, y, filnarray) ++ call pack_longimage_f(data, x, y, filnarray) + return + end + +@@ -138,7 +138,7 @@ + endif + 10 continue + filnarray(len(filn) + 1) = 0 +- call v2pack_wordimage_f(data, x, y, filnarray) ++ call v2pack_longimage_f(data, x, y, filnarray) + return + end + +--- a/fortran/lgglib.f ++++ b/fortran/lgglib.f +@@ -1236,7 +1236,7 @@ + B3(2) = XYZ(2) * CELL(2) + B3(3) = XYZ(3) * CELL(3) + C +- CALL matmult(3,3,3,1,ORTH,B3,XYZ,B1) ++ CALL matmult(3,3,3,1,ORTH,B3,XYZ) + END + c + c +@@ -1274,7 +1274,7 @@ + B3(1) = XYZ(1) + B3(2) = XYZ(2) + B3(3) = XYZ(3) +- CALL matmult(3,3,3,1,ORTH,B3,XYZ,B1) ++ CALL matmult(3,3,3,1,ORTH,B3,XYZ) + END + character*80 function getnam(filnam) + character*(*) filnam diff -Nru libccp4-6.5.1/debian/patches/series libccp4-6.5.1/debian/patches/series --- libccp4-6.5.1/debian/patches/series 2020-06-05 03:47:13.000000000 +0000 +++ libccp4-6.5.1/debian/patches/series 2020-07-31 09:18:20.000000000 +0000 @@ -1 +1,2 @@ 0001-use-mmdb2-instead-of-mmdb-in-libccp4f.pc.in.patch +0002-fix-ftbfs-with-gcc-10.patch diff -Nru libccp4-6.5.1/debian/rules libccp4-6.5.1/debian/rules --- libccp4-6.5.1/debian/rules 2020-06-05 03:47:13.000000000 +0000 +++ libccp4-6.5.1/debian/rules 2020-07-31 09:45:50.000000000 +0000 @@ -1,27 +1,16 @@ #!/usr/bin/make -f # -*- makefile -*- +# Work-around for #957430. Upstream has confirmed that argument mismatch +# is not critical, and even desired, especially for QREAD and QWRITE. +FFLAGS += -fallow-argument-mismatch + %: dh $@ override_dh_auto_configure: dh_auto_configure -- --disable-static --enable-shared --datadir=/usr/share/ccp4 -override_dh_install: - # libccp4-data - dh_install -p libccp4-data usr/share - - # libccp4-dev - dh_install -p libccp4-dev usr/include/* - dh_install -p libccp4-dev usr/lib/*/lib*.so - dh_install -p libccp4-dev usr/lib/*/pkgconfig - - # libccp4c0 - dh_install -p libccp4c0 usr/lib/*/libccp4c*.so.* - - # libccp4f0 - dh_install -p libccp4f0 usr/lib/*/libccp4f*.so.* - override_dh_strip: dh_strip -plibccp4c0 --dbgsym-migration='libccp4c0-dbg (<< 6.5.1-1~)' dh_strip -plibccp4f0 --dbgsym-migration='libccp4f0-dbg (<< 6.5.1-1~)'