[SCM] hdf5 branch, master, updated. debian/1.8.12-3-10-g1f09129

2014-01-11 Thread Gilles Filippini
The following commit has been merged in the master branch:
commit 1f091296559521e023e8a9be488fb19c0649ea0d
Author: Gilles Filippini p...@debian.org
Date:   Fri Jan 10 19:36:01 2014 +0100

Upload release 1.8.12-6 to unstable (no change).

diff --git a/debian/changelog b/debian/changelog
index fbaaeab..c3b3042 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hdf5 (1.8.12-6) unstable; urgency=medium
+
+  * Upload to unstable. 
+
+ -- Gilles Filippini p...@debian.org  Fri, 10 Jan 2014 19:35:03 +0100
+
 hdf5 (1.8.12-5) experimental; urgency=medium
 
   * Fix missing Breaks+Replaces relation for libhdf5-cpp-7

-- 
Hierarchical Data Format 5 (HDF5)

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


[SCM] hdf5 branch, master, updated. debian/1.8.12-3-10-g1f09129

2014-01-11 Thread Gilles Filippini
The following commit has been merged in the master branch:
commit abd47ec9b1fc222bc99ca4ea566aa1764d2e53f5
Author: Gilles Filippini p...@debian.org
Date:   Thu Jan 9 22:35:37 2014 +0100

Drop unneeded mpi compilation and link flags

