[SCM] LAMMPS Molecular Dynamics Simulator branch, master, updated. upstream/20120221.git18e3637-14-g385a6bb
Anton Gladky
gladky.anton at gmail.com
Sat Feb 25 19:39:10 UTC 2012
The following commit has been merged in the master branch:
commit 385a6bb261a0e38c72c984b0be2de948ebc1b9fe
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Sat Feb 25 20:39:06 2012 +0100
Do not build 2 binaries.
diff --git a/debian/control b/debian/control
index 84c9cae..7c565c2 100644
--- a/debian/control
+++ b/debian/control
@@ -13,25 +13,8 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/lammps.git
Package: lammps
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: lammps-doc
-Description: Molecular Dynamics Simulator. Main binary.
- LAMMPS is a classical molecular dynamics code, and an acronym for Large-scale
- Atomic/Molecular Massively Parallel Simulator.
- .
- LAMMPS has potentials for soft materials (biomolecules, polymers) and
- solid-state materials (metals, semiconductors) and coarse-grained or
- mesoscopic systems. It can be used to model atoms or, more generically, as a
- parallel particle simulator at the atomic, meso, or continuum scale.
- .
- LAMMPS runs on single processors or in parallel using message-passing
- techniques and a spatial-decomposition of the simulation domain. The code is
- designed to be easy to modify or extend with new functionality.
-
-Package: lammps-mpi
-Architecture: any
-Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
-Recommends: lammps-doc
-Description: Molecular Dynamics Simulator. MPI-binary.
+Recommends: lammps-doc, mpi-default-bin
+Description: Molecular Dynamics Simulator.
LAMMPS is a classical molecular dynamics code, and an acronym for Large-scale
Atomic/Molecular Massively Parallel Simulator.
.
diff --git a/debian/lammps-mpi.1 b/debian/lammps-mpi.1
deleted file mode 100644
index 290bf47..0000000
--- a/debian/lammps-mpi.1
+++ /dev/null
@@ -1,35 +0,0 @@
-.TH LAMMPS "2012-02-23"
-.SH NAME
-.B LAMMPS
-\- Molecular Dynamics Simulator.
-
-.SH SYNOPSIS
-.B lammps
-< in.file
-
-.SH DESCRIPTION
-.B LAMMPS
-LAMMPS is a classical molecular dynamics code, and an acronym for Large-scale
-Atomic/Molecular Massively Parallel Simulator. LAMMPS has potentials for soft
-materials (biomolecules, polymers) and solid-state materials (metals,
-semiconductors) and coarse-grained or mesoscopic systems. It can be used to
-model atoms or, more generically, as a parallel particle simulator at the
-atomic, meso, or continuum scale.
-
-See http://lammps.sandia.gov/ for documentation.
-
-.SH COPYRIGHT
-© 2003--2012 Sandia Corporation
-
-This package is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This package is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/lammps-mpi.install b/debian/lammps-mpi.install
deleted file mode 100644
index adc3229..0000000
--- a/debian/lammps-mpi.install
+++ /dev/null
@@ -1 +0,0 @@
-src/lammps-mpi usr/bin
diff --git a/debian/lammps-mpi.manpages b/debian/lammps-mpi.manpages
deleted file mode 100644
index 5f9df9d..0000000
--- a/debian/lammps-mpi.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/lammps-mpi.1
diff --git a/debian/patches/fix_g++_build.patch b/debian/patches/fix_g++_build.patch
deleted file mode 100644
index fa82b8d..0000000
--- a/debian/patches/fix_g++_build.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/src/MAKE/Makefile.g++
-+++ b/src/MAKE/Makefile.g++
-@@ -7,13 +7,13 @@
- # specify flags and libraries needed for your compiler
-
- CC = g++
--CCFLAGS = -g -O # -Wunused
-+CCFLAGS = -Wall $(shell dpkg-buildflags --get CXXFLAGS)
- DEPFLAGS = -M
--LINK = g++
--LINKFLAGS = -g -O
--LIB =
-+LINK = mpic++
-+LINKFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
-+LIB = -lstdc++
- ARCHIVE = ar
--ARFLAGS = -rc
-+ARFLAGS = -rcsv
- SIZE = size
-
- # ---------------------------------------------------------------------
-@@ -24,7 +24,7 @@
- # LAMMPS ifdef settings, OPTIONAL
- # see possible settings in doc/Section_start.html#2_2 (step 4)
-
--LMP_INC = -DLAMMPS_GZIP -DLAMMPS_JPEG
-+LMP_INC = -DLAMMPS_GZIP
-
- # MPI library, REQUIRED
- # see discussion in doc/Section_start.html#2_2 (step 5)
-@@ -33,9 +33,9 @@
- # PATH = path for MPI library
- # LIB = name of MPI library
-
--MPI_INC = -DMPICH_SKIP_MPICXX
-+MPI_INC = -I/usr/include/mpi -DOMPI_SKIP_MPICXX -DMPICH_SKIP_MPICXX
- MPI_PATH =
--MPI_LIB = -lmpich -lmpl -lpthread
-+MPI_LIB =
-
- # FFT library, OPTIONAL
- # see discussion in doc/Section_start.html#2_2 (step 6)
-@@ -44,9 +44,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 library, OPTIONAL
- # see discussion in doc/Section_start.html#2_2 (step 7)
-@@ -57,7 +57,7 @@
-
- JPG_INC =
- JPG_PATH =
--JPG_LIB = -ljpeg
-+JPG_LIB =
-
- # ---------------------------------------------------------------------
- # build rules and dependencies
diff --git a/debian/patches/series b/debian/patches/series
index dae13b4..8acf0f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
set_configure_flags.patch
fix_format_not_a_string.patch
-fix_g++_build.patch
diff --git a/debian/rules b/debian/rules
index d5582f6..2313125 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,5 @@ override_dh_auto_clean:
dh_clean
override_dh_auto_build:
- cd src; make g++
- cd src; make clean-all; make openmpi
- mv src/lmp_openmpi src/lammps-mpi
- mv src/lmp_g++ src/lammps
+ cd src; make openmpi
+ mv src/lmp_openmpi src/lammps
--
LAMMPS Molecular Dynamics Simulator
More information about the debian-science-commits
mailing list