[Pkg-openmpi-commits] r147 - in /openmpi/trunk/debian: changelog rules

[manuel at users.alioth.debian.org]

Author: manuel
Date: Sun Nov  2 15:29:35 2008
New Revision: 147

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=147
Log:
Fix for #502232 and #504161

Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/rules

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=147&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Sun Nov  2 15:29:35 2008
@@ -1,3 +1,10 @@
+openmpi (1.2.8-3) unstable; urgency=low
+
+  * Building static libraries (again) (Closes: #502232)
+  * Removed *.so files from libopenmpi-dev package (Closes: #504161)
+
+ -- Manuel Prinz <manuel at debian.org>  Sun, 02 Nov 2008 15:53:19 +0100
+
 openmpi (1.2.8-2) unstable; urgency=low
 
   * Reverted back to revision r137 corresponding to Debian release 1.2.7-1

Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=147&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Sun Nov  2 15:29:35 2008
@@ -95,11 +95,11 @@
 	$(MAKE) -C build/static install DESTDIR=$(CURDIR)/debian/libopenmpi-dev/
 	$(MAKE) -C build/basic install DESTDIR=$(CURDIR)/debian/openmpi/
 	rm -rf $(CURDIR)/debian/libopenmpi-dev/usr/lib/openmpi/include/ $(CURDIR)/debian/libopenmpi-dev/etc/ $(CURDIR)/debian/libopenmpi-dev/usr/share/ $(CURDIR)/debian/libopenmpi-dev/usr/bin/
-	chmod -x $(CURDIR)/debian/libopenmpi-dev/usr/lib/openmpi/lib/mpi.mod
+	rm $(CURDIR)/debian/libopenmpi-dev/usr/lib/openmpi/lib/mpi.mod
+	find  $(CURDIR)/debian/libopenmpi-dev/ -name '*\.so*' -exec rm '{}' \;
 
 	# Strip rpath info from all executables and libraries
 	find debian/openmpi/ -type f -perm -+x -a ! -name '*.la' -a ! -name '*.mod' -exec chrpath -d '{}' \;
-	find debian/libopenmpi-dev/ -type f -name '*\.so*' -exec chrpath -d '{}' \;
 	for f in mpic++ mpicc mpicxx mpiexec mpif77 mpif90 ; do \
 		cp debian/openmpi/usr/share/man/man1/$${f}.1 debian/openmpi/usr/share/man/man1/$${f}.openmpi.1 ; \
 	done