[Pkg-openmpi-commits] r307 - /openmpi/trunk/debian/

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Fri Jun 8 08:56:41 UTC 2012 

Author: sylvestre
Date: Fri Jun  8 08:56:40 2012
New Revision: 307

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=307
Log:
Package of version 1.6

Added:
    openmpi/trunk/debian/libopenmpi1.6.install
      - copied, changed from r306, openmpi/trunk/debian/libopenmpi2.install
    openmpi/trunk/debian/libopenmpi1.6.install.armel
      - copied unchanged from r306, openmpi/trunk/debian/libopenmpi2.install.armel
    openmpi/trunk/debian/libopenmpi1.6.install.armhf
      - copied unchanged from r306, openmpi/trunk/debian/libopenmpi2.install.armhf
    openmpi/trunk/debian/libopenmpi1.6.links
      - copied, changed from r306, openmpi/trunk/debian/libopenmpi2.links
Removed:
    openmpi/trunk/debian/libopenmpi-2.install
    openmpi/trunk/debian/libopenmpi-2.links
    openmpi/trunk/debian/libopenmpi2.install
    openmpi/trunk/debian/libopenmpi2.install.armel
    openmpi/trunk/debian/libopenmpi2.install.armhf
    openmpi/trunk/debian/libopenmpi2.links
Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/control
    openmpi/trunk/debian/libopenmpi1.6-dev.links
    openmpi/trunk/debian/rules

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=307&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Fri Jun  8 08:56:40 2012
@@ -1,10 +1,10 @@
-openmpi1.6 (1.6-1~exp1) experimental; urgency=low
+openmpi1.6 (1.6-1) unstable; urgency=low
 
   * Sync from Ubuntu (which has been uploaded with a new name).
   * Rename openmpi 1.5 => 1.6
   * Standards-Version updated to version 3.9.3
 
- -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 18 May 2012 17:09:12 +0200
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 06 Jun 2012 17:45:07 +0200
 
 openmpi1.5 (1.5.4-0ubuntu1) precise; urgency=low
 

Modified: openmpi/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/control?rev=307&op=diff
==============================================================================
--- openmpi/trunk/debian/control (original)
+++ openmpi/trunk/debian/control Fri Jun  8 08:56:40 2012
@@ -40,7 +40,7 @@
 Package: libopenmpi1.6-dev
 Section: libdevel
 Architecture: alpha amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopenmpi1.6-2 (= ${binary:Version}), openmpi1.6-common (= ${source:Version}), libibverbs-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenmpi1.6 (= ${binary:Version}), openmpi1.6-common (= ${source:Version}), libibverbs-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
 Conflicts: openmpi-dev, libopenmpi-dev, openmpi-bin (<= 1.2.4-0)
 Description: high performance message passing library -- header files
  Open MPI is a project combining technologies and resources from several other
@@ -52,7 +52,7 @@
  This package contains the header files and compiler wrappers which are needed
  to compile and link programs against libopenmpi.
 
-Package: libopenmpi1.6-2
+Package: libopenmpi1.6
 Section: libs
 Architecture: alpha amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -97,7 +97,7 @@
 Package: libopenmpi1.6-dbg
 Section: debug
 Architecture: alpha amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-Depends: ${misc:Depends}, openmpi1.6-bin (= ${binary:Version}), libopenmpi1.6-2 (= ${binary:Version})
+Depends: ${misc:Depends}, openmpi1.6-bin (= ${binary:Version}), libopenmpi1.6 (= ${binary:Version})
 Conflicts: openmpi-dbg, libopenmpi-dbg
 Description: high performance message passing library -- debug library
  Open MPI is a project combining technologies and resources from several other
@@ -110,7 +110,7 @@
 
 Package: openmpi1.6-checkpoint
 Architecture: amd64 armel armhf i386 powerpc
-Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi1.6-bin (= ${binary:Version}), blcr-util, libopenmpi1.6-2 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi1.6-bin (= ${binary:Version}), blcr-util, libopenmpi1.6 (= ${binary:Version})
 Conflicts: openmpi-checkpoint
 Description: high performance message passing library -- checkpoint support
  Open MPI is a project combining technologies and resources from several other

Modified: openmpi/trunk/debian/libopenmpi1.6-dev.links
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi1.6-dev.links?rev=307&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi1.6-dev.links (original)
+++ openmpi/trunk/debian/libopenmpi1.6-dev.links Fri Jun  8 08:56:40 2012
@@ -7,12 +7,12 @@
 usr/share/man/man1/opal_wrapper.1	usr/share/man/man1/ortec++.1
 usr/share/man/man1/opal_wrapper.1	usr/share/man/man1/ortecc.1
 ## SONAME symlinks
-usr/lib/libmca_common_sm.so.2	usr/lib/libmca_common_sm.so
+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.1		usr/lib/libmpi_f90.so
 usr/lib/libompitrace.so.0	usr/lib/libompitrace.so
-usr/lib/libopen-pal.so.3	usr/lib/libopen-pal.so
-usr/lib/libopen-rte.so.3	usr/lib/libopen-rte.so
+usr/lib/libopen-pal.so.4	usr/lib/libopen-pal.so
+usr/lib/libopen-rte.so.4	usr/lib/libopen-rte.so
 ## Convenience link for header files, see bug #493875
 usr/lib/openmpi/include/	usr/include/openmpi

Copied: openmpi/trunk/debian/libopenmpi1.6.install (from r306, openmpi/trunk/debian/libopenmpi2.install)
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi1.6.install?rev=307&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi2.install (original)
+++ openmpi/trunk/debian/libopenmpi1.6.install Fri Jun  8 08:56:40 2012
@@ -1,12 +1,12 @@
 ## Shared libraries
-usr/lib/openmpi/lib/libmca_common_sm.so.2.0.0
+usr/lib/openmpi/lib/libmca_common_sm.so.3.0.0
 usr/lib/openmpi/lib/libmpi_cxx.so.1.0.1
-usr/lib/openmpi/lib/libmpi_f77.so.1.0.2
+usr/lib/openmpi/lib/libmpi_f77.so.1.0.3
 usr/lib/openmpi/lib/libmpi_f90.so.1.1.0
-usr/lib/openmpi/lib/libmpi.so.1.0.2
+usr/lib/openmpi/lib/libmpi.so.1.0.3
 usr/lib/openmpi/lib/libompitrace.so.0.0.0
-usr/lib/openmpi/lib/libopen-pal.so.3.0.0
-usr/lib/openmpi/lib/libopen-rte.so.3.0.0
+usr/lib/openmpi/lib/libopen-pal.so.4.0.0
+usr/lib/openmpi/lib/libopen-rte.so.4.0.0
 ## Plugins
 usr/lib/openmpi/lib/openmpi/libompi_dbg_msgq.so
 usr/lib/openmpi/lib/openmpi/mca_allocator_basic.so
@@ -26,6 +26,10 @@
 usr/lib/openmpi/lib/openmpi/mca_coll_sm.so
 usr/lib/openmpi/lib/openmpi/mca_coll_sync.so
 usr/lib/openmpi/lib/openmpi/mca_coll_tuned.so
+usr/lib/openmpi/lib/openmpi/mca_crcp_bkmrk.so
+usr/lib/openmpi/lib/openmpi/mca_crs_blcr.so
+usr/lib/openmpi/lib/openmpi/mca_crs_none.so
+usr/lib/openmpi/lib/openmpi/mca_crs_self.so
 usr/lib/openmpi/lib/openmpi/mca_dpm_orte.so
 usr/lib/openmpi/lib/openmpi/mca_errmgr_default.so
 usr/lib/openmpi/lib/openmpi/mca_ess_env.so
