[SCM] Packaging for threeb branch, master, updated. upstream/1.0-6-gf403dd5

[Frédéric-Emmanuel P?==?UTF-8?Q?ICCA]

The following commit has been merged in the master branch:
commit f403dd525159ca8053930cade2e934a780741059
Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
Date:   Mon Jul 23 14:49:37 2012 +0200

    still fixing compilation

diff --git a/debian/patches/0002-fix-build-with-g-4.7.patch b/debian/patches/0002-fix-build-with-g-4.7.patch
index ff88a4a..59d3d3e 100644
--- a/debian/patches/0002-fix-build-with-g-4.7.patch
+++ b/debian/patches/0002-fix-build-with-g-4.7.patch
@@ -1,26 +1,28 @@
 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric-Emmanuel=20PICCA?=
  <picca at synchrotron-soleil.fr>
-Date: Mon, 23 Jul 2012 14:43:38 +0200
+Date: Mon, 23 Jul 2012 14:48:45 +0200
 Subject: fix build with g++ 4.7
 
 ---
- Makefile.in   |    2 +-
+ Makefile.in   |    4 ++--
  multispot5.cc |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index b60cd48..e71ca53 100644
+index b60cd48..98e8406 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -24,7 +24,7 @@ else
+@@ -24,8 +24,8 @@ else
  	DFLAGS=
  endif
  
 -LDFLAGS=-l$(cvd) -l $(gvars3) -fopenmp
+-LDFLAGS_H=-l$(cvd) -l $(gvars3headless) -fopenmp
 +LDFLAGS=-l$(cvd) -l $(gvars3) -fopenmp -llapack
- LDFLAGS_H=-l$(cvd) -l $(gvars3headless) -fopenmp
++LDFLAGS_H=-l$(cvd) -l $(gvars3headless) -fopenmp -llapack
  
  STATIC_PART=-static-libgcc -Wl,-Bstatic -l$(cvd) -ljpeg -l$(gvars3headless) -llapack -lblas -lgfortran -lstdc++
+ DYNAMIC_PART= -Wl,-Bdynamic -lpng -ltiff -lrt
 diff --git a/multispot5.cc b/multispot5.cc
 index a2a614a..6065d89 100644
 --- a/multispot5.cc

-- 
Packaging for threeb