[SCM] hdf5 branch, master, updated. upstream/1.8.4-patch1-30-g5173e31

2011-05-13 Thread Sylvestre Ledru
The following commit has been merged in the master branch:
commit 66499bce43eb058deb7496e81576e49b5a241bbf
Author: Sylvestre Ledru sylvestre.le...@scilab.org
Date:   Fri May 13 15:28:44 2011 +0200

  * Get ride of the -m128bit-long-double FFLAGS (was introduced to fix bug
#619281)

diff --git a/debian/changelog b/debian/changelog
index f5104b5..66f1859 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hdf5 (1.8.6-3) experimental; urgency=low
+
+  * Get ride of the -m128bit-long-double FFLAGS (was introduced to fix bug
+#619281)
+
+ -- Sylvestre Ledru sylves...@debian.org  Fri, 13 May 2011 15:26:12 +0200
+
 hdf5 (1.8.6-2) experimental; urgency=low
 
   * Disable the r16 check (Closes: #619281)
diff --git a/debian/rules b/debian/rules
index 115b968..a8ae4b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,12 +70,11 @@ endif
 # else
 DEBCC=gcc
 DEBCXX=g++
-DEBFORTRAN=gfortran-4.6  # cf bug #622783
+DEBFORTRAN=gfortran  # cf bug #622783
 # With gcc 4.3+ force optimization off, else some tests fail...
 #DEBOPT=-O0
 # endif
 ###
-FFLAGS+= $(DEBOPT) -m128bit-long-double
 
 export MPICH2_CC=$(DEBCC)
 export MPICH2_CLINKER=$(DEBCC)

-- 
Hierarchical Data Format 5 (HDF5)

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel


[SCM] hdf5 branch, master, updated. upstream/1.8.4-patch1-30-g5173e31

2011-05-13 Thread Sylvestre Ledru
The following commit has been merged in the master branch:
commit 5173e311f3926b663f5b822cb4d3f11788a6da41
Author: Sylvestre Ledru sylvestre.le...@scilab.org
Date:   Fri May 13 15:33:04 2011 +0200

  * Get ride of DEBCC, DEBCXX  DEBFORTRAN useless variables

diff --git a/debian/changelog b/debian/changelog
index 66f1859..fe2439f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ hdf5 (1.8.6-3) experimental; urgency=low
 
   * Get ride of the -m128bit-long-double FFLAGS (was introduced to fix bug
 #619281)
+  * Get ride of DEBCC, DEBCXX  DEBFORTRAN useless variables
 
  -- Sylvestre Ledru sylves...@debian.org  Fri, 13 May 2011 15:26:12 +0200
 
diff --git a/debian/rules b/debian/rules
index a8ae4b3..8c34a51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,19 +68,14 @@ endif
 #   DEBCC=gcc-3.2
 #   DEBCXX=g++-3.2
 # else
-DEBCC=gcc
-DEBCXX=g++
-DEBFORTRAN=gfortran  # cf bug #622783
+#DEBCC=gcc
+#DEBCXX=g++
+#DEBFORTRAN=gfortran
 # With gcc 4.3+ force optimization off, else some tests fail...
 #DEBOPT=-O0
 # endif
 ###
 
-export MPICH2_CC=$(DEBCC)
-export MPICH2_CLINKER=$(DEBCC)
-export MPICH2_CCC=$(DEBCXX)
-export MPICH2_CCLINKER=$(DEBCXX)
-
 CONFIGURE_FLAGS = --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) \
  --build=$(DEB_BUILD_GNU_TYPE) \
  --mandir=\$${prefix}/share/man \
@@ -112,7 +107,7 @@ configure-stamp-serial: configure-stamp-debian
dh_testdir
-mkdir debian/build-serial
 # configure serial version
-   cd debian/build-serial  CC=$(DEBCC) CXX=$(DEBCXX) F9X=$(DEBFORTRAN) 
CFLAGS=$(CFLAGS) CXXFLAGS=$(CXXFLAGS) FFLAGS=$(FFLAGS) \
+   cd debian/build-serial  CFLAGS=$(CFLAGS) CXXFLAGS=$(CXXFLAGS) 
FFLAGS=$(FFLAGS) \
../../configure $(CONFIGURE_FLAGS) $(SERIAL_ONLY_FLAGS) 
touch $@
 

-- 
Hierarchical Data Format 5 (HDF5)

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel