[Pkg-openmpi-commits] r222 - in /openmpi/trunk/debian: changelog control

[manuel at users.alioth.debian.org]

Author: manuel
Date: Tue Jan  5 14:21:03 2010
New Revision: 222

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=222
Log:
Removed conflict with pgapack

Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/control

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=222&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Tue Jan  5 14:21:03 2010
@@ -10,8 +10,9 @@
     Closes: #552397.
   * Added hppa (back) to the list of architectures. Closes: #389306.
   * Removed conflict with libopal-dev in libopenmpi-dev. Closes: #559161.
-
- -- Manuel Prinz <manuel at debian.org>  Tue, 05 Jan 2010 15:13:51 +0100
+  * Removed conflict with ancient pgapack in libopenmpi-dev.
+
+ -- Manuel Prinz <manuel at debian.org>  Tue, 05 Jan 2010 15:19:55 +0100
 
 openmpi (1.3.3-4) unstable; urgency=medium
 

Modified: openmpi/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/control?rev=222&op=diff
==============================================================================
--- openmpi/trunk/debian/control (original)
+++ openmpi/trunk/debian/control Tue Jan  5 14:21:03 2010
@@ -41,7 +41,7 @@
 Section: libdevel
 Architecture: alpha amd64 hppa i386 ia64 powerpc ppc64 sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Depends: ${shlibs:Depends}, libopenmpi1.3 (= ${binary:Version}), openmpi-common (= ${source:Version}), libibverbs-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
-Conflicts: pgapack (<= 1.0.0.1-4.2), openmpi-dev
+Conflicts: openmpi-dev
 Replaces: openmpi-dev, openmpi-bin (<= 1.2.4-0)
 Provides: openmpi-dev
 Description: high performance message passing library -- header files