[SCM] hdf5 branch, master, updated. upstream/1.8.8-27-gc8c5084

2012-01-19 Thread Sylvestre Ledru
The following commit has been merged in the master branch:
commit c8c508481b5b387a21dbda63909dc22a184187c4
Merge: ab78729a670b8bc2fa91c5f8161412cc1ed3984c 
641b8efee6ea727399b94bd1fe901b9cf363e000
Author: Sylvestre Ledru sylvestre.le...@scilab-enterprises.com
Date:   Thu Jan 19 14:16:42 2012 +0100

Merge branch 'master' of git+ssh://git.debian.org/git/pkg-grass/hdf5


-- 
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. upstream/1.8.8-27-gc8c5084

2012-01-19 Thread Sylvestre Ledru
The following commit has been merged in the master branch:
commit ab78729a670b8bc2fa91c5f8161412cc1ed3984c
Author: Sylvestre Ledru sylvestre.le...@scilab-enterprises.com
Date:   Thu Jan 19 14:03:20 2012 +0100

Fix a problem causing hdf5-tools to be uninstallable with hdf5 
openmpi/mpich2

diff --git a/debian/changelog b/debian/changelog
index 2a0467c..6f0779e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ hdf5 (1.8.8-3) UNRELEASED; urgency=low
   * Update the symbol list for sparc
   * In some cases, configures were executed in parallel. Disable it.
   * hdf5-helpers collided with hdf5-tools at upgrade time (Closes: #656427)
+  * hdf5-tools could not be installed at the same time as libhdf5-openmpi-7
+or libhdf5-mpich2-7
 
  -- Sylvestre Ledru sylves...@debian.org  Thu, 19 Jan 2012 10:58:09 +0100
 
diff --git a/debian/control b/debian/control
index 721866c..6359461 100644
--- a/debian/control
+++ b/debian/control
@@ -219,7 +219,7 @@ Description: Hierarchical Data Format 5 (HDF5) - Helper 
tools
 Package: hdf5-tools
 Section: science
 Architecture: any
-Depends: libhdf5-1.8, ${misc:Depends}
+Depends: ${shlibs:Depends}, libhdf5-1.8, ${misc:Depends}
 Description: Hierarchical Data Format 5 (HDF5) - Runtime tools 
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
diff --git a/debian/control.in b/debian/control.in
index 3083e8c..c8e4d31 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -218,7 +218,7 @@ Description: Hierarchical Data Format 5 (HDF5) - Helper 
tools
 Package: hdf5-tools
 Section: science
 Architecture: any
-Depends: libhdf5-@MAJOR_VERSION@, ${misc:Depends}
+Depends: ${shlibs:Depends}, libhdf5-@MAJOR_VERSION@, ${misc:Depends}
 Description: Hierarchical Data Format 5 (HDF5) - Runtime tools 
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of

-- 
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