[syrthes/master] Compile convert2syrthes

[Gilles Filippini]

---
 debian/changelog              |   11 ++++++++---
 debian/control                |    2 +-
 debian/patches/libmed-mesgerr |   14 ++++++++++++++
 debian/patches/series         |    1 +
 debian/rules                  |    3 +++
 5 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 debian/patches/libmed-mesgerr

diff --git a/debian/changelog b/debian/changelog
index 9c7d0b2..da8d410 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,14 @@ syrthes (3.4.3-dfsg1-1) unstable; urgency=low
 
   * Quit hard coding the version number in the install path (closes: #571022)
   * Drop naming the binary package after the version when the
-    SCIENCE_EXPLICIT_VERSION variable is set
-  * debian/control: drop DM-Upload-Allowed and set Uploaders to my debian
-    address
+    SCIENCE_EXPLICIT_VERSION variable is set at build time
+  * debian/control:
+    + drop DM-Upload-Allowed and set Uploaders to my debian address
+    + Build-Depends: libmedc-dev, libhdf5-openmpi-dev (for convert2syrthes)
+  * New patch:
+    + libmed-mesgerr: the macro MESGERR has to be defined explicitly
+
+  * #### convert2syrthes needs a manpage
 
  -- Gilles Filippini <pini at debian.org>  Wed, 09 Feb 2011 00:04:32 +0100
 
diff --git a/debian/control b/debian/control
index 076d085..d34cf29 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Gilles Filippini <pini at debian.org>
-Build-Depends: quilt, debhelper (>= 7), gfortran
+Build-Depends: quilt, debhelper (>= 7), gfortran, libmedc-dev, libhdf5-openmpi-dev
 Standards-Version: 3.8.3
 Homepage: http://rd.edf.com/syrthes
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/syrthes.git;a=summary
diff --git a/debian/patches/libmed-mesgerr b/debian/patches/libmed-mesgerr
new file mode 100644
index 0000000..1db1ed3
--- /dev/null
+++ b/debian/patches/libmed-mesgerr
@@ -0,0 +1,14 @@
+Define MESGERR explicitly as requested by med_utils.h
+Index: syrthes/src/util/convert2syrthes/lecture_med.c
+===================================================================
+--- syrthes.orig/src/util/convert2syrthes/lecture_med.c	2011-02-09 00:57:32.000000000 +0100
++++ syrthes/src/util/convert2syrthes/lecture_med.c	2011-02-09 00:57:46.000000000 +0100
+@@ -42,7 +42,7 @@
+ 
+ /* include MED */
+ #include <med.h>
+-#define MESGERR
++#define MESGERR 1
+ #include <med_utils.h>
+ 
+ int ouvrir_med(struct typ_maillage *maillage, /* INOUT structure de maillage */
diff --git a/debian/patches/series b/debian/patches/series
index e73bcb3..879a8bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 syrthes_env
 f2c
+libmed-mesgerr
diff --git a/debian/rules b/debian/rules
index 8a90f87..e86ce21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,8 @@ build-stamp: configure-stamp  $(QUILT_STAMPFN)
 
 	# Add here commands to compile the package.
 	cd $(CURDIR)/bin && SYRTHES_HOME=$(CURDIR) $(MAKE) install
+	# convert2syrthes
+	make -C src/util/convert2syrthes MED="yes" INCMED="-I/usr/include/openmpi" LIBMED="-lmedC"
 
 	touch $@
 
@@ -57,6 +59,7 @@ install: build
 	  usr; do \
 	  find $$dir -maxdepth 1 -type f -exec install -m a-x "{}" $(INSTALL_DIR)/$(SYRTHES_HOME)/$$dir \; ; \
 	done
+	install src/util/convert2syrthes/convert2syrthes $(INSTALL_DIR)/usr/bin
 	cd $(INSTALL_DIR)/$(SYRTHES_HOME)/bin && chmod a+x syrthes_create_case Linux/syrthes2ensight
 	sed -i "s!@SYRTHES_HOME@!/$(SYRTHES_HOME)!g" $(INSTALL_DIR)/$(SYRTHES_HOME)/bin/syrthes_create_case
 	sed -i "s!@SYRTHES_HOME@!/$(SYRTHES_HOME)!g" $(INSTALL_DIR)/$(SYRTHES_HOME)/bin/Makefile
-- 
1.7.1