[Pkg-openmpi-commits] r370 - in /openmpi/trunk/debian: changelog libopenmpi-dev.links

[mckinstry at users.alioth.debian.org]

Author: mckinstry
Date: Sun Feb 14 16:20:16 2016
New Revision: 370

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=370
Log:
Don't ship opal.pc link that conflicts with libopal-dev. Closes: #814515

Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/libopenmpi-dev.links

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=370&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog	(original)
+++ openmpi/trunk/debian/changelog	Sun Feb 14 16:20:16 2016
@@ -1,3 +1,9 @@
+openmpi (1.10.2-8) UNRELEASED; urgency=medium
+
+  * Don't ship opal.pc link that conflicts with libopal-dev. Closes: #814515
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Wed, 10 Feb 2016 18:54:36 +0000
+
 openmpi (1.10.2-7) unstable; urgency=medium
 
   * x32 support from Adam Borowski. Closes: #814332.

Modified: openmpi/trunk/debian/libopenmpi-dev.links
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi-dev.links?rev=370&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi-dev.links	(original)
+++ openmpi/trunk/debian/libopenmpi-dev.links	Sun Feb 14 16:20:16 2016
@@ -24,5 +24,6 @@
 usr/lib/openmpi/lib/pkgconfig/orte.pc		usr/lib/pkgconfig/orte.pc
 usr/lib/openmpi/lib/pkgconfig/ompi.pc		usr/lib/pkgconfig/ompi.pc
 usr/lib/openmpi/lib/pkgconfig/ompi-c.pc		usr/lib/pkgconfig/ompi-c.pc
-usr/lib/openmpi/lib/pkgconfig/opal.pc		usr/lib/pkgconfig/opal.pc
+# opal.pc bug #814515: opal.pc conflicts with libopal-dev
+#usr/lib/openmpi/lib/pkgconfig/opal.pc		usr/lib/pkgconfig/opal.pc
 usr/lib/openmpi/lib/pkgconfig/ompi-cxx.pc	usr/lib/pkgconfig/ompi-cxx.pc