[DebianGIS-dev] r2680 - packages/hdf5/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2010-01-25 16:44:07 +0000 (Mon, 25 Jan 2010)
New Revision: 2680

Modified:
   packages/hdf5/trunk/debian/control
   packages/hdf5/trunk/debian/control.in
Log:
One more virtual conflict.


Modified: packages/hdf5/trunk/debian/control
===================================================================
--- packages/hdf5/trunk/debian/control	2010-01-25 16:40:57 UTC (rev 2679)
+++ packages/hdf5/trunk/debian/control	2010-01-25 16:44:07 UTC (rev 2680)
@@ -16,7 +16,7 @@
 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 @@
 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 @@
 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 @@
 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

Modified: packages/hdf5/trunk/debian/control.in
===================================================================
--- packages/hdf5/trunk/debian/control.in	2010-01-25 16:40:57 UTC (rev 2679)
+++ packages/hdf5/trunk/debian/control.in	2010-01-25 16:44:07 UTC (rev 2680)
@@ -16,7 +16,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@, libhdf5-serial-1.8.3
+Conflicts: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@, libhdf5-1.8.3
 Provides: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@
 Replaces: libhdf5-1.8.3
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
@@ -47,7 +47,7 @@
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@, libhdf5-lam-1.8.3
+Conflicts: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@, libhdf5-1.8.3
 Provides: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@
 Replaces: libhdf5-1.8.3
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - LAM version
@@ -79,7 +79,7 @@
 Priority: extra
 Architecture: @ARCHS@
 Depends: ${shlibs:Depends}
-Conflicts: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@, libhdf5-openmpi-1.8.3
+Conflicts: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@, libhdf5-1.8.3
 Provides: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@
 Replaces: libhdf5-1.8.3
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - OpenMPI version
@@ -111,7 +111,7 @@
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@, libhdf5-mpich-1.8.3
+Conflicts: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@, libhdf5-1.8.3
 Provides: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@
 Replaces: libhdf5-1.8.3
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH version