[code-saturne] 02/03: Successful build for release 4.1.1.
Gilles Filippini
pini at debian.org
Mon Aug 17 20:28:24 UTC 2015
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository code-saturne.
commit 80d499260a0bf44ea50f1f578f7c3da62a36d068
Author: Gilles Filippini <pini at debian.org>
Date: Mon Aug 17 19:13:55 2015 +0200
Successful build for release 4.1.1.
New patch format-not-a-string-literal-and-no-format-arguments.patch.
---
debian/changelog | 9 ++++
...-a-string-literal-and-no-format-arguments.patch | 61 ++++++++++++++++++++++
debian/patches/pdflatex.patch | 8 +--
debian/patches/series | 1 +
4 files changed, 75 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index da8dd86..54b1be7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+code-saturne (4.1.1+repack-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Refresh patch pdflatex.patch.
+ * New patch format-not-a-string-literal-and-no-format-arguments.patch
+ to fix 'format not a string literal and no format arguments' errors.
+
+ -- Gilles Filippini <pini at debian.org> Mon, 17 Aug 2015 18:18:06 +0200
+
code-saturne (4.0.2+repack-1) unstable; urgency=medium
* New upstream release (bug fixes).
diff --git a/debian/patches/format-not-a-string-literal-and-no-format-arguments.patch b/debian/patches/format-not-a-string-literal-and-no-format-arguments.patch
new file mode 100644
index 0000000..1b67c90
--- /dev/null
+++ b/debian/patches/format-not-a-string-literal-and-no-format-arguments.patch
@@ -0,0 +1,61 @@
+Index: code-saturne/src/cdo/cs_cdo_main.c
+===================================================================
+--- code-saturne.orig/src/cdo/cs_cdo_main.c
++++ code-saturne/src/cdo/cs_cdo_main.c
+@@ -330,9 +330,9 @@ _solve(const cs_mesh_t *m,
+ cs_space_scheme_t space_scheme = cs_param_eq_get_space_scheme(eq_id);
+
+ bft_printf("\n");
+- bft_printf(lsepline);
++ bft_printf("%s", lsepline);
+ bft_printf(" Solve equation %s\n", cs_param_eq_get_name(eq_id));
+- bft_printf(lsepline);
++ bft_printf("%s", lsepline);
+
+ /* Up to now only this type of equation is handled */
+ assert(cs_param_eq_get_type(eq_id) == CS_PARAM_EQ_TYPE_SCAL);
+@@ -420,9 +420,9 @@ cs_cdo_main(cs_mesh_t *m,
+
+ /* Output information */
+ bft_printf("\n");
+- bft_printf(lsepline);
++ bft_printf("%s", lsepline);
+ bft_printf(" Start CDO Module *** Experimental ***\n");
+- bft_printf(lsepline);
++ bft_printf("%s", lsepline);
+ bft_printf("\n -msg- Version.Tag %s\n", cs_cdoversion);
+
+ /* Determine which location are already built */
+Index: code-saturne/src/cdo/cs_param_eq.c
+===================================================================
+--- code-saturne.orig/src/cdo/cs_param_eq.c
++++ code-saturne/src/cdo/cs_param_eq.c
+@@ -1126,10 +1126,10 @@ cs_param_eq_resume_all(void)
+ const cs_param_itsol_t itsol = eq->itsol_info;
+
+ bft_printf("\n");
+- bft_printf(lsepline);
++ bft_printf("%s", lsepline);
+ bft_printf(" Resume settings for %s eq. (variable %s)\n",
+ eq->name, eq->varname);
+- bft_printf(lsepline);
++ bft_printf("%s", lsepline);
+
+ _Bool unsteady = (eq->flag & CS_PARAM_EQ_UNSTEADY) ? true : false;
+ _Bool convection = (eq->flag & CS_PARAM_EQ_CONVECTION) ? true : false;
+Index: code-saturne/src/cdo/cs_param.c
+===================================================================
+--- code-saturne.orig/src/cdo/cs_param.c
++++ code-saturne/src/cdo/cs_param.c
+@@ -694,9 +694,9 @@ cs_param_pty_resume_all(void)
+ int pty_id;
+
+ bft_printf("\n");
+- bft_printf(lsepline);
++ bft_printf("%s", lsepline);
+ bft_printf(" Resume the definition of material properties\n");
+- bft_printf(lsepline);
++ bft_printf("%s", lsepline);
+
+ for (pty_id = 0; pty_id < cs_param_n_properties; pty_id++) {
+
diff --git a/debian/patches/pdflatex.patch b/debian/patches/pdflatex.patch
index acb511f..8fa24ff 100644
--- a/debian/patches/pdflatex.patch
+++ b/debian/patches/pdflatex.patch
@@ -19,7 +19,7 @@ Index: code-saturne/docs/theory/combustion_gas.tex
\end{figure}
@@ -142,7 +142,7 @@ with a presumed form, for the mixture fr
cppdf, fupdf}).
-
+
%========================================
-\begin{figure}[!htcb]
+\begin{figure}[!htb]
@@ -57,7 +57,7 @@ Index: code-saturne/docs/developer/write_theory.tex
--- code-saturne.orig/docs/developer/write_theory.tex
+++ code-saturne/docs/developer/write_theory.tex
@@ -53,7 +53,7 @@ present the macros defined in \texttt{cs
- The available macros located in the \texttt{csmacros} and \texttt{csvers.tex} package are displayed
+ The available macros located in the \texttt{csmacros} and \texttt{csvers.tex} package are displayed
in \tablename~\ref{tab:macros_soft} and \tablename~\ref{tab:macros_math}.
-\begin{table}[!htbcp]
@@ -73,7 +73,7 @@ Index: code-saturne/docs/developer/write_theory.tex
+\begin{table}[!htbp]
\begin{tabular}{p{0.5 \textwidth} | p{0.5 \textwidth} }
\LaTeX code & preview \\
- \hline
+ \hline
@@ -114,7 +114,7 @@ in \tablename~\ref{tab:macros_soft} and
\end{table}
@@ -82,7 +82,7 @@ Index: code-saturne/docs/developer/write_theory.tex
+\begin{table}[!htbp]
\begin{tabular}{p{0.5 \textwidth} | p{0.5 \textwidth} }
\LaTeX code & preview \\
- \hline
+ \hline
Index: code-saturne/docs/theory/theory.tex
===================================================================
--- code-saturne.orig/docs/theory/theory.tex
diff --git a/debian/patches/series b/debian/patches/series
index 7bfab14..a2504c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
pdflatex.patch
ac_init.patch
+format-not-a-string-literal-and-no-format-arguments.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/code-saturne.git
More information about the debian-science-commits
mailing list