[Pkg-openmpi-commits] r305 - in /openmpi/trunk/debian: ./ patches/

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Fri May 18 16:32:47 UTC 2012 

Author: sylvestre
Date: Fri May 18 16:32:46 2012
New Revision: 305

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=305
Log:
* 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
* Fork new openmpi1.5 package for co-existence with openmpi 1.4
  (LP: #889644).
* Move required plugins from openmpi-checkpoint to libopenmpi1.5-2:
  - d/control: openmpi-checkpoint now depends on libopenmpi1-5-2
  - d/libopenmpi1.5-2.install*: switch to wildcard plugin install, drop
    specific install files for armel and armhf.
  - d/openmpi-checkpoint.install: Don't install any plugins.
   preceeded by a new check that calls stat re-producing the original bug.

Added:
    openmpi/trunk/debian/libopenmpi1.6-dev.README.Debian
      - copied unchanged from r304, openmpi/trunk/debian/libopenmpi-dev.README.Debian
    openmpi/trunk/debian/libopenmpi1.6-dev.install
      - copied unchanged from r304, openmpi/trunk/debian/libopenmpi-dev.install
    openmpi/trunk/debian/libopenmpi1.6-dev.links
      - copied unchanged from r304, openmpi/trunk/debian/libopenmpi-dev.links
    openmpi/trunk/debian/libopenmpi1.6-dev.postinst
      - copied unchanged from r304, openmpi/trunk/debian/libopenmpi-dev.postinst
    openmpi/trunk/debian/libopenmpi1.6-dev.preinst
      - copied unchanged from r304, openmpi/trunk/debian/libopenmpi-dev.preinst
    openmpi/trunk/debian/libopenmpi1.6-dev.prerm
      - copied unchanged from r304, openmpi/trunk/debian/libopenmpi-dev.prerm
    openmpi/trunk/debian/openmpi1.6-bin.README.Debian
      - copied unchanged from r304, openmpi/trunk/debian/openmpi-bin.README.Debian
    openmpi/trunk/debian/openmpi1.6-bin.install
      - copied unchanged from r304, openmpi/trunk/debian/openmpi-bin.install
    openmpi/trunk/debian/openmpi1.6-bin.links
      - copied unchanged from r304, openmpi/trunk/debian/openmpi-bin.links
    openmpi/trunk/debian/openmpi1.6-bin.manpages
      - copied unchanged from r304, openmpi/trunk/debian/openmpi-bin.manpages
    openmpi/trunk/debian/openmpi1.6-bin.postinst
      - copied unchanged from r304, openmpi/trunk/debian/openmpi-bin.postinst
    openmpi/trunk/debian/openmpi1.6-bin.prerm
      - copied unchanged from r304, openmpi/trunk/debian/openmpi-bin.prerm
    openmpi/trunk/debian/openmpi1.6-checkpoint.install
      - copied, changed from r304, openmpi/trunk/debian/openmpi-checkpoint.install
    openmpi/trunk/debian/openmpi1.6-checkpoint.links
      - copied unchanged from r304, openmpi/trunk/debian/openmpi-checkpoint.links
    openmpi/trunk/debian/openmpi1.6-checkpoint.manpages
      - copied unchanged from r304, openmpi/trunk/debian/openmpi-checkpoint.manpages
    openmpi/trunk/debian/openmpi1.6-common.install
      - copied unchanged from r304, openmpi/trunk/debian/openmpi-common.install
    openmpi/trunk/debian/openmpi1.6-common.links
      - copied unchanged from r304, openmpi/trunk/debian/openmpi-common.links
    openmpi/trunk/debian/openmpi1.6-doc.install
      - copied unchanged from r304, openmpi/trunk/debian/openmpi-doc.install
    openmpi/trunk/debian/openmpi1.6-doc.manpages
      - copied unchanged from r304, openmpi/trunk/debian/openmpi-doc.manpages
Removed:
    openmpi/trunk/debian/libopenmpi-dev.README.Debian
    openmpi/trunk/debian/libopenmpi-dev.install
    openmpi/trunk/debian/libopenmpi-dev.links
    openmpi/trunk/debian/libopenmpi-dev.postinst
    openmpi/trunk/debian/libopenmpi-dev.preinst
    openmpi/trunk/debian/libopenmpi-dev.prerm
    openmpi/trunk/debian/openmpi-bin.README.Debian
    openmpi/trunk/debian/openmpi-bin.install
    openmpi/trunk/debian/openmpi-bin.links
    openmpi/trunk/debian/openmpi-bin.manpages
    openmpi/trunk/debian/openmpi-bin.postinst
    openmpi/trunk/debian/openmpi-bin.prerm
    openmpi/trunk/debian/openmpi-checkpoint.install
    openmpi/trunk/debian/openmpi-checkpoint.links
    openmpi/trunk/debian/openmpi-checkpoint.manpages
    openmpi/trunk/debian/openmpi-common.install
    openmpi/trunk/debian/openmpi-common.links
    openmpi/trunk/debian/openmpi-doc.install
    openmpi/trunk/debian/openmpi-doc.manpages
Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/control
    openmpi/trunk/debian/patches/series
    openmpi/trunk/debian/rules
    openmpi/trunk/debian/watch

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=305&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Fri May 18 16:32:46 2012
@@ -1,3 +1,24 @@
+openmpi1.6 (1.6-1~exp1) experimental; 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
+
+openmpi1.5 (1.5.4-0ubuntu1) precise; urgency=low
+
+  [ Robie Basak ]
+  * Fork new openmpi1.5 package for co-existence with openmpi 1.4
+    (LP: #889644).
+  * Move required plugins from openmpi-checkpoint to libopenmpi1.5-2:
+    - d/control: openmpi-checkpoint now depends on libopenmpi1-5-2
+    - d/libopenmpi1.5-2.install*: switch to wildcard plugin install, drop
+      specific install files for armel and armhf.
+    - d/openmpi-checkpoint.install: Don't install any plugins.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 18 May 2012 17:06:10 +0200
+
 openmpi (1.5.4-2~exp2) experimental; urgency=low
 
   [ Manuel Prinz ]
@@ -6,7 +27,7 @@
   
   [ James Pages ]
   * The checks for FAKEROOT introduced to fix this bug upstream are
-     preceded by a new check that calls stat re-producing the original bug.
+     preceeded by a new check that calls stat re-producing the original bug.
      Re-ordering the checks to ensure that FAKEROOT is detected first
      appears to resolve this issue.
      Closes: #658600.

Modified: openmpi/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/control?rev=305&op=diff
==============================================================================
--- openmpi/trunk/debian/control (original)
+++ openmpi/trunk/debian/control Fri May 18 16:32:46 2012
@@ -1,18 +1,19 @@
-Source: openmpi
+Source: openmpi1.6
 Section: net
 Priority: extra
 Homepage: http://www.open-mpi.org/
 Maintainer: Debian Open MPI Maintainers <pkg-openmpi-maintainers at lists.alioth.debian.org>
 Uploaders: Manuel Prinz <manuel at debian.org>, Sylvestre Ledru <sylvestre at debian.org>
 Build-Depends: debhelper (>= 8.0.0~), libibverbs-dev (>= 1.1.1), gfortran, gcc (>= 4:4.1.2), chrpath, quilt, libcr-dev [amd64 armel armhf i386 powerpc], libnuma-dev [amd64 i386 ia64 mips mipsel powerpc], autoconf (>= 2.59), automake1.10, libtool, libltdl-dev, libhwloc-dev, libtorque2-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-openmpi/openmpi/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/
 
-Package: openmpi-bin
+Package: openmpi1.6-bin
 Architecture: alpha amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-common (= ${source:Version})
-Suggests: gfortran, openmpi-checkpoint [amd64 armel armhf i386 powerpc]
+Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi1.6-common (= ${source:Version})
+Conflicts: openmpi-bin
+Suggests: gfortran, openmpi1.6-checkpoint [amd64 armel armhf i386 powerpc]
 Description: high performance message passing library -- binaries
  Open MPI is a project combining technologies and resources from several other
  projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in order to build the best
@@ -36,13 +37,11 @@
  .
  This package contains the Open MPI utility programs.
 
-Package: libopenmpi-dev
+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}, libopenmpi2 (= ${binary:Version}), openmpi-common (= ${source:Version}), libibverbs-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
-Conflicts: openmpi-dev
-Replaces: openmpi-dev, openmpi-bin (<= 1.2.4-0)
-Provides: openmpi-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenmpi1.6-2 (= ${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
  projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in order to build the best
@@ -53,13 +52,11 @@
  This package contains the header files and compiler wrappers which are needed
  to compile and link programs against libopenmpi.
 
-Package: libopenmpi2
+Package: libopenmpi1.6-2
 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}
-Conflicts: openmpi-libs0, libopenmpi1
-Replaces: openmpi-libs0, libopenmpi1
-Provides: openmpi-libs0
+Conflicts: openmpi-libs0, libopenmpi1, libopenmpi1.3, libopenmpi2
 Description: high performance message passing library -- shared library
  Open MPI is a project combining technologies and resources from several other
  projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in order to build the best
@@ -69,9 +66,10 @@
  .
  This package contains the Open MPI shared libraries.
 
-Package: openmpi-common
+Package: openmpi1.6-common
 Architecture: all
 Depends: ${misc:Depends}
+Conflicts: openmpi-common
 Description: high performance message passing library -- common files
  Open MPI is a project combining technologies and resources from several other
  projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in order to build the best
@@ -81,13 +79,11 @@
  .
  This package contains platform independent files for Open MPI.
 
-Package: openmpi-doc
+Package: openmpi1.6-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: mpi-doc, lam-mpidoc, lam4-dev, openmpi-mpidoc
-Replaces: openmpi-mpidoc
-Provides: openmpi-mpidoc
+Conflicts: mpi-doc, lam-mpidoc, lam4-dev, openmpi-mpidoc, openmpi-doc, openmpi-checkpoint (<< 1.6.4-1)
 Description: high performance message passing library -- man pages
  Open MPI is a project combining technologies and resources from several other
  projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in order to build the best
@@ -98,13 +94,11 @@
  This package contains man pages describing the Message Passing Interface
  standard.
 
-Package: libopenmpi-dbg
+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}, openmpi-bin (= ${binary:Version}), libopenmpi2 (= ${binary:Version})
-Conflicts: openmpi-dbg
-Replaces: openmpi-dbg
-Provides: openmpi-dbg
+Depends: ${misc:Depends}, openmpi1.6-bin (= ${binary:Version}), libopenmpi1.6-2 (= ${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
  projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in order to build the best
@@ -114,9 +108,10 @@
  .
  This package contains debugging symbols for Open MPI.
 
-Package: openmpi-checkpoint
+Package: openmpi1.6-checkpoint
 Architecture: amd64 armel armhf i386 powerpc
-Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-bin (= ${binary:Version}), blcr-util
+Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi1.6-bin (= ${binary:Version}), blcr-util, libopenmpi1.6-2 (= ${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
  projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in order to build the best

Copied: openmpi/trunk/debian/openmpi1.6-checkpoint.install (from r304, openmpi/trunk/debian/openmpi-checkpoint.install)
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/openmpi1.6-checkpoint.install?rev=305&op=diff
==============================================================================
--- openmpi/trunk/debian/openmpi-checkpoint.install (original)
+++ openmpi/trunk/debian/openmpi1.6-checkpoint.install Fri May 18 16:32:46 2012
@@ -5,8 +5,3 @@
 usr/bin/opal-restart
 usr/bin/orte-checkpoint
 usr/bin/orte-restart
-## BLCR plugin
-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

Modified: openmpi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/series?rev=305&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/series (original)
+++ openmpi/trunk/debian/patches/series Fri May 18 16:32:46 2012
@@ -5,6 +5,6 @@
 #arm_support
 # Link fix is obsolete, since we do not ship .la files anymore
 #openmpi-link-fix
-configure_arm_fix.patch
+#configure_arm_fix.patch
 # 658600: Regression of bug 531522
-fix-fakeroot-execution.patch
+#fix-fakeroot-execution.patch

Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=305&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Fri May 18 16:32:46 2012
@@ -32,7 +32,7 @@
 	dh_auto_configure -- \
 		$(CHKPT) $(NUMA) $(TORQUE) \
 		$(MPI_THREADS) \
-		--with-hwloc=external \
+		--with-hwloc=/usr/ \
 		--with-libltdl=external \
 		--with-devel-headers \
 		--with-slurm \
@@ -66,7 +66,7 @@
 	dh_install
 
 override_dh_fixperms:
-	chmod 0644 debian/libopenmpi2/usr/lib/openmpi/lib/mpi.mod
+	chmod 0644 debian/tmp/usr/lib/openmpi/lib/mpi.mod
 	dh_fixperms
 
 override_dh_installdocs:
@@ -74,9 +74,9 @@
 
 #override_dh_shlibdeps:
 #	export LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib/openmpi/lib"
-#	dh_shlibdeps -Llibopenmpi2
+#	dh_shlibdeps -Llibopenmpi1.6-2
 
 override_dh_strip:
-	dh_strip --dbg-package=libopenmpi-dbg
+	dh_strip --dbg-package=libopenmpi1.6-dbg
 
 override_dh_auto_test:

Modified: openmpi/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/watch?rev=305&op=diff
==============================================================================
--- openmpi/trunk/debian/watch (original)
+++ openmpi/trunk/debian/watch Fri May 18 16:32:46 2012
@@ -1,2 +1,2 @@
 version=3
-http://www.open-mpi.org/software/ompi/v1.5/ .*/openmpi-([\d+\.]+)\.tar\.gz
+http://www.open-mpi.org/software/ompi/v1.6/ .*/openmpi-([\d+\.]+)\.tar\.gz

More information about the Pkg-openmpi-commits mailing list