Package: openmpi1.6
Version: 1.6.4-2
Followup-For: Bug #713366
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch



In Ubuntu, the attached patch was applied to achieve the following:

  * Fix transposition of 1.3 to 3.1 that led to dangling symlinks and an
    incorrect .so for libmpi_f90.so.1 in libopenmpi1.6 (Closes: #715097)
  * Call dh_shlibdeps with -lfoo to not break fakeroot (Closes: #713366)

Both parts of this patch should be fairly self-explanatory, I hope, and
it closes two of the three open bugs against openmpi1.6.  Cheers.

... Adam

-- System Information:
Debian Release: wheezy/sid
  APT prefers saucy-updates
  APT policy: (500, 'saucy-updates'), (500, 'saucy-security'), (500, 'saucy')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.11.0-8-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru openmpi1.6-1.6.4/debian/changelog openmpi1.6-1.6.4/debian/changelog
diff -Nru openmpi1.6-1.6.4/debian/libopenmpi1.6-dev.links openmpi1.6-1.6.4/debian/libopenmpi1.6-dev.links
--- openmpi1.6-1.6.4/debian/libopenmpi1.6-dev.links	2012-11-07 08:09:54.000000000 -0700
+++ openmpi1.6-1.6.4/debian/libopenmpi1.6-dev.links	2013-09-30 16:39:34.000000000 -0600
@@ -10,7 +10,7 @@
 usr/lib/libmca_common_sm.so.3	usr/lib/libmca_common_sm.so
 usr/lib/libmpi_cxx.so.1		usr/lib/libmpi_cxx.so
 usr/lib/libmpi_f77.so.1		usr/lib/libmpi_f77.so
-usr/lib/libmpi_f90.so.3		usr/lib/libmpi_f90.so
+usr/lib/libmpi_f90.so.1		usr/lib/libmpi_f90.so
 usr/lib/libompitrace.so.0	usr/lib/libompitrace.so
 usr/lib/libopen-pal.so.4	usr/lib/libopen-pal.so
 usr/lib/libopen-rte.so.4	usr/lib/libopen-rte.so
diff -Nru openmpi1.6-1.6.4/debian/libopenmpi1.6.links openmpi1.6-1.6.4/debian/libopenmpi1.6.links
--- openmpi1.6-1.6.4/debian/libopenmpi1.6.links	2013-04-11 08:23:00.000000000 -0600
+++ openmpi1.6-1.6.4/debian/libopenmpi1.6.links	2013-09-30 16:39:16.000000000 -0600
@@ -2,7 +2,7 @@
 usr/lib/openmpi/lib/libmca_common_sm.so.3.0.0   usr/lib/libmca_common_sm.so.3.0.0
 usr/lib/openmpi/lib/libmpi_cxx.so.1.0.1         usr/lib/libmpi_cxx.so.1.0.1
 usr/lib/openmpi/lib/libmpi_f77.so.1.0.6         usr/lib/libmpi_f77.so.1.0.6
-usr/lib/openmpi/lib/libmpi_f90.so.3.1.0         usr/lib/libmpi_f90.so.3.1.0
+usr/lib/openmpi/lib/libmpi_f90.so.1.3.0         usr/lib/libmpi_f90.so.1.3.0
 usr/lib/openmpi/lib/libmpi.so.1.0.7             usr/lib/libmpi.so.1.0.7
 usr/lib/openmpi/lib/libompitrace.so.0.0.0	usr/lib/libompitrace.so.0.0.0
 usr/lib/openmpi/lib/libopen-pal.so.4.0.4        usr/lib/libopen-pal.so.4.0.4
@@ -11,7 +11,7 @@
 usr/lib/libmca_common_sm.so.3.0.0               usr/lib/libmca_common_sm.so.3
 usr/lib/libmpi_cxx.so.1.0.1                     usr/lib/libmpi_cxx.so.1
 usr/lib/libmpi_f77.so.1.0.6                     usr/lib/libmpi_f77.so.1
-usr/lib/libmpi_f90.so.3.1.0                     usr/lib/libmpi_f90.so.3
+usr/lib/libmpi_f90.so.1.3.0                     usr/lib/libmpi_f90.so.1
 usr/lib/libmpi.so.1.0.7                         usr/lib/libmpi.so.1
 usr/lib/libompitrace.so.0.0.0			usr/lib/libompitrace.so.0
 usr/lib/libopen-pal.so.4.0.4                    usr/lib/libopen-pal.so.4
diff -Nru openmpi1.6-1.6.4/debian/rules openmpi1.6-1.6.4/debian/rules
--- openmpi1.6-1.6.4/debian/rules	2012-11-30 10:30:24.000000000 -0700
+++ openmpi1.6-1.6.4/debian/rules	2013-09-30 16:27:50.000000000 -0600
@@ -92,7 +92,7 @@
 	dh_installdocs --all AUTHORS NEWS README
 
 override_dh_shlibdeps:
-	LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib/openmpi/lib" dh_shlibdeps  -- --ignore-missing-info
+	dh_shlibdeps -l$(CURDIR)/debian/tmp/usr/lib/openmpi/lib -- --ignore-missing-info
 
 override_dh_strip:
 	dh_strip --dbg-package=libopenmpi1.6-dbg

Reply via email to