diff -Nru simgrid-3.23+dfsg2/debian/changelog simgrid-3.23+dfsg2/debian/changelog --- simgrid-3.23+dfsg2/debian/changelog 2019-06-25 16:36:12.000000000 +0000 +++ simgrid-3.23+dfsg2/debian/changelog 2019-07-23 10:28:03.000000000 +0000 @@ -1,3 +1,10 @@ +simgrid (3.23+dfsg2-2) unstable; urgency=medium + + * d/p/link_alpha_ia64: Fix compilation of smpireplay for Alpha and ia64. + * d/control: Bump standard-version to 4.4 (no other change needed) + + -- Martin Quinson Tue, 23 Jul 2019 12:28:03 +0200 + simgrid (3.23+dfsg2-1) unstable; urgency=medium * New upstream release (The Exotic Solstice Release) diff -Nru simgrid-3.23+dfsg2/debian/control simgrid-3.23+dfsg2/debian/control --- simgrid-3.23+dfsg2/debian/control 2019-06-25 16:36:12.000000000 +0000 +++ simgrid-3.23+dfsg2/debian/control 2019-07-23 10:28:03.000000000 +0000 @@ -23,7 +23,7 @@ python3-dev, pybind11-dev, python3-all, -Standards-Version: 4.3.0 +Standards-Version: 4.4.0 Homepage: http://simgrid.org/ Vcs-Git: https://salsa.debian.org/debian/simgrid.git Vcs-Browser: https://salsa.debian.org/debian/simgrid diff -Nru simgrid-3.23+dfsg2/debian/patches/link_alpha_ia64 simgrid-3.23+dfsg2/debian/patches/link_alpha_ia64 --- simgrid-3.23+dfsg2/debian/patches/link_alpha_ia64 1970-01-01 00:00:00.000000000 +0000 +++ simgrid-3.23+dfsg2/debian/patches/link_alpha_ia64 2019-07-23 10:28:03.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Try to fix the linking of smpireplaymain on older architectures +Author: Martin Quinson +Forwarded: yes. If it passes the build, I'll commit it upstream + +--- + tools/cmake/MakeLib.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: b/tools/cmake/MakeLib.cmake +=================================================================== +--- a/tools/cmake/MakeLib.cmake ++++ b/tools/cmake/MakeLib.cmake +@@ -106,7 +106,7 @@ if(enable_smpi) + + add_executable(smpireplaymain src/smpi/smpi_replay_main.cpp) + target_compile_options(smpireplaymain PRIVATE -fpic) +- target_link_libraries(smpireplaymain simgrid -shared) ++ target_link_libraries(smpireplaymain simgrid -fpic -shared) + set_target_properties(smpireplaymain + PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/simgrid) + install(TARGETS smpireplaymain # install that binary without breaking the rpath on Mac diff -Nru simgrid-3.23+dfsg2/debian/patches/remove_umpire simgrid-3.23+dfsg2/debian/patches/remove_umpire --- simgrid-3.23+dfsg2/debian/patches/remove_umpire 2019-06-25 16:36:12.000000000 +0000 +++ simgrid-3.23+dfsg2/debian/patches/remove_umpire 2019-07-23 10:28:03.000000000 +0000 @@ -8,9 +8,11 @@ tools/cmake/DefinePackages.cmake | 1 - 1 file changed, 1 deletion(-) +Index: b/tools/cmake/DefinePackages.cmake +=================================================================== --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake -@@ -1028,7 +1028,6 @@ +@@ -1004,7 +1004,6 @@ set(CMAKEFILES_TXT teshsuite/surf/CMakeLists.txt teshsuite/xbt/CMakeLists.txt diff -Nru simgrid-3.23+dfsg2/debian/patches/series simgrid-3.23+dfsg2/debian/patches/series --- simgrid-3.23+dfsg2/debian/patches/series 2019-06-25 16:36:12.000000000 +0000 +++ simgrid-3.23+dfsg2/debian/patches/series 2019-07-23 10:28:03.000000000 +0000 @@ -1,2 +1,3 @@ system-libjs-mathjax remove_umpire +link_alpha_ia64 diff -Nru simgrid-3.23+dfsg2/debian/patches/system-libjs-mathjax simgrid-3.23+dfsg2/debian/patches/system-libjs-mathjax --- simgrid-3.23+dfsg2/debian/patches/system-libjs-mathjax 2019-06-25 16:36:12.000000000 +0000 +++ simgrid-3.23+dfsg2/debian/patches/system-libjs-mathjax 2019-07-23 10:28:03.000000000 +0000 @@ -8,9 +8,11 @@ doc/Doxyfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +Index: b/doc/Doxyfile.in +=================================================================== --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in -@@ -1239,7 +1239,7 @@ +@@ -1218,7 +1218,7 @@ USE_MATHJAX = YES # However, it is strongly recommended to install a local # copy of MathJax from http://www.mathjax.org before deployment. diff -Nru simgrid-3.23+dfsg2/debian/rules simgrid-3.23+dfsg2/debian/rules --- simgrid-3.23+dfsg2/debian/rules 2019-06-25 16:36:12.000000000 +0000 +++ simgrid-3.23+dfsg2/debian/rules 2019-07-23 10:28:03.000000000 +0000 @@ -34,7 +34,7 @@ LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS) %: - dh $@ --with python3 --buildsystem=cmake --parallel + dh $@ --with python3 --buildsystem=cmake # CMAKE_BUILD_TYPE= (unset CMAKE_BUILD_TYPE) required, because: # - dh magic runs cmake with -DCMAKE_BUILD_TYPE=RelWithDebInfo