[code-saturne] 03/06: Drop patches fixed upstream
Gilles Filippini
pini at debian.org
Thu Jan 7 07:09:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository code-saturne.
commit a9c864da1115fce770048a244d203b230a2c2354
Author: Gilles Filippini <pini at debian.org>
Date: Mon Jan 4 21:35:06 2016 +0100
Drop patches fixed upstream
---
debian/changelog | 3 +
...-a-string-literal-and-no-format-arguments.patch | 61 ------------
debian/patches/pdflatex.patch | 110 ---------------------
debian/patches/series | 2 -
4 files changed, 3 insertions(+), 173 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d186a69..83f7fc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
code-saturne (4.2.0+repack-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Drop patches (fixed upstream):
+ - format-not-a-string-literal-and-no-format-arguments.patch
+ - pdflatex.patch
-- Gilles Filippini <pini at debian.org> Mon, 04 Jan 2016 17:34:05 +0100
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
deleted file mode 100644
index 1b67c90..0000000
--- a/debian/patches/format-not-a-string-literal-and-no-format-arguments.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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
deleted file mode 100644
index 8fa24ff..0000000
--- a/debian/patches/pdflatex.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-Description: Fix invalid location specifiers.
- Location specifiers 'c' and 'H' produce the latex error
- "Unknown float option". 'c' is an invalid location specifier, and 'H'
- is an add-on of the package float.
- See https://bugs.debian.org/790909
-Author: Gilles Filippini <pini at debian.org>
-Index: code-saturne/docs/theory/combustion_gas.tex
-===================================================================
---- code-saturne.orig/docs/theory/combustion_gas.tex
-+++ code-saturne/docs/theory/combustion_gas.tex
-@@ -121,7 +121,7 @@ fraction (subroutines: \fort{d3pphy, d3p
- \end{eqnarray}
-
- %========================================
--\begin{figure}[!htcb]
-+\begin{figure}[!htb]
- \centerline{\includegraphics[width=0.8\textwidth]{Yf}}
- \caption{Mass fraction of global species are piecewise linear with mixture fraction.}
- \end{figure}
-@@ -142,7 +142,7 @@ with a presumed form, for the mixture fr
- cppdf, fupdf}).
-
- %========================================
--\begin{figure}[!htcb]
-+\begin{figure}[!htb]
- \centerline{\includegraphics[width=0.8\textwidth]{Pf}}
- \centerline{\includegraphics[width=0.8\textwidth]{Pf2}}
- \caption{Examples of presumed PDF: cheapest form.}
-Index: code-saturne/docs/theory/navstv.tex
-===================================================================
---- code-saturne.orig/docs/theory/navstv.tex
-+++ code-saturne/docs/theory/navstv.tex
-@@ -126,7 +126,7 @@ We define beforehand:
- at first order in space, for ${K = I \,\text{or}\, J}$}
- \end{equation}
-
--\begin{figure}[!htbc]
-+\begin{figure}[!htb]
- \centering
- \subfigure[Internal face.]{
- \includegraphics[width=0.4\textwidth]{facette}
-Index: code-saturne/docs/theory/spadis.tex
-===================================================================
---- code-saturne.orig/docs/theory/spadis.tex
-+++ code-saturne/docs/theory/spadis.tex
-@@ -437,7 +437,7 @@ For both methods, the adaptation to grad
-
-
- \subsubsection{General description}
--\begin{figure}[!htbcp]
-+\begin{figure}[!htbp]
- \centering
- \mbox{
- \subfigure[Internal face]{
-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
- in \tablename~\ref{tab:macros_soft} and \tablename~\ref{tab:macros_math}.
-
--\begin{table}[!htbcp]
-+\begin{table}[!htbp]
- \centering
- \begin{tabular}{p{0.25 \textwidth} | p{0.25 \textwidth} }
- \LaTeX code & preview \\
-@@ -88,7 +88,7 @@ in \tablename~\ref{tab:macros_soft} and
- \caption{Macros of softwares defined in \texttt{csmacros.sty}.\label{tab:macros_soft}}
- \end{table}
-
--\begin{table}[!htbpc]
-+\begin{table}[!htbp]
- \begin{tabular}{p{0.5 \textwidth} | p{0.5 \textwidth} }
- \LaTeX code & preview \\
- \hline
-@@ -114,7 +114,7 @@ in \tablename~\ref{tab:macros_soft} and
- \end{table}
-
- %
--\begin{table}[!htbpc]
-+\begin{table}[!htbp]
- \begin{tabular}{p{0.5 \textwidth} | p{0.5 \textwidth} }
- \LaTeX code & preview \\
- \hline
-Index: code-saturne/docs/theory/theory.tex
-===================================================================
---- code-saturne.orig/docs/theory/theory.tex
-+++ code-saturne/docs/theory/theory.tex
-@@ -26,6 +26,7 @@
- %
- % MACROS SUPPLEMENTAIRES
- \usepackage{csmacros}
-+\usepackage{float}
- %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-Index: code-saturne/docs/theory/turbul.tex
-===================================================================
---- code-saturne.orig/docs/theory/turbul.tex
-+++ code-saturne/docs/theory/turbul.tex
-@@ -355,7 +355,7 @@ r &=& \min \left[ \dfrac{ \tilde{\nu} }{
- %
- The constants are defined in \tablename~\ref{tab:const_SA}.
-
--\begin{table}[!htbc]
-+\begin{table}[!htb]
- \centering
- $
- \begin{array}{c | c | c | c | c | c | c | c }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6353da6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-pdflatex.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