[SCM] hdf5 branch, master, updated. upstream/1.8.4-patch1-40-gbf76afa

2011-08-02 Thread Sylvestre Ledru
The following commit has been merged in the master branch:
commit bf76afa4efe2f67374900eb2a1aa3730f4ee3362
Author: Sylvestre Ledru sylvestre.le...@scilab.org
Date:   Tue Aug 2 18:38:26 2011 +0200

Missing conflicts + replaces + description of the change in the changelog

diff --git a/debian/changelog b/debian/changelog
index 1f9beda..5338d38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
-hdf5 (1.8.7-2) UNRELEASED; urgency=low
+hdf5 (1.8.7-2) experimental; urgency=low
 
   [ Sylvestre Ledru ]
+  * hdf5 packages renamed to use soname versionning. Upstream looks like ready
+to support them correctly. Therefor, here is the changes:
+libhdf5-serial-1.8.7 = libhdf5-serial-7
+libhdf5-openmpi-1.8.7 = libhdf5-openmpi-7
+libhdf5-mpich2-1.8.7 = libhdf5-mpich2-7
   * Support of hurd-i386. Thanks to Pino Toscano for doing the work.
 (Closes: #627896)
   * Drop the useless lam4-dev dependency. Thanks to Pino Toscano  Adam C 
diff --git a/debian/control.in b/debian/control.in
index d3e1e1e..4183b75 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,9 +18,10 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@,
- libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, libhdf5-serial-1.8.6
+ libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, libhdf5-serial-1.8.6,
+ libhdf5-1.8.7, libhdf5-serial-1.8.7
 Provides: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@
-Replaces: libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, 
libhdf5-serial-1.8.6
+Replaces: libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, 
libhdf5-serial-1.8.6, libhdf5-1.8.7, libhdf5-serial-1.8.7
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -50,9 +51,11 @@ Priority: extra
 Architecture: @ARCHS@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@,
- libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6
+ libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6,
+ libhdf5-1.8.7, libhdf5-serial-1.8.7
 Provides: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@
-Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, 
libhdf5-openmpi-1.8.6
+Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, 
libhdf5-openmpi-1.8.6,
+ libhdf5-1.8.7, libhdf5-serial-1.8.7
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - OpenMPI 
version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -83,9 +86,11 @@ Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@, 
- libhdf5-1.8.4,  libhdf5-openmpi-1.8.4, libhdf5-1.8.6,  libhdf5-openmpi-1.8.6
+ libhdf5-1.8.4,  libhdf5-openmpi-1.8.4, libhdf5-1.8.6,  libhdf5-openmpi-1.8.6,
+ libhdf5-1.8.7, libhdf5-serial-1.8.7
 Provides: libhdf5-@SONAME@, libhdf5-@MAJOR_VERSION@
-Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, 
libhdf5-openmpi-1.8.6
+Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, 
libhdf5-openmpi-1.8.6,
+ libhdf5-1.8.7, libhdf5-serial-1.8.7
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH2 version
  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


[SCM] hdf5 branch, master, updated. upstream/1.8.4-patch1-40-gbf76afa

2011-08-02 Thread Sylvestre Ledru
The following commit has been merged in the master branch:
commit 4528e12e3d6bff9b6b378f1713917901656c9005
Author: Sylvestre Ledru sylvestre.le...@scilab.org
Date:   Tue Aug 2 18:30:40 2011 +0200

Rename package from libhdf5-serial-1.8.7 to libhdf5-serial-7 since upstream 
is now trying to manage correctly sonames and other abi/api changes

diff --git a/debian/changelog b/debian/changelog
index 3a5d863..1f9beda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,10 @@ hdf5 (1.8.7-2) UNRELEASED; urgency=low
   [ Sylvestre Ledru ]
   * Support of hurd-i386. Thanks to Pino Toscano for doing the work.
 (Closes: #627896)
-  * Drop the useless lam4-dev dependency. Thanks to Pino Toscano.
-(Closes: #604714)
+  * Drop the useless lam4-dev dependency. Thanks to Pino Toscano  Adam C 
+Powell IV (Closes: #604714)
   * armel/arm added to the archs of libhdf5-openmpi-dev (Closes: #636185)
+  * .la file are no longer shipped
 
   [ Francesco Paolo Lovergine ]
   * Ready for unstable.
diff --git a/debian/control b/debian/control
index fd01aa0..6155703 100644
--- a/debian/control
+++ b/debian/control
@@ -13,13 +13,13 @@ Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/hdf5.git
 Vcs-Git: git://git.debian.org/git/pkg-grass/hdf5.git
 
-Package: libhdf5-serial-1.8.7
+Package: libhdf5-serial-7
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libhdf5-1.8.7, libhdf5-1.8,
+Conflicts: libhdf5-7, libhdf5-1.8,
  libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, libhdf5-serial-1.8.6
-Provides: libhdf5-1.8.7, libhdf5-1.8
+Provides: libhdf5-7, libhdf5-1.8
 Replaces: libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, 
libhdf5-serial-1.8.6
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
  HDF5 is a file format and library for storing scientific data. 
@@ -32,7 +32,7 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime 
files - serial version
 Package: libhdf5-serial-dev
 Section: libdevel
 Architecture: any
-Depends: libhdf5-serial-1.8.7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, 
${misc:Depends}
+Depends: libhdf5-serial-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, 
${misc:Depends}
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -44,14 +44,14 @@ Description: Hierarchical Data Format 5 (HDF5) - 
development files - serial vers
  .
  This package contains development files for serial platforms.
 
-Package: libhdf5-openmpi-1.8.7
+Package: libhdf5-openmpi-7
 Section: libs
 Priority: extra
 Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 
hurd-i386
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libhdf5-1.8.7, libhdf5-1.8,
+Conflicts: libhdf5-7, libhdf5-1.8,
  libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6
-Provides: libhdf5-1.8.7, libhdf5-1.8
+Provides: libhdf5-7, libhdf5-1.8
 Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, 
libhdf5-openmpi-1.8.6
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - OpenMPI 
version
  HDF5 is a file format and library for storing scientific data. 
@@ -65,7 +65,7 @@ Package: libhdf5-openmpi-dev
 Section: libdevel
 Priority: extra
 Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 
hurd-i386
-Depends: libhdf5-openmpi-1.8.7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, 
libopenmpi-dev, ${misc:Depends}
+Depends: libhdf5-openmpi-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, 
libopenmpi-dev, ${misc:Depends}
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -77,14 +77,14 @@ Description: Hierarchical Data Format 5 (HDF5) - 
development files - OpenMPI ver
  .
  This package contains development files for use with OpenMPI.
 
-Package: libhdf5-mpich2-1.8.7
+Package: libhdf5-mpich2-7
 Section: libs
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libhdf5-1.8.7, libhdf5-1.8, 
+Conflicts: libhdf5-7, libhdf5-1.8, 
  libhdf5-1.8.4,  libhdf5-openmpi-1.8.4, libhdf5-1.8.6,  libhdf5-openmpi-1.8.6
-Provides: libhdf5-1.8.7, libhdf5-1.8
+Provides: libhdf5-7, libhdf5-1.8
 Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, 
libhdf5-openmpi-1.8.6
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH2 version
  HDF5 is a file format and library for storing scientific data. 
@@ -99,7 +99,7 @@ Package: libhdf5-mpich2-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-mpich2-1.8.7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, 
libmpich21.0-dev, ${misc:Depends}
+Depends: libhdf5-mpich2-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, 
libmpich21.0-dev, ${misc:Depends}
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
diff --git a/debian/control.in b/debian/control.in
index 9a88e75..d3e1e1e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,13 +13,13 @@ Homepage: