[lammps] 02/07: Refresh patches. Remove applied by upstream.

[Anton Gladky]

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

gladk pushed a commit to branch experimental
in repository lammps.

commit 820b5c5bbf1d54a768b0b969075742a4132398fa
Author: Anton Gladky <gladk at debian.org>
Date:   Sun Mar 15 18:39:24 2015 +0100

    Refresh patches. Remove applied by upstream.
---
 debian/patches/10_set_configure_flags.patch  | 56 ++++++++++++++++++++++++++++
 debian/patches/fix_format_not_a_string.patch | 17 ---------
 debian/patches/series                        |  3 +-
 debian/patches/set_configure_flags.patch     | 55 ---------------------------
 4 files changed, 57 insertions(+), 74 deletions(-)

diff --git a/debian/patches/10_set_configure_flags.patch b/debian/patches/10_set_configure_flags.patch
new file mode 100644
index 0000000..8a45f0e
--- /dev/null
+++ b/debian/patches/10_set_configure_flags.patch
@@ -0,0 +1,56 @@
+Description: use CXX and LD-flags, proposed by build environment instead
+ of hardcoded. Fix linkage problem with fftw3.
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2014-02-13
+
+Index: lammps-0~20150313.gitfa668e1/src/MAKE/Makefile.mpi
+===================================================================
+--- lammps-0~20150313.gitfa668e1.orig/src/MAKE/Makefile.mpi
++++ lammps-0~20150313.gitfa668e1/src/MAKE/Makefile.mpi
+@@ -7,13 +7,13 @@ SHELL = /bin/sh
+ # specify flags and libraries needed for your compiler
+ 
+ CC =		mpicxx
+-CCFLAGS =	-g -O3 
++CCFLAGS =	-Wall $(shell dpkg-buildflags --get CXXFLAGS) -fopenmp
+ SHFLAGS =	-fPIC
+ DEPFLAGS =	-M
+ 
+ LINK =		mpicxx
+-LINKFLAGS =	-g -O
+-LIB = 
++LINKFLAGS =	-O  $(shell dpkg-buildflags --get LDFLAGS)
++LIB = -lstdc++ -fopenmp
+ SIZE =		size
+ 
+ ARCHIVE =	ar
+@@ -28,7 +28,7 @@ SHLIBFLAGS =	-shared
+ # LAMMPS ifdef settings
+ # see possible settings in Section 2.2 (step 4) of manual
+ 
+-LMP_INC =	-DLAMMPS_GZIP
++LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG -DLAMMPS_MEMALIGN=64 
+ 
+ # MPI library
+ # see discussion in Section 2.2 (step 5) of manual
+@@ -50,9 +50,9 @@ MPI_LIB =
+ # PATH = path for FFT library
+ # LIB = name of FFT library
+ 
+-FFT_INC =    	
++FFT_INC =    	-DFFT_FFTW3 
+ FFT_PATH = 
+-FFT_LIB =	
++FFT_LIB =	-lfftw3
+ 
+ # JPEG and/or PNG library
+ # see discussion in Section 2.2 (step 7) of manual
+@@ -63,7 +63,7 @@ FFT_LIB =
+ 
+ JPG_INC =       
+ JPG_PATH = 	
+-JPG_LIB =	
++JPG_LIB =	-ljpeg
+ 
+ # ---------------------------------------------------------------------
+ # build rules and dependencies
diff --git a/debian/patches/fix_format_not_a_string.patch b/debian/patches/fix_format_not_a_string.patch
deleted file mode 100644
index beb7497..0000000
--- a/debian/patches/fix_format_not_a_string.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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 8acf0f0..3f57569 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-set_configure_flags.patch
-fix_format_not_a_string.patch
+10_set_configure_flags.patch
diff --git a/debian/patches/set_configure_flags.patch b/debian/patches/set_configure_flags.patch
deleted file mode 100644
index 774cc30..0000000
--- a/debian/patches/set_configure_flags.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: use CXX and LD-flags, proposed by build environment instead
- of hardcoded. Fix linkage problem with fftw3.
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-02-13
-
---- a/src/MAKE/Makefile.openmpi
-+++ b/src/MAKE/Makefile.openmpi
-@@ -7,14 +7,13 @@
- # specify flags and libraries needed for your compiler
- 
- CC =		mpic++
--CCFLAGS =	-O2 \
--		-funroll-loops -fstrict-aliasing -Wall -W -Wno-uninitialized
-+CCFLAGS =	-Wall $(shell dpkg-buildflags --get CXXFLAGS) -fopenmp
- SHFLAGS =	-fPIC
- DEPFLAGS =	-M
- 
- LINK =		mpic++
--LINKFLAGS =	-O
--LIB =           -lstdc++
-+LINKFLAGS =	-O $(shell dpkg-buildflags --get LDFLAGS)
-+LIB =           -lstdc++ -fopenmp
- SIZE =		size
- 
- ARCHIVE =	ar
-@@ -29,7 +28,7 @@
- # LAMMPS ifdef settings, OPTIONAL
- # see possible settings in doc/Section_start.html#2_2 (step 4)
- 
--LMP_INC =	-DLAMMPS_GZIP
-+LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG
- 
- # MPI library, REQUIRED
- # see discussion in doc/Section_start.html#2_2 (step 5)
-@@ -49,9 +48,9 @@
- # PATH = path for FFT library
- # LIB = name of FFT library
- 
--FFT_INC =       -DFFT_FFTW
-+FFT_INC =       -DFFT_FFTW3
- FFT_PATH = 
--FFT_LIB =	-lfftw
-+FFT_LIB =	-lfftw3
- 
- # JPEG and/or PNG library, OPTIONAL
- # see discussion in doc/Section_start.html#2_2 (step 7)
-@@ -62,7 +61,7 @@
- 
- JPG_INC =       
- JPG_PATH = 	
--JPG_LIB =	
-+JPG_LIB =	-ljpeg
- 
- # ---------------------------------------------------------------------
- # build rules and dependencies

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