[lammps] 02/05: Remove patch, applied by upstream.

[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 b05b30277ba99c02b5ba1c6ed9502a345cf44981
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Apr 16 19:22:07 2014 +0200

    Remove patch, applied by upstream.
---
 debian/patches/fix_FTBFS_timer.patch | 22 ----------------------
 debian/patches/series                |  1 -
 2 files changed, 23 deletions(-)

diff --git a/debian/patches/fix_FTBFS_timer.patch b/debian/patches/fix_FTBFS_timer.patch
deleted file mode 100644
index a92a97c..0000000
--- a/debian/patches/fix_FTBFS_timer.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/series b/debian/patches/series
index 88922ea..8acf0f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 set_configure_flags.patch
-fix_FTBFS_timer.patch
 fix_format_not_a_string.patch

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