[SCM] Packaging for LIGGGHTS, an Open Source Discrete Element Method Particle Simulation Software. branch, master, updated. debian/1.5.3-1-8-g9ec1537
Anton Gladky
gladky.anton at gmail.com
Tue May 7 20:58:32 UTC 2013
The following commit has been merged in the master branch:
commit e34c201fa501360e10c548a884d3606bc913d947
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Tue May 7 22:47:28 2013 +0200
Split the package into libliggghts2, liggghts-doc, liggghts2-dbg.
diff --git a/debian/control b/debian/control
index 3a9c52b..ec73d29 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,19 @@ Source: liggghts
Section: science
Priority: extra
Build-Depends: debhelper (>= 9), mpi-default-bin, mpi-default-dev,
- libjpeg-dev
+ libjpeg-dev, cmake, libboost-mpi1.53-dev
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Anton Gladky <gladky.anton at gmail.com>
-DM-Upload-Allowed: yes
+Uploaders: Anton Gladky <gladk at debian.org>
Homepage: http://www.liggghts.com/
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Vcs-Git: git://git.debian.org/git/debian-science/packages/liggghts.git
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/liggghts.git
Package: liggghts
Architecture: any
-Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: foreign
+Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends},
+ libliggghts2 (>= ${source:Version})
Recommends: paraview
Description: Open Source DEM Particle Simulation Software.
LIGGGHTS stands for LAMMPS improved for general granular and granular
@@ -25,3 +26,79 @@ Description: Open Source DEM Particle Simulation Software.
package to perform these kind of simulations. LIGGGHTS aims to improve those
capability with the goal to apply it to industrial applications.
Development version.
+
+Package: libliggghts2
+Architecture: any
+Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Open Source DEM Particle Simulation Software. Shared library
+ LIGGGHTS stands for LAMMPS improved for general granular and granular
+ heat transfer simulations.
+ .
+ LAMMPS is a classical molecular dynamics simulator. It is widely used in
+ the field of Molecular Dynamics. Thanks to physical and algorithmic analogies,
+ LAMMPS is a very good platform for DEM simulations. LAMMPS offers a GRANULAR
+ package to perform these kind of simulations. LIGGGHTS aims to improve those
+ capability with the goal to apply it to industrial applications.
+ Development version.
+ .
+ The package contains shared library.
+
+Package: libliggghts-dev
+Architecture: any
+Section: libdevel
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends},
+ libliggghts2 (= ${binary:Version})
+Description: Open Source DEM Particle Simulation Software. Development files
+ LIGGGHTS stands for LAMMPS improved for general granular and granular
+ heat transfer simulations.
+ .
+ LAMMPS is a classical molecular dynamics simulator. It is widely used in
+ the field of Molecular Dynamics. Thanks to physical and algorithmic analogies,
+ LAMMPS is a very good platform for DEM simulations. LAMMPS offers a GRANULAR
+ package to perform these kind of simulations. LIGGGHTS aims to improve those
+ capability with the goal to apply it to industrial applications.
+ Development version.
+ .
+ The package contains development files.
+
+Package: liggghts-doc
+Architecture: all
+Section: doc
+Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends}
+Recommends: liggghts
+Description: Open Source DEM Particle Simulation Software. Dcoumentation and examples
+ LIGGGHTS stands for LAMMPS improved for general granular and granular
+ heat transfer simulations.
+ .
+ LAMMPS is a classical molecular dynamics simulator. It is widely used in
+ the field of Molecular Dynamics. Thanks to physical and algorithmic analogies,
+ LAMMPS is a very good platform for DEM simulations. LAMMPS offers a GRANULAR
+ package to perform these kind of simulations. LIGGGHTS aims to improve those
+ capability with the goal to apply it to industrial applications.
+ Development version.
+ .
+ The package contains documentation and examples.
+
+Package: libliggghts2-dbg
+Architecture: any
+Section: debug
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Depends: mpi-default-bin, ${shlibs:Depends}, ${misc:Depends},
+ liggghts (= ${binary:Version})
+Description: Open Source DEM Particle Simulation Software. Debugging symbols
+ LIGGGHTS stands for LAMMPS improved for general granular and granular
+ heat transfer simulations.
+ .
+ LAMMPS is a classical molecular dynamics simulator. It is widely used in
+ the field of Molecular Dynamics. Thanks to physical and algorithmic analogies,
+ LAMMPS is a very good platform for DEM simulations. LAMMPS offers a GRANULAR
+ package to perform these kind of simulations. LIGGGHTS aims to improve those
+ capability with the goal to apply it to industrial applications.
+ Development version.
+ .
+ The package contains debugging symbols.
diff --git a/debian/libliggghts-dev.install b/debian/libliggghts-dev.install
new file mode 100644
index 0000000..146a603
--- /dev/null
+++ b/debian/libliggghts-dev.install
@@ -0,0 +1,2 @@
+usr/include
+usr/lib/*/*.so
diff --git a/debian/libliggghts2.install b/debian/libliggghts2.install
new file mode 100644
index 0000000..0b787f9
--- /dev/null
+++ b/debian/libliggghts2.install
@@ -0,0 +1 @@
+usr/lib/*/libliggghts.so.*
diff --git a/debian/liggghts.docs b/debian/liggghts-doc.docs
similarity index 100%
rename from debian/liggghts.docs
rename to debian/liggghts-doc.docs
diff --git a/debian/liggghts.examples b/debian/liggghts-doc.examples
similarity index 100%
rename from debian/liggghts.examples
rename to debian/liggghts-doc.examples
diff --git a/debian/liggghts-doc.lintian-overrides b/debian/liggghts-doc.lintian-overrides
new file mode 100644
index 0000000..541f50f
--- /dev/null
+++ b/debian/liggghts-doc.lintian-overrides
@@ -0,0 +1 @@
+liggghts-doc: executable-not-elf-or-script
diff --git a/debian/liggghts.install b/debian/liggghts.install
index d1d0499..e772481 100644
--- a/debian/liggghts.install
+++ b/debian/liggghts.install
@@ -1 +1 @@
-src/liggghts usr/bin
+usr/bin
diff --git a/debian/patches/add_interpretator_name_to_the_examples.patches b/debian/patches/add_interpretator_name_to_the_examples.patches
deleted file mode 100644
index 8e67207..0000000
--- a/debian/patches/add_interpretator_name_to_the_examples.patches
+++ /dev/null
@@ -1,84 +0,0 @@
-Description: Add interpretator-name into some example scripts.
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-02-03
-
---- a/examples/LIGGGHTS/heatTransfer_2/runscript
-+++ b/examples/LIGGGHTS/heatTransfer_2/runscript
-@@ -1 +1,3 @@
-+#!/bin/bash -i
-+
- liggghts < in.heatGran
---- a/examples/LIGGGHTS/meshGran/runscript
-+++ b/examples/LIGGGHTS/meshGran/runscript
-@@ -1 +1,3 @@
-+#!/bin/bash -i
-+
- liggghts < in.meshGran
---- a/examples/LIGGGHTS/region_tetmesh/runscript
-+++ b/examples/LIGGGHTS/region_tetmesh/runscript
-@@ -1 +1,3 @@
-+#!/bin/bash -i
-+
- liggghts < in.tetmesh
---- a/examples/LIGGGHTS/insert_pack/runscript
-+++ b/examples/LIGGGHTS/insert_pack/runscript
-@@ -1 +1,3 @@
-+#!/bin/bash -i
-+
- liggghts < in.insert_pack
---- a/examples/LIGGGHTS/chute_wear/runscript
-+++ b/examples/LIGGGHTS/chute_wear/runscript
-@@ -1 +1,3 @@
-+#!/bin/bash -i
-+
- liggghts < in.chute_wear
---- a/examples/LIGGGHTS/conveyor/runscript
-+++ b/examples/LIGGGHTS/conveyor/runscript
-@@ -1 +1,3 @@
-+#!/bin/bash -i
-+
- liggghts < in.conveyor
---- a/examples/LIGGGHTS/newContactModels/runscript
-+++ b/examples/LIGGGHTS/newContactModels/runscript
-@@ -1 +1,3 @@
-+#!/bin/bash -i
-+
- liggghts < in.newModels
---- a/examples/LIGGGHTS/heatTransfer_1/runscript
-+++ b/examples/LIGGGHTS/heatTransfer_1/runscript
-@@ -1 +1,3 @@
-+#!/bin/bash -i
-+
- liggghts < in.heatGran
---- a/examples/LIGGGHTS/breakage/runscript
-+++ b/examples/LIGGGHTS/breakage/runscript
-@@ -1,2 +1,4 @@
-+#!/bin/bash -i
-+
- liggghts < in.break_init
- liggghts < in.break_resume
---- a/examples/LIGGGHTS/packing/runscript
-+++ b/examples/LIGGGHTS/packing/runscript
-@@ -1 +1,3 @@
-+#!/bin/bash -i
-+
- liggghts < in.packing
---- a/examples/LIGGGHTS/cohesion/runscript
-+++ b/examples/LIGGGHTS/cohesion/runscript
-@@ -1,2 +1,4 @@
-+#!/bin/bash -i
-+
- liggghts < in.cohesion
- liggghts < in.noCohesion
---- a/examples/LIGGGHTS/pour_dev/runscript
-+++ b/examples/LIGGGHTS/pour_dev/runscript
-@@ -1 +1,3 @@
-+#!/bin/bash -i
-+
- liggghts < in.pour
---- a/examples/LIGGGHTS/movingMeshGran/runscript
-+++ b/examples/LIGGGHTS/movingMeshGran/runscript
-@@ -1 +1,3 @@
-+#!/bin/bash -i
-+
- liggghts < in.movingMeshGran
diff --git a/debian/patches/enable_default_compile_flags.patch b/debian/patches/enable_default_compile_flags.patch
deleted file mode 100644
index a49aea8..0000000
--- a/debian/patches/enable_default_compile_flags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: use CXX and LD-flags, proposed by build environment instead
- of hardcoded.
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-03-02
-
---- a/src/MAKE/Makefile.fedora
-+++ b/src/MAKE/Makefile.fedora
-@@ -7,10 +7,10 @@
- # specify flags and libraries needed for your compiler
-
- CC = mpic++
--CCFLAGS = -g -O
-+CCFLAGS = -Wall $(shell dpkg-buildflags --get CXXFLAGS)
- DEPFLAGS = -M
- LINK = mpic++
--LINKFLAGS = -g -O
-+LINKFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
- LIB =
- ARCHIVE = ar
- ARFLAGS = -rc
diff --git a/debian/patches/enable_jpeg.patch b/debian/patches/enable_jpeg.patch
deleted file mode 100644
index f4fb794..0000000
--- a/debian/patches/enable_jpeg.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Enable JPEG.
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-02-03
-
---- a/src/MAKE/Makefile.fedora
-+++ b/src/MAKE/Makefile.fedora
-@@ -22,7 +22,7 @@
-
- # LAMMPS ifdef options, see doc/Section_start.html
-
--LMP_INC = -DLAMMPS_GZIP
-+LMP_INC = -DLAMMPS_GZIP -DLAMMPS_JPEG
-
- # MPI library, can be src/STUBS dummy lib
- # INC = path for mpi.h, MPI compiler settings
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 1515017..0000000
--- a/debian/patches/fix_format_not_a_string.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: Fix FTBFS "format not a string literal and no format arg"
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-03-02
-
---- a/src/fix_print.cpp
-+++ b/src/fix_print.cpp
-@@ -126,10 +126,10 @@
- modify->addstep_compute(update->ntimestep + nevery);
-
- if (me == 0) {
-- if (screenflag && screen) fprintf(screen,copy);
-- if (screenflag && logfile) fprintf(logfile,copy);
-+ if (screenflag && screen) fprintf(screen,"%s",copy);
-+ if (screenflag && logfile) fprintf(logfile,"%s",copy);
- if (fp) {
-- fprintf(fp,copy);
-+ fprintf(fp,"%s",copy);
- fflush(fp);
- }
- }
---- a/src/thermo.cpp
-+++ b/src/thermo.cpp
-@@ -255,8 +255,8 @@
- sprintf(&line[loc],"\n");
-
- if (me == 0) {
-- if (screen) fprintf(screen,line);
-- if (logfile) fprintf(logfile,line);
-+ if (screen) fprintf(screen,"%s",line);
-+ if (logfile) fprintf(logfile,"%s",line);
- }
- }
-
-@@ -322,9 +322,9 @@
- // print line to screen and logfile
-
- if (me == 0) {
-- if (screen) fprintf(screen,line);
-+ if (screen) fprintf(screen,"%s",line);
- if (logfile) {
-- fprintf(logfile,line);
-+ fprintf(logfile,"%s",line);
- if (flushflag) fflush(logfile);
- }
- }
diff --git a/debian/patches/fix_gcc4.7_ftbfs.patch b/debian/patches/fix_gcc4.7_ftbfs.patch
deleted file mode 100644
index 1442034..0000000
--- a/debian/patches/fix_gcc4.7_ftbfs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix FTBFS due to gcc-4.7 (missing header)
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-05-23
-
---- a/src/cfd_datacoupling_file.cpp
-+++ b/src/cfd_datacoupling_file.cpp
-@@ -36,6 +36,7 @@
- #include "cfd_datacoupling_file.h"
- #include <iostream>
- #include <fstream>
-+#include <unistd.h>
-
- using namespace LAMMPS_NS;
- using namespace std;
diff --git a/debian/rules b/debian/rules
index b6625d7..bfebdab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,32 +1,29 @@
#!/usr/bin/make -f
+BUILDDIR = $(CURDIR)/debian/build
%:
- dh $@ --parallel
+ dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --parallel
export OMPI_MCA_plm_rsh_agent=/bin/false #workaround to start MPI-applications in chroot
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-disable_auto_test_archs_simple = armel armhf
+disable_auto_test_archs_simpl = armel armhf
disable_auto_test_archs_mpi = hurd-i386 mips mipsel s390 s390x
-override_dh_auto_clean:
- cd src; make clean-all
- dh_clean
-
-override_dh_auto_build:
- cd src; make fedora
- mv src/lmp_fedora src/liggghts
-
override_dh_auto_test:
ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_auto_test_archs_mpi)))
mkdir test
- cp -r examples/LIGGGHTS/chute_wear/* test/
- cd test; mpirun -np 2 ./../src/liggghts < in.chute_wear
+ cp -r examples/LIGGGHTS/Tutorials_public/heatTransfer_1/* test/
+ cd test; mpirun -np 2 $(BUILDDIR)/src/liggghts < in.heatGran
rm -rf test
endif
ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_auto_test_archs_simple)))
mkdir test
- cp -r examples/LIGGGHTS/chute_wear/* test/
- cd test; ./../src/liggghts < in.chute_wear
+ cp -r examples/LIGGGHTS/Tutorials_public/heatTransfer_1/* test/
+ cd test; $(BUILDDIR)/src/liggghts < in.heatGran
rm -rf test
endif
+override_dh_strip:
+ dh_strip --dbg-package=libliggghts2-dbg
+
--
Packaging for LIGGGHTS, an Open Source Discrete Element Method Particle Simulation Software.
More information about the debian-science-commits
mailing list