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

[Anton Gladky]

The following commit has been merged in the master branch:
commit 9d602d4d3b15106313c08795460922bc66d56ddf
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sat Mar 3 07:11:32 2012 +0100

    Enable only JPEG. Seems FFTW hurts the productivity.

diff --git a/debian/control b/debian/control
index 19ac2af..1b8abb1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: liggghts
 Section: science
 Priority: extra
-Build-Depends: debhelper (>= 7.0.50~), mpi-default-bin, mpi-default-dev, 
- fftw-dev, libjpeg-dev
+Build-Depends: debhelper (>= 9), mpi-default-bin, mpi-default-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
diff --git a/debian/patches/enable_fftw_and_jpeg.patch b/debian/patches/enable_fftw_and_jpeg.patch
deleted file mode 100644
index 30e9c72..0000000
--- a/debian/patches/enable_fftw_and_jpeg.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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/enable_jpeg.patch b/debian/patches/enable_jpeg.patch
new file mode 100644
index 0000000..f4fb794
--- /dev/null
+++ b/debian/patches/enable_jpeg.patch
@@ -0,0 +1,15 @@
+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/series b/debian/patches/series
index f71efdd..6e0e536 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +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
+enable_jpeg.patch
diff --git a/debian/rules b/debian/rules
index b4733ad..e876e64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 %:
 	dh $@ --parallel
 
-export OMPI_MCA_plm_rsh_agent=/bin/false
+export OMPI_MCA_plm_rsh_agent=/bin/false		#workaround to start MPI-applications in chroot
 
 override_dh_auto_clean:
 	cd src; make clean-all

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