[SCM] LAMMPS Molecular Dynamics Simulator branch, master, updated. upstream/20120221.git18e3637-12-g32ee421

[Anton Gladky]

The following commit has been merged in the master branch:
commit 32ee4215801ff6eb8fc6fd57421b5f34453b5877
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sat Feb 25 20:19:44 2012 +0100

    Add g++ build.

diff --git a/debian/control b/debian/control
index 959cffc..84c9cae 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,28 @@ Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/debian-science/packages/lammps.git
 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: paraview
-Description: Molecular Dynamics Simulator. MPI-binaryy.
+Recommends: lammps-doc
+Description: Molecular Dynamics Simulator. MPI-binary.
  LAMMPS is a classical molecular dynamics code, and an acronym for Large-scale 
  Atomic/Molecular Massively Parallel Simulator.
  .
diff --git a/debian/lammps-mpi.manpages b/debian/lammps-mpi.manpages
index 0f65186..5f9df9d 100644
--- a/debian/lammps-mpi.manpages
+++ b/debian/lammps-mpi.manpages
@@ -1 +1 @@
-debian/*.1
+debian/lammps-mpi.1
diff --git a/debian/lammps-mpi.1 b/debian/lammps.1
similarity index 100%
copy from debian/lammps-mpi.1
copy to debian/lammps.1
diff --git a/debian/lammps.install b/debian/lammps.install
new file mode 100644
index 0000000..aaab72d
--- /dev/null
+++ b/debian/lammps.install
@@ -0,0 +1 @@
+src/lammps usr/bin
diff --git a/debian/lammps.manpages b/debian/lammps.manpages
new file mode 100644
index 0000000..da31294
--- /dev/null
+++ b/debian/lammps.manpages
@@ -0,0 +1 @@
+debian/lammps.1
diff --git a/debian/rules b/debian/rules
index 05c3135..d5582f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,5 +8,7 @@ override_dh_auto_clean:
 	dh_clean
 
 override_dh_auto_build:
-	cd src; make openmpi
+	cd src; make g++
+	cd src; make clean-all; make openmpi
 	mv src/lmp_openmpi src/lammps-mpi
+	mv src/lmp_g++ src/lammps

-- 
LAMMPS Molecular Dynamics Simulator