@@ -45,7 +49,7 @@
 usr/lib/openmpi/lib/openmpi/mca_iof_tool.so
 usr/lib/openmpi/lib/openmpi/mca_io_romio.so
 usr/lib/openmpi/lib/openmpi/mca_maffinity_first_use.so
-usr/lib/openmpi/lib/openmpi/mca_maffinity_libnuma.so
+usr/lib/openmpi/lib/openmpi/mca_maffinity_hwloc.so
 usr/lib/openmpi/lib/openmpi/mca_mpool_fake.so
 usr/lib/openmpi/lib/openmpi/mca_mpool_rdma.so
 usr/lib/openmpi/lib/openmpi/mca_mpool_sm.so
@@ -56,7 +60,6 @@
 usr/lib/openmpi/lib/openmpi/mca_osc_pt2pt.so
 usr/lib/openmpi/lib/openmpi/mca_osc_rdma.so
 usr/lib/openmpi/lib/openmpi/mca_paffinity_hwloc.so
-usr/lib/openmpi/lib/openmpi/mca_plm_rshd.so
 usr/lib/openmpi/lib/openmpi/mca_plm_rsh.so
 usr/lib/openmpi/lib/openmpi/mca_plm_slurm.so
 usr/lib/openmpi/lib/openmpi/mca_plm_tm.so
@@ -70,6 +73,7 @@
 usr/lib/openmpi/lib/openmpi/mca_pubsub_orte.so
 usr/lib/openmpi/lib/openmpi/mca_ras_cm.so
 usr/lib/openmpi/lib/openmpi/mca_ras_gridengine.so
+usr/lib/openmpi/lib/openmpi/mca_ras_loadleveler.so
 usr/lib/openmpi/lib/openmpi/mca_ras_slurm.so
 usr/lib/openmpi/lib/openmpi/mca_ras_tm.so
 usr/lib/openmpi/lib/openmpi/mca_rcache_vma.so
@@ -89,6 +93,9 @@
 usr/lib/openmpi/lib/openmpi/mca_routed_linear.so
 usr/lib/openmpi/lib/openmpi/mca_routed_radix.so
 usr/lib/openmpi/lib/openmpi/mca_routed_slave.so
+usr/lib/openmpi/lib/openmpi/mca_shmem_mmap.so
+usr/lib/openmpi/lib/openmpi/mca_shmem_posix.so
+usr/lib/openmpi/lib/openmpi/mca_shmem_sysv.so
 usr/lib/openmpi/lib/openmpi/mca_snapc_full.so
 usr/lib/openmpi/lib/openmpi/mca_sysinfo_linux.so
 usr/lib/openmpi/lib/openmpi/mca_topo_unity.so

Copied: openmpi/trunk/debian/libopenmpi1.6.links (from r306, openmpi/trunk/debian/libopenmpi2.links)
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi1.6.links?rev=307&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi2.links (original)
+++ openmpi/trunk/debian/libopenmpi1.6.links Fri Jun  8 08:56:40 2012
@@ -1,18 +1,18 @@
 # Compatibility links to /usr/bin
-usr/lib/openmpi/lib/libmca_common_sm.so.2.0.0   usr/lib/libmca_common_sm.so.2.0.0
+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.2         usr/lib/libmpi_f77.so.1.0.2
+usr/lib/openmpi/lib/libmpi_f77.so.1.0.3         usr/lib/libmpi_f77.so.1.0.3
 usr/lib/openmpi/lib/libmpi_f90.so.1.1.0         usr/lib/libmpi_f90.so.1.1.0
-usr/lib/openmpi/lib/libmpi.so.1.0.2             usr/lib/libmpi.so.1.0.2
+usr/lib/openmpi/lib/libmpi.so.1.0.3             usr/lib/libmpi.so.1.0.3
 usr/lib/openmpi/lib/libompitrace.so.0.0.0	usr/lib/libompitrace.so.0.0.0
