[med-fichier] 03/17: Update patches Use dh_autoreconf

Christophe Trophime trophime-guest at moszumanska.debian.org
Tue Jan 28 10:40:35 UTC 2014 

This is an automated email from the git hooks/post-receive script.

trophime-guest pushed a commit to branch master
in repository med-fichier.

commit 19ebb3dfd22ad9974272cd5e19ac189f69679729
Author: Christophe Trophime <christrophime at googlemail.com>
Date:   Sun Sep 29 17:00:50 2013 +0200

    Update patches
    Use dh_autoreconf
---
 debian/control                             |  3 +--
 debian/patches/00-am_maintainer_mode.patch |  8 ++++----
 debian/patches/01-ac-prog-fc.patch         | 20 +++++++++++-------
 debian/patches/04-debian-mpi-libs.patch    | 33 ++++++++----------------------
 debian/patches/series                      |  4 ++--
 debian/rules                               |  6 +++++-
 6 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/debian/control b/debian/control
index fb9f926..4dcaec9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, "Adam C. Powell, IV" <hazelsct at debian.org>
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5), quilt, libtool, gfortran, 
+Build-Depends: debhelper (>= 5), quilt, libtool, gfortran, dh_autoreconf,
  libhdf5-mpi-dev (>= 1.8.8), hdf5-tools (>= 1.8.8),
  tk8.5
 Standards-Version: 3.9.2
diff --git a/debian/patches/00-am_maintainer_mode.patch b/debian/patches/00-am_maintainer_mode.patch
index 4b36f58..6b3ec91 100644
--- a/debian/patches/00-am_maintainer_mode.patch
+++ b/debian/patches/00-am_maintainer_mode.patch
@@ -1,10 +1,10 @@
-Index: med-fichier-3.0.3/configure.ac
+Index: med-fichier/configure.ac
 ===================================================================
---- med-fichier-3.0.3.orig/configure.ac	2012-01-21 10:10:15.000000000 +0000
-+++ med-fichier-3.0.3/configure.ac	2012-01-21 10:37:35.000000000 +0000
+--- med-fichier.orig/configure.ac	2013-09-29 16:34:14.000000000 +0200
++++ med-fichier/configure.ac	2013-09-29 16:34:14.000000000 +0200
 @@ -5,6 +5,9 @@
  ##Mettre à jour le numéro de package
- AC_INIT([MED Fichier],3.0.3,[eric.fayolle at edf.fr],med)
+ AC_INIT([MED Fichier],3.0.6,[eric.fayolle at edf.fr],med)
  
 +##
 +AM_MAINTAINER_MODE
diff --git a/debian/patches/01-ac-prog-fc.patch b/debian/patches/01-ac-prog-fc.patch
index 7a3a427..0f07d62 100644
--- a/debian/patches/01-ac-prog-fc.patch
+++ b/debian/patches/01-ac-prog-fc.patch
@@ -2,11 +2,17 @@ Index: med-fichier/configure.ac
 ===================================================================
 --- med-fichier.orig/configure.ac
 +++ med-fichier/configure.ac
-@@ -70,6 +70,7 @@
- AC_PROG_CC
- AC_PROG_CC_C99
- AC_PROG_F77
-+AC_PROG_FC
- AC_F77_LIBRARY_LDFLAGS
- AC_F77_WRAPPERS
+@@ -74,10 +74,10 @@
+ # Checks for programs.
+ test "x$ac_cv_prog_cc_c99" = "no" || AC_DEFINE(HAVE_CC_C99,[1],[The C99 capabilities of C compiler.])
  
+-MED_CHECK_F77
++MED_CHECK_F90
+ if test x"$enable_fortran" = xyes; then
+- AC_F77_WRAPPERS
+- AC_F77_LIBRARY_LDFLAGS
++ AC_F90_WRAPPERS
++ AC_F90_LIBRARY_LDFLAGS
+ fi
+ 
+ ## Choose med_int type between {int,long}
diff --git a/debian/patches/04-debian-mpi-libs.patch b/debian/patches/04-debian-mpi-libs.patch
index b0622f7..c0abfcf 100644
--- a/debian/patches/04-debian-mpi-libs.patch
+++ b/debian/patches/04-debian-mpi-libs.patch
@@ -4,38 +4,21 @@ Index: med-fichier/src/Makefile.am
 ===================================================================
 --- med-fichier.orig/src/Makefile.am
 +++ med-fichier/src/Makefile.am
-@@ -14,13 +14,13 @@
+@@ -18,7 +18,7 @@
  nodist_EXTRA_libmed_la_SOURCES = dummy.cxx
  
  #TODO : Créer une release pour une nvlle bilbiothèque de l'ancienne API libmed23 compilée conditionellement
