[SCM] Packaging for ESyS-Particle - Open Source software for particle-based numerical modelling branch, master, updated. debian/2.2-1_exp1-8-gdb2c5f2

[Anton Gladky]

The following commit has been merged in the master branch:
commit db2c5f2b2853d5722aeb086c1b8e49564b81c0f5
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun May 5 21:28:03 2013 +0200

    Fix FTBFS.

diff --git a/debian/patches/01_remove_obsolete_dir.patch b/debian/patches/01_remove_obsolete_dir.patch
new file mode 100644
index 0000000..90ce0f6
--- /dev/null
+++ b/debian/patches/01_remove_obsolete_dir.patch
@@ -0,0 +1,15 @@
+Description: remove libltdl from Makefile.am
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2013-05-05
+
+--- esys-particle-2.2.u1.orig/Makefile.am
++++ esys-particle-2.2.u1/Makefile.am
+@@ -14,7 +14,7 @@
+ 
+ include $(top_srcdir)/Config/Cpp.am
+ 
+-SUBDIRS = libltdl Foundation ntable tml ppa pis Geometry Model Fields Parallel Tools Python Doc/Tutorial
++SUBDIRS = Foundation ntable tml ppa pis Geometry Model Fields Parallel Tools Python Doc/Tutorial
+ 
+ ACLOCAL_AMFLAGS = -I Config
+ 
diff --git a/debian/patches/02_remove_bzr_version.patch b/debian/patches/02_remove_bzr_version.patch
new file mode 100644
index 0000000..20186a6
--- /dev/null
+++ b/debian/patches/02_remove_bzr_version.patch
@@ -0,0 +1,41 @@
+Description: remove bzr version from release
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2013-05-05
+
+--- a/Parallel/CheckPointInfo.cpp
++++ b/Parallel/CheckPointInfo.cpp
+@@ -15,7 +15,6 @@
+ #include "Parallel/CheckPointInfo.h"
+ #include "Geometry/GeometryInfo.h"
+ #include "Foundation/version.h"
+-#include "bzrversion.h"
+ 
+ namespace esys
+ {
+@@ -29,8 +28,7 @@
+           m_timeStepSize(0.0),
+           m_timeStep(0),
+           m_geoInfo(),
+-          m_fileNames(),
+-	  m_bzrVersion(s_bzr_revision)
++          m_fileNames()
+       {
+       }
+ 
+@@ -90,7 +88,7 @@
+           << m_timeStepSize << delim
+           << m_timeStep     << delim;
+ 	// ESyS-Particle version info
+-	oStream << lsm_version_info::ESySParticleVersion << m_bzrVersion << delim ;
++	oStream << lsm_version_info::ESySParticleVersion << delim ;
+         m_geoInfo.writeWithoutVersion(oStream);
+         oStream
+           << delim
+@@ -107,7 +105,6 @@
+       int          m_timeStep;
+       GeometryInfo m_geoInfo;
+       StringVector m_fileNames;
+-      int          m_bzrVersion;
+     };
+ 
+     CheckPointInfo::CheckPointInfo() : m_pImpl(new CheckPointInfo::Impl)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..abd746f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_remove_obsolete_dir.patch
+02_remove_bzr_version.patch
diff --git a/debian/rules b/debian/rules
index 3b68111..f245662 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,12 +13,11 @@ CXXFLAGS := -Wall $(shell dpkg-buildflags --get CXXFLAGS)
 CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 LDFLAGS := -lboost_system $(shell dpkg-buildflags --get LDFLAGS)
 
-extra_flags += CC=mpicc CXX=mpicxx --prefix=/usr --exec_prefix=/usr\
- $ CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' CPPFLAGS='$(CPPFLAGS)'\
+extra_flags += CC=mpicc CXX=mpicxx CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' CPPFLAGS='$(CPPFLAGS)'\
  LDFLAGS='$(LDFLAGS)' --with-epydoc --with-vtk
 
 override_dh_auto_configure:
-	dh_auto_configure -- (extra_flags) 
+	dh_auto_configure -- $(extra_flags) 
 
 override_dh_auto_build:
 	dh_auto_build

-- 
Packaging for ESyS-Particle - Open Source software for particle-based numerical modelling