[SCM] Packaging for LIGGGHTS, an Open Source Discrete Element Method Particle Simulation Software. branch, master, updated. upstream/1.5.1-36-g4f62071

Anton Gladky gladky.anton at gmail.com
Sat Mar 3 06:37:39 UTC 2012


The following commit has been merged in the master branch:
commit a5718ce06ff5bcf92212d4cc5ef91c9b050bbe57
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Mar 2 23:57:11 2012 +0100

    Enable JPEG and FFTW.

diff --git a/debian/control b/debian/control
index 9653429..19ac2af 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,13 @@
 Source: liggghts
 Section: science
 Priority: extra
-Build-Depends: debhelper (>= 7.0.50~), mpi-default-bin, mpi-default-dev
+Build-Depends: debhelper (>= 7.0.50~), mpi-default-bin, mpi-default-dev, 
+ fftw-dev, libjpeg-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
 Homepage: http://www.liggghts.com/
-Standards-Version: 3.9.3
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/debian-science/packages/liggghts.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/liggghts.git
 
diff --git a/debian/patches/enable_fftw_and_jpeg.patch b/debian/patches/enable_fftw_and_jpeg.patch
new file mode 100644
index 0000000..30e9c72
--- /dev/null
+++ b/debian/patches/enable_fftw_and_jpeg.patch
@@ -0,0 +1,24 @@
+--- 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
+@@ -38,9 +38,9 @@
+ # PATH = path for FFT library
+ # LIB = name of FFT library
+ 
+-FFT_INC =       -DFFT_NONE
+-FFT_PATH = 
+-FFT_LIB =	
++FFT_INC =       -DFFT_FFTW
++FFT_PATH =
++FFT_LIB =       -lfftw
+ 
+ # additional system libraries needed by LAMMPS package libraries
+ # these settings are IGNORED if the corresponding LAMMPS package
diff --git a/debian/patches/series b/debian/patches/series
index 3f2a16c..f71efdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 add_interpretator_name_to_the_examples.patches
 enable_default_compile_flags.patch
 fix_format_not_a_string.patch
+enable_fftw_and_jpeg.patch

-- 
Packaging for LIGGGHTS, an Open Source Discrete Element Method Particle Simulation Software.



More information about the debian-science-commits mailing list