--libmed_la_LDFLAGS = -no-undefined -version-info 3:4:2 @HDF5_LDFLAGS@ @HDF5_LIBS@
-+libmed_la_LDFLAGS = -no-undefined -version-info 3:4:2 @HDF5_LDFLAGS@ @HDF5_LIBS@ -lmpi++
+-libmed_la_LDFLAGS = -no-undefined -version-info 5:1:4 @HDF5_LDFLAGS@ @HDF5_LIBS@
++libmed_la_LDFLAGS = -no-undefined -version-info 5:1:4 @HDF5_LDFLAGS@ @HDF5_LIBS@ -lmpi++
+ if ENABLE_FORTRAN
+ libmed_la_SOURCES += MEDiteratorsF.f
  libmed_la_LIBADD  = 2.3.6/libmed23.la 2.3.6/libmedVV.la ci/libci.la fi/libfi.la cfi/libcfi.la misc/libmisc.la hdfi/libhdfi.la $(FLIBS)
- 
+@@ -29,7 +29,7 @@
  libmedC_la_SOURCES = MEDiterators.c
  nodist_EXTRA_libmedC_la_SOURCES = dummy.cxx
  #TODO : Changer la release
--libmedC_la_LDFLAGS = -no-undefined -version-info 3:4:2 @HDF5_LDFLAGS@ @HDF5_LIBS@
-+libmedC_la_LDFLAGS = -no-undefined -version-info 3:4:2 @HDF5_LDFLAGS@ @HDF5_LIBS@ -lmpi++
+-libmedC_la_LDFLAGS = -no-undefined -version-info 5:1:4 @HDF5_LDFLAGS@ @HDF5_LIBS@
++libmedC_la_LDFLAGS = -no-undefined -version-info 5:1:4 @HDF5_LDFLAGS@ @HDF5_LIBS@ -lmpi++
  libmedC_la_LIBADD  = 2.3.6/libmedC23.la 2.3.6/libmedVV.la ci/libci.la misc/libmisc.la hdfi/libhdfi.la
  
  settingsdir = $(libdir)
-Index: med-fichier/src/Makefile.in
-===================================================================
---- med-fichier.orig/src/Makefile.in
-+++ med-fichier/src/Makefile.in
-@@ -339,12 +339,12 @@
- nodist_EXTRA_libmed_la_SOURCES = dummy.cxx
- 
- #TODO : Créer une release pour une nvlle bilbiothèque de l'ancienne API libmed23 compilée conditionellement
--libmed_la_LDFLAGS = -no-undefined -version-info 3:4:2 @HDF5_LDFLAGS@ @HDF5_LIBS@
-+libmed_la_LDFLAGS = -no-undefined -version-info 3:4:2 @HDF5_LDFLAGS@ @HDF5_LIBS@ -lmpi++
- libmed_la_LIBADD = 2.3.6/libmed23.la 2.3.6/libmedVV.la ci/libci.la fi/libfi.la cfi/libcfi.la misc/libmisc.la hdfi/libhdfi.la $(FLIBS)
- libmedC_la_SOURCES = MEDiterators.c
- nodist_EXTRA_libmedC_la_SOURCES = dummy.cxx
- #TODO : Changer la release
--libmedC_la_LDFLAGS = -no-undefined -version-info 3:4:2 @HDF5_LDFLAGS@ @HDF5_LIBS@
-+libmedC_la_LDFLAGS = -no-undefined -version-info 3:4:2 @HDF5_LDFLAGS@ @HDF5_LIBS@ -lmpi++
- libmedC_la_LIBADD = 2.3.6/libmedC23.la 2.3.6/libmedVV.la ci/libci.la misc/libmisc.la hdfi/libhdfi.la
- settingsdir = $(libdir)
- settings_DATA = libmed2.settings
diff --git a/debian/patches/series b/debian/patches/series
index 87c7d82..116bca5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,5 @@
 02-acinclude.patch
 #03-c++-safe.patch
 04-debian-mpi-libs.patch
-05-xmdump-path-fix.patch
-99-autoreconf.patch
+#05-xmdump-path-fix.patch
+###99-autoreconf.patch
diff --git a/debian/rules b/debian/rules
index 9d300d0..389012e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,12 +26,15 @@ include /usr/share/quilt/quilt.make
 
 config.status: patch
 	dh_testdir
+	dh_autoreconf
 	F77="gfortran" CFLAGS="$(CFLAGS)" CPPFLAGS=-I/usr/include/mpi ./configure \
 			--host=$(DEB_HOST_GNU_TYPE) \
 			--build=$(DEB_BUILD_GNU_TYPE) \
 			--prefix=/usr \
 			--mandir=\$${prefix}/share/man \
-			--infodir=\$${prefix}/share/info
+			--infodir=\$${prefix}/share/info \
+			--with-f90="gfortran"
+	
 
 build: build-stamp
 build-arch: build-stamp
@@ -55,6 +58,7 @@ clean:
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f build-stamp 
+	dh_autoreconf-clean
 	debian/rules unpatch
 	dh_clean
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/med-fichier.git

More information about the debian-science-commits mailing list