The following commit has been merged in the upstream branch:
commit 5d4e93bfc6b345217958f0bc2412e46048eaa888
Author: Francesco Paolo Lovergine <fran...@debian.org>
Date: Mon Jan 25 16:44:07 2010 +0000
One more virtual conflict.
diff --git a/debian/control b/debian/control
index 35b85b2..23182c0 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Package: libhdf5-serial-1.8.4
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-serial-1.8.3
+Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-1.8.3
Provides: libhdf5-1.8.4, libhdf5-1.8
Replaces: libhdf5-1.8.3
Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
@@ -47,7 +47,7 @@ Section: libs
Priority: extra
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-lam-1.8.3
+Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-1.8.3
Provides: libhdf5-1.8.4, libhdf5-1.8
Replaces: libhdf5-1.8.3
Description: Hierarchical Data Format 5 (HDF5) - runtime files - LAM version
@@ -79,7 +79,7 @@ Section: libs
Priority: extra
Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}
-Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-openmpi-1.8.3
+Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-1.8.3
Provides: libhdf5-1.8.4, libhdf5-1.8
Replaces: libhdf5-1.8.3
Description: Hierarchical Data Format 5 (HDF5) - runtime files - OpenMPI
version
@@ -111,7 +111,7 @@ Section: libs
Priority: extra
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-mpich-1.8.3
+Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-1.8.3
Provides: libhdf5-1.8.4, libhdf5-1.8
Replaces: libhdf5-1.8.3
Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH version
diff --git a/debian/control.in b/debian/control.in
index 72fc64a..7750978 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -16,7 +16,7 @@ Package: libhdf5-serial-@VERSION@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@, libhdf5-serial-1.8.3
+Conflicts: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@, libhdf5-1.8.3
Provides: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@
Replaces: libhdf5-1.8.3
Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
@@ -47,7 +47,7 @@ Section: libs
Priority: extra
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@, libhdf5-lam-1.8.3
+Conflicts: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@, libhdf5-1.8.3
Provides: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@
Replaces: libhdf5-1.8.3
Description: Hierarchical Data Format 5 (HDF5) - runtime files - LAM version
@@ -79,7 +79,7 @@ Section: libs
Priority: extra
Architecture: @ARCHS@
Depends: ${shlibs:Depends}
-Conflicts: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@, libhdf5-openmpi-1.8.3
+Conflicts: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@, libhdf5-1.8.3
Provides: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@
Replaces: libhdf5-1.8.3
Description: Hierarchical Data Format 5 (HDF5) - runtime files - OpenMPI
version
@@ -111,7 +111,7 @@ Section: libs
Priority: extra
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@, libhdf5-mpich-1.8.3
+Conflicts: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@, libhdf5-1.8.3
Provides: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@
Replaces: libhdf5-1.8.3
Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH version
--
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