diff --git a/debian/changelog b/debian/changelog
index 5c1cccd..d8b462a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ hdf5 (1.8.12-5) UNRELEASED; urgency=medium
 (closes: #734781).
   * Bump Standards-Version to 3.9.5 (no changes).
 
+  * rules: drop unneeded compilation and link flags which are automatically
+set by mpicc.
+
  -- Gilles Filippini p...@debian.org  Thu, 09 Jan 2014 20:20:01 +0100
 
 hdf5 (1.8.12-4) experimental; urgency=medium
diff --git a/debian/rules b/debian/rules
index 97c329c..fbaf10e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,9 +132,8 @@ configure-stamp-openmpi: configure-stamp-debian
dh_testdir
-mkdir debian/build-openmpi
 # configure version with openmpi
-   cd debian/build-openmpi  CPPFLAGS=-I/usr/lib/openmpi/include 
CFLAGS=$(CFLAGS) CXXFLAGS=$(CXXFLAGS) FFLAGS=$(FFLAGS) \
+   cd debian/build-openmpi  CFLAGS=$(CFLAGS) CXXFLAGS=$(CXXFLAGS) 
FFLAGS=$(FFLAGS) \
CC=mpicc.openmpi FC=mpif90.openmpi F9X=mpif90.openmpi 
RUNPARALLEL=/usr/bin/mpirun.openmpi \
-   LDFLAGS=-L/usr/lib/openmpi/lib/ \
OMPI_MCA_disable_memory_allocator=1 ../../configure 
$(CONFIGURE_FLAGS) --enable-fortran \
--enable-parallel=yes || { cat config.log; exit 1; }
touch $@
@@ -143,8 +142,8 @@ configure-stamp-mpich: configure-stamp-debian
dh_testdir
-mkdir debian/build-mpich
 # configure version with mpich
-   cd debian/build-mpich  FCFLAGS=-I/usr/lib/mpich/include/ 
CFLAGS=$(CFLAGS) CXXFLAGS=$(CXXFLAGS) FFLAGS=$(FFLAGS) \
-   LDFLAGS=-L/usr/lib/mpich/lib/ CC=mpicc.mpich \
+   cd debian/build-mpich  CFLAGS=$(CFLAGS) CXXFLAGS=$(CXXFLAGS) 
FFLAGS=$(FFLAGS) \
+   CC=mpicc.mpich \
CXX=mpicxx.mpich FC=mpif90.mpich F9X=mpif90.mpich 
RUNPARALLEL=/usr/bin/mpirun.mpich \
../../configure $(CONFIGURE_FLAGS) --enable-fortran \
--enable-parallel=yes || { cat config.log; exit 1; }

-- 
Hierarchical Data Format 5 (HDF5)

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


[SCM] hdf5 branch, master, updated. debian/1.8.12-3-10-g1f09129

2014-01-11 Thread Gilles Filippini
The following commit has been merged in the master branch:
commit 97e283836e066c827afcb01034463e0b729456b4
Author: Gilles Filippini p...@debian.org
Date:   Thu Jan 9 22:36:13 2014 +0100

Upload release 1.8.12-5 to experimental.

diff --git a/debian/changelog b/debian/changelog
index d8b462a..fbaaeab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hdf5 (1.8.12-5) UNRELEASED; urgency=medium
+hdf5 (1.8.12-5) experimental; urgency=medium
 
   * Fix missing Breaks+Replaces relation for libhdf5-cpp-7
 (closes: #734781).
@@ -7,7 +7,7 @@ hdf5 (1.8.12-5) UNRELEASED; urgency=medium
   * rules: drop unneeded compilation and link flags which are automatically
 set by mpicc.
 
- -- Gilles Filippini p...@debian.org  Thu, 09 Jan 2014 20:20:01 +0100
+ -- Gilles Filippini p...@debian.org  Thu, 09 Jan 2014 22:35:58 +0100
 
 hdf5 (1.8.12-4) experimental; urgency=medium
 

-- 
Hierarchical Data Format 5 (HDF5)

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


[SCM] hdf5 branch, master, updated. debian/1.8.12-3-10-g1f09129

2014-01-11 Thread Gilles Filippini
The following commit has been merged in the master branch:
commit 17f00d3a9eb764dd874e5f30621300260007a3b8
Author: Gilles Filippini p...@debian.org
Date:   Thu Jan 9 20:34:28 2014 +0100

Standards-Version: 3.9.5

diff --git a/debian/changelog b/debian/changelog
index 54a51b1..5c1cccd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ hdf5 (1.8.12-5) UNRELEASED; urgency=medium
 
   * Fix missing Breaks+Replaces relation for libhdf5-cpp-7
 (closes: #734781).
+  * Bump Standards-Version to 3.9.5 (no changes).
 
  -- Gilles Filippini p...@debian.org  Thu, 09 Jan 2014 20:20:01 +0100
 
diff --git a/debian/control b/debian/control
index f2f2ead..3532c6b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: dpkg-dev (= 1.16.1~), libmpich-dev, zlib1g-dev,
  libopenmpi-dev [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, 
debhelper (= 9~), sed (=4.1.5),
  gfortran, libibverbs-dev [!arm64 !arm !hppa !mips !mipsel !s390 !s390x 
!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
  sharutils, mpi-default-dev, chrpath, autotools-dev, automake, dh-autoreconf
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/hdf5.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/hdf5.git
diff --git a/debian/control.in b/debian/control.in
index 018f5c8..b36ab42 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,7 +9,7 @@ Build-Depends: dpkg-dev (= 1.16.1~), libmpich-dev, zlib1g-dev,
  libopenmpi-dev [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, 
debhelper (= 9~), sed (=4.1.5),
  gfortran, libibverbs-dev [!arm64 !arm !hppa !mips !mipsel !s390 !s390x 
!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
  sharutils, mpi-default-dev, chrpath, autotools-dev, automake, dh-autoreconf
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/hdf5.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/hdf5.git

-- 
Hierarchical Data Format 5 (HDF5)

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


[SCM] hdf5 branch, master, updated. debian/1.8.12-3-10-g1f09129

2014-01-11 Thread Gilles Filippini
The following commit has been merged in the master branch:
commit c54ec8ec6dcfa38c4fb47657f73ef4223bd9de59
Author: Gilles Filippini p...@debian.org
Date:   Thu Jan 9 20:32:40 2014 +0100

Proper Breaks+Replaces relation for libhdf5-cpp-7.

Fix #734781.

diff --git a/debian/changelog b/debian/changelog
index ca6cc5c..54a51b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hdf5 (1.8.12-5) UNRELEASED; urgency=medium
+
+  * Fix missing Breaks+Replaces relation for libhdf5-cpp-7
+(closes: #734781).
+
+ -- Gilles Filippini p...@debian.org  Thu, 09 Jan 2014 20:20:01 +0100
+
 hdf5 (1.8.12-4) experimental; urgency=medium
 
   * Fix a missed s/mpich2/mpich/g. 
diff --git a/debian/control b/debian/control
index 58577d2..f2f2ead 100644
--- a/debian/control
+++ b/debian/control
@@ -53,6 +53,8 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  libhdf5-7 (= ${binary:Version}),
+Replaces: libhdf5-7 ( 1.8.12~)
+Breaks: libhdf5-7 ( 1.8.12~)
 Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - C++ libraries
  HDF5 is a file format and library for storing scientific data.
diff --git a/debian/control.in b/debian/control.in
index abb20d4..018f5c8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -53,6 +53,8 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  libhdf5-@SONAME@ (= ${binary:Version}),
+Replaces: libhdf5-7 ( 1.8.12~)
+Breaks: libhdf5-7 ( 1.8.12~)
 Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - C++ libraries
  HDF5 is a file format and library for storing scientific data.

-- 
Hierarchical Data Format 5 (HDF5)

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