[Pkg-openmpi-commits] r77 - in /openmpi/trunk/debian: changelog libopenmpi-dev.install libopenmpi-dev.postinst libopenmpi-dev.prerm libopenmpi1.install rules

hauro-guest at users.alioth.debian.org hauro-guest at users.alioth.debian.org
Mon Nov 26 14:24:14 UTC 2007 

Author: hauro-guest
Date: Mon Nov 26 14:24:14 2007
New Revision: 77

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=77
Log:
This commit should fix most (if not all) issues with #452047 but we can't close it yet because #220044 prevents the changes from taking effect.

Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/libopenmpi-dev.install
    openmpi/trunk/debian/libopenmpi-dev.postinst
    openmpi/trunk/debian/libopenmpi-dev.prerm
    openmpi/trunk/debian/libopenmpi1.install
    openmpi/trunk/debian/rules

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=77&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Mon Nov 26 14:24:14 2007
@@ -1,15 +1,19 @@
 openmpi (1.2.4-4) unstable; urgency=low
 
   [ Manuel Prinz ]
-  * debian/rules: Added cross-compilation support
+  * debian/rules: Several minor changes
+    - Added cross-compilation support
+    - Replaced (un)patch targets with dpatch's makefile snippet
   * debian/control: Several cosmetic changes to control fields
     - XS-Vcs-*: Renamed fields to Vcs-*
     - Homepage: Newly added
     - Build-Depends: Removed libsysfs-dev (Closes: #449084)
     - Build-Depends: Removed automake
     - Uploaders: Added myself
-
- -- Manuel Prinz <debian at pinguinkiste.de>  Mon, 12 Nov 2007 00:30:26 +0100
+  * Moved include files and libraries to /usr/lib/openmpi and use the "mpi"
+    alternative. Thanks to Nicholas Breen for assistance! (Closes: #452047)
+
+ -- Manuel Prinz <debian at pinguinkiste.de>  Wed, 21 Nov 2007 15:51:45 +0100
 
 openmpi (1.2.4-3) unstable; urgency=low
 

Modified: openmpi/trunk/debian/libopenmpi-dev.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi-dev.install?rev=77&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi-dev.install (original)
+++ openmpi/trunk/debian/libopenmpi-dev.install Mon Nov 26 14:24:14 2007
@@ -1,8 +1,8 @@
 usr/bin/opal_wrapper
-usr/include/*
-usr/lib/*.la
-usr/lib/openmpi/*.la
-usr/lib/*.so
+usr/lib/openmpi/include/*
+usr/lib/openmpi/lib/*.la
+usr/lib/openmpi/lib/openmpi/*.la
+usr/lib/openmpi/lib/*.so
 usr/share/man/man1/mpicc.openmpi.1
 usr/share/man/man1/mpic++.openmpi.1
 usr/share/man/man1/mpicxx.openmpi.1

Modified: openmpi/trunk/debian/libopenmpi-dev.postinst
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi-dev.postinst?rev=77&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi-dev.postinst (original)
+++ openmpi/trunk/debian/libopenmpi-dev.postinst Mon Nov 26 14:24:14 2007
@@ -3,7 +3,23 @@
 set -e
 
 update-alternatives \
-	--install /usr/bin/mpicc mpicc /usr/bin/mpicc.openmpi 5 \
+	--install /usr/include/mpi mpi /usr/lib/openmpi/include 5 \
+	--slave /usr/lib/libmca_common_sm.la libmca_common_sm.la /usr/lib/openmpi/lib/libmca_common_sm.la \
+	--slave /usr/lib/libmca_common_sm.so libmca_common_sm.so /usr/lib/openmpi/lib/libmca_common_sm.so \
+	--slave /usr/lib/libmpi.so libmpi.so /usr/lib/openmpi/lib/libmpi.so \
+	--slave /usr/lib/libmpi.la libmpi.la /usr/lib/openmpi/lib/libmpi.la \
+	--slave /usr/lib/libmpi_cxx.la libmpi_cxx.la /usr/lib/openmpi/lib/libmpi_cxx.la \
+	--slave /usr/lib/libmpi_cxx.so libmpi_cxx.so /usr/lib/openmpi/lib/libmpi_cxx.so \
+	--slave /usr/lib/libmpi_f77.la libmpi_f77.la /usr/lib/openmpi/lib/libmpi_f77.la \
+	--slave /usr/lib/libmpi_f77.so libmpi_f77.so /usr/lib/openmpi/lib/libmpi_f77.so \
+	--slave /usr/lib/libmpi_f90.la libmpi_f90.la /usr/lib/openmpi/lib/libmpi_f90.la \
+	--slave /usr/lib/libmpi_f90.so libmpi_f90.so /usr/lib/openmpi/lib/libmpi_f90.so \
+	--slave /usr/lib/libopen-pal.la libopen-pal.la /usr/lib/openmpi/lib/libopen-pal.la \
+	--slave /usr/lib/libopen-pal.so libopen-pal.so /usr/lib/openmpi/lib/libopen-pal.so \
+	--slave /usr/lib/libopen-rte.la libopen-rte.la /usr/lib/openmpi/lib/libopen-rte.la \
+	--slave /usr/lib/libopen-rte.so libopen-rte.so /usr/lib/openmpi/lib/libopen-rte.so \
+	--slave /usr/lib/mpi.mod mpi.mod /usr/lib/openmpi/lib/mpi.mod \
+	--slave /usr/bin/mpicc mpicc /usr/bin/mpicc.openmpi \
 	--slave /usr/bin/mpic++ mpic++ /usr/bin/mpic++.openmpi \
 	--slave /usr/bin/mpicxx mpicxx /usr/bin/mpic++.openmpi \
 	--slave /usr/bin/mpiCC mpiCC /usr/bin/mpic++.openmpi \

Modified: openmpi/trunk/debian/libopenmpi-dev.prerm
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi-dev.prerm?rev=77&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi-dev.prerm (original)
+++ openmpi/trunk/debian/libopenmpi-dev.prerm Mon Nov 26 14:24:14 2007
@@ -3,7 +3,7 @@
 set -e
 
 if [ "$1" != "upgrade" ]; then
-	update-alternatives --remove mpicc  /usr/bin/mpicc.openmpi
+	update-alternatives --remove mpi /usr/lib/openmpi/include
 fi
 
 #DEBHELPER#

Modified: openmpi/trunk/debian/libopenmpi1.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi1.install?rev=77&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi1.install (original)
+++ openmpi/trunk/debian/libopenmpi1.install Mon Nov 26 14:24:14 2007
@@ -1,16 +1,16 @@
-usr/lib/libmca_common_sm.so.0.0.0
-usr/lib/libmca_common_sm.so.0
-usr/lib/libmpi.so.0.0.0
-usr/lib/libmpi.so.0
-usr/lib/libmpi_cxx.so.0.0.0
-usr/lib/libmpi_cxx.so.0
-usr/lib/libmpi_f77.so.0.0.0
-usr/lib/libmpi_f77.so.0
-usr/lib/libmpi_f90.so.0.0.0
-usr/lib/libmpi_f90.so.0
-usr/lib/libopen-pal.so.0.0.0
-usr/lib/libopen-pal.so.0
-usr/lib/libopen-rte.so.0.0.0
-usr/lib/libopen-rte.so.0
-usr/lib/openmpi/*.so
-usr/lib/mpi.mod
+usr/lib/openmpi/lib/libmca_common_sm.so.0.0.0
+usr/lib/openmpi/lib/libmca_common_sm.so.0
+usr/lib/openmpi/lib/libmpi.so.0.0.0
+usr/lib/openmpi/lib/libmpi.so.0
+usr/lib/openmpi/lib/libmpi_cxx.so.0.0.0
+usr/lib/openmpi/lib/libmpi_cxx.so.0
+usr/lib/openmpi/lib/libmpi_f77.so.0.0.0
+usr/lib/openmpi/lib/libmpi_f77.so.0
+usr/lib/openmpi/lib/libmpi_f90.so.0.0.0
+usr/lib/openmpi/lib/libmpi_f90.so.0
+usr/lib/openmpi/lib/libopen-pal.so.0.0.0
+usr/lib/openmpi/lib/libopen-pal.so.0
+usr/lib/openmpi/lib/libopen-rte.so.0.0.0
+usr/lib/openmpi/lib/libopen-rte.so.0
+usr/lib/openmpi/lib/openmpi/*.so
+usr/lib/openmpi/lib/mpi.mod

Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=77&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Mon Nov 26 14:24:14 2007
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
+
+include /usr/share/dpatch/dpatch.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -33,6 +35,8 @@
 			--mandir=\$${prefix}/share/man 		\
 			--infodir=\$${prefix}/share/info 	\
 			--sysconfdir=/etc/openmpi 		\
+			--libdir=\$${prefix}/lib/openmpi/lib	\
+			--includedir=\$${prefix}/lib/openmpi/include	\
 			--with-devel-headers
 # Thread support disabled because it's broken, see bug #435581
 #			--enable-mpi-threads 			\
@@ -87,7 +91,7 @@
 	for f in ompi_info opal_wrapper orted; do \
 		cp debian/$${f}.1 debian/openmpi/usr/share/man/man1/$${f}.1 ; \
 	done
-	chmod 644 debian/openmpi/usr/lib/mpi.mod
+	chmod 644 debian/openmpi/usr/lib/openmpi/lib/mpi.mod
 	sed -i 's/3OpenMPI/3/' debian/openmpi/usr/share/man/man3/*.3
 	dh_install -s --sourcedir=$(CURDIR)/debian/openmpi --list-missing
 	install -m0644 debian/libopenmpi1.lintian-overrides $(CURDIR)/debian/libopenmpi1/usr/share/lintian/overrides/libopenmpi1
@@ -123,19 +127,10 @@
 	dh_fixperms -a
 	dh_makeshlibs -a
 	dh_installdeb -a
-	dh_shlibdeps -a -l$(CURDIR)/debian/openmpi/lib -Llibopenmpi1
+	dh_shlibdeps -a -l$(CURDIR)/debian/openmpi/usr/lib/openmpi/lib -Llibopenmpi1
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
 
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
-	touch patch-stamp
-
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch patch configure

More information about the Pkg-openmpi-commits mailing list