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

[Anton Gladky]

The following commit has been merged in the master branch:
commit 883b28c0c132e453ae9749b0a41dc2b961d504ae
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sat Feb 25 22:26:18 2012 +0100

    Add jpeg option to flags.

diff --git a/debian/control b/debian/control
index 7c565c2..e713684 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: lammps
 Section: science
 Priority: extra
-Build-Depends: debhelper (>= 9), mpi-default-bin, mpi-default-dev, libfftw3-dev
+Build-Depends: debhelper (>= 9), mpi-default-bin, mpi-default-dev, libfftw3-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/set_configure_flags.patch b/debian/patches/set_configure_flags.patch
index 2b701ff..b2de467 100644
--- a/debian/patches/set_configure_flags.patch
+++ b/debian/patches/set_configure_flags.patch
@@ -19,6 +19,15 @@ Last-Update: 2012-02-23
  LIB =           -lstdc++
  ARCHIVE =	ar
  ARFLAGS =	-rcsv
+@@ -25,7 +24,7 @@
+ # LAMMPS ifdef settings, OPTIONAL
+ # see possible settings in doc/Section_start.html#2_2 (step 4)
+ 
+-LMP_INC =	-DLAMMPS_GZIP
++LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG
+ 
+ # MPI library, REQUIRED
+ # see discussion in doc/Section_start.html#2_2 (step 5)
 @@ -45,9 +44,9 @@
  # PATH = path for FFT library
  # LIB = name of FFT library
@@ -31,3 +40,12 @@ Last-Update: 2012-02-23
  
  # JPEG library, OPTIONAL
  # see discussion in doc/Section_start.html#2_2 (step 7)
+@@ -58,7 +57,7 @@
+ 
+ JPG_INC =       
+ JPG_PATH = 	
+-JPG_LIB =	
++JPG_LIB =	-ljpeg
+ 
+ # ---------------------------------------------------------------------
+ # build rules and dependencies

-- 
LAMMPS Molecular Dynamics Simulator