New Upstream Release - code-saturne
There were merge conflicts while merging a new upstream version.
More details
Historical runs
- upstream-merged-conflicts: Merging upstream version 7.3.0 resulted in conflicts.
- upstream-merged-conflicts: Merging upstream version 7.2.0 resulted in conflicts.
- quilt-refresh-error: An error occurred refreshing quilt patch no-rpath.patch: Applying patch debian/patches/no-rpath.patch can't find file to patch at input line 5 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: code-saturne/bin/cs_config.py.in |=================================================================== |--- code-saturne.orig/bin/cs_config.py.in |+++ code-saturne/bin/cs_config.py.in -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file m4/cs_hdf5.m4 patching file src/apps/Makefile.am Patch debian/patches/no-rpath.patch does not apply (enforce with -f)
- worker-timeout: No keepalives received in 10:00:10.582385.