-usr/lib/openmpi/lib/libopen-pal.so.3.0.0        usr/lib/libopen-pal.so.3.0.0
-usr/lib/openmpi/lib/libopen-rte.so.3.0.0        usr/lib/libopen-rte.so.3.0.0
+usr/lib/openmpi/lib/libopen-pal.so.4.0.0        usr/lib/libopen-pal.so.4.0.0
+usr/lib/openmpi/lib/libopen-rte.so.4.0.0        usr/lib/libopen-rte.so.4.0.0
 # SONAME symlinks
-usr/lib/libmca_common_sm.so.2.0.0               usr/lib/libmca_common_sm.so.2
+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.2                     usr/lib/libmpi_f77.so.1
+usr/lib/libmpi_f77.so.1.0.3                     usr/lib/libmpi_f77.so.1
 usr/lib/libmpi_f90.so.1.1.0                     usr/lib/libmpi_f90.so.1
-usr/lib/libmpi.so.1.0.2                         usr/lib/libmpi.so.1
+usr/lib/libmpi.so.1.0.3                         usr/lib/libmpi.so.1
 usr/lib/libompitrace.so.0.0.0			usr/lib/libompitrace.so.0
-usr/lib/libopen-pal.so.3.0.0                    usr/lib/libopen-pal.so.3
-usr/lib/libopen-rte.so.3.0.0                    usr/lib/libopen-rte.so.3
+usr/lib/libopen-pal.so.4.0.0                    usr/lib/libopen-pal.so.4
+usr/lib/libopen-rte.so.4.0.0                    usr/lib/libopen-rte.so.4

Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=307&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Fri Jun  8 08:56:40 2012
@@ -49,14 +49,20 @@
 # Rename the compiler and startup wrappers.
 ##	for f in mpic++ mpicc mpiCC mpicxx mpiexec mpif77 mpif90 mpirun opalc++ opalcc ortec++ ortecc orteCC ; do \ ##
 	for f in mpic++ mpicc mpiCC mpicxx mpiexec mpif77 mpif90 mpirun ; do \
-		mv debian/tmp/usr/bin/$${f} debian/tmp/usr/bin/$${f}.openmpi ; \
+		if test -f debian/tmp/usr/bin/$${f}; then \
+			mv debian/tmp/usr/bin/$${f} debian/tmp/usr/bin/$${f}.openmpi ; \
+		fi; \
 	done
 # Rename the compiler wrapper man pages.
 	for f in mpic++ mpicc mpicxx mpiexec mpif77 mpif90 mpirun ; do \
-		mv debian/tmp/usr/share/man/man1/$${f}.1 debian/tmp/usr/share/man/man1/$${f}.openmpi.1 ; \
+		if test -f debian/tmp/usr/share/man/man1/$${f}.1; then \
+			mv debian/tmp/usr/share/man/man1/$${f}.1 debian/tmp/usr/share/man/man1/$${f}.openmpi.1 ; \
+		fi; \
 	done
 # Rename orte-bootproxy.sh to orte-bootproxy
-	mv debian/tmp/usr/bin/orte-bootproxy.sh debian/tmp/usr/bin/orte-bootproxy
+	if test -f debian/tmp/usr/bin/orte-bootproxy.sh; then \
+		mv debian/tmp/usr/bin/orte-bootproxy.sh debian/tmp/usr/bin/orte-bootproxy; \
+	fi
 # Remove dangling symlink(s)
 	rm -f debian/tmp/usr/share/man/man1/mpiCC.1
 	rm -f debian/tmp/usr/share/man/man1/orteCC.1
@@ -73,8 +79,7 @@
 	dh_installdocs --all AUTHORS NEWS README
 
 #override_dh_shlibdeps:
-#	export LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib/openmpi/lib"
-#	dh_shlibdeps -Llibopenmpi1.6-2
+#	LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib/openmpi/lib" dh_shlibdeps  -- --ignore-missing-info
 
 override_dh_strip:
 	dh_strip --dbg-package=libopenmpi1.6-dbg

More information about the Pkg-openmpi-commits mailing list