[lammps] 02/05: Fix some problems, introduced by upstream recently.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository lammps.

commit f7bddd4a0f71032025499a6e2f6601cc98d37d03
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Nov 20 22:40:07 2013 +0100

    Fix some problems, introduced by upstream recently.
---
 debian/patches/fix_FTBFS_timer.patch         |   22 ++++++++++++++++++++++
 debian/patches/fix_format_not_a_string.patch |   17 +++++++++++++++++
 debian/patches/series                        |    2 ++
 debian/patches/set_configure_flags.patch     |    2 +-
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/debian/patches/fix_FTBFS_timer.patch b/debian/patches/fix_FTBFS_timer.patch
new file mode 100644
index 0000000..a92a97c
--- /dev/null
+++ b/debian/patches/fix_FTBFS_timer.patch
@@ -0,0 +1,22 @@
+Description: fix FTBFS due to timers.
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2013-10-27
+
+--- a/src/USER-OMP/pair_adp_omp.cpp
++++ b/src/USER-OMP/pair_adp_omp.cpp
+@@ -200,7 +200,6 @@
+ 
+   if (NEWTON_PAIR) {
+     // reduce per thread density
+-    thr->timer(Timer::PAIR);
+     data_reduce_thr(&(rho[0]), nall, comm->nthreads, 1, tid);
+     data_reduce_thr(&(mu[0][0]), nall, comm->nthreads, 3, tid);
+     data_reduce_thr(&(lambda[0][0]), nall, comm->nthreads, 6, tid);
+@@ -218,7 +217,6 @@
+ 
+   } else {
+     // reduce per thread density
+-    thr->timer(Timer::PAIR);
+     data_reduce_thr(&(rho[0]), nlocal, comm->nthreads, 1, tid);
+     data_reduce_thr(&(mu[0][0]), nlocal, comm->nthreads, 3, tid);
+     data_reduce_thr(&(lambda[0][0]), nlocal, comm->nthreads, 6, tid);
diff --git a/debian/patches/fix_format_not_a_string.patch b/debian/patches/fix_format_not_a_string.patch
new file mode 100644
index 0000000..beb7497
--- /dev/null
+++ b/debian/patches/fix_format_not_a_string.patch
@@ -0,0 +1,17 @@
+Description: fix FTBFS due "format not a string" error
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2013-11-22
+
+--- a/src/citeme.cpp
++++ b/src/citeme.cpp
+@@ -47,8 +47,8 @@
+ 
+   delete cs;
+ 
+-  if (screen) fprintf(screen,cite_nagline);
+-  if (logfile) fprintf(logfile,cite_nagline);
++  if (screen) fprintf(screen,"%s",cite_nagline);
++  if (logfile) fprintf(logfile,"%s",cite_nagline);
+ 
+   if (fp) fclose(fp);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 6b2ad29..88922ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 set_configure_flags.patch
+fix_FTBFS_timer.patch
+fix_format_not_a_string.patch
diff --git a/debian/patches/set_configure_flags.patch b/debian/patches/set_configure_flags.patch
index d478d91..14e4b19 100644
--- a/debian/patches/set_configure_flags.patch
+++ b/debian/patches/set_configure_flags.patch
@@ -39,7 +39,7 @@ Last-Update: 2013-02-03
 -FFT_LIB =	-lfftw
 +FFT_LIB =	-lfftw3
  
- # JPEG library, OPTIONAL
+ # JPEG and/or PNG library, OPTIONAL
  # see discussion in doc/Section_start.html#2_2 (step 7)
 @@ -62,7 +61,7 @@
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/lammps.git