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

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Fri Nov 30 17:56:37 2012
New Revision: 322

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=322
Log:
Rename manpages to avoid conflicts with mpich2-doc (Closes: #692937)

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=322&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Fri Nov 30 17:56:37 2012
@@ -1,3 +1,9 @@
+openmpi1.6 (1.6.3-3) unstable; urgency=low
+
+  * Rename manpages to avoid conflicts with mpich2-doc (Closes: #692937)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 16 Nov 2012 17:42:56 +0100
+
 openmpi1.6 (1.6.3-2) unstable; urgency=low
 
   * Bring back manpages for MPI functions (LP: #1027289)

Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=322&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Fri Nov 30 17:56:37 2012
@@ -63,7 +63,15 @@
 		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; \
+		if test -f debian/tmp/usr/share/man/man1/$${f}.3; then \
+			mv debian/tmp/usr/share/man/man3/$${f}.3 debian/tmp/usr/share/man/man1/$${f}.openmpi.3 ; \
+		fi; \
 	done
+	cd debian/tmp/usr/share/man/man3; \
+	for f in *.3; do \
+		mv $$f $$(echo $$f|sed -e "s|\.3|.openmpi.3|g"); \
+	done; \
+
 # Rename orte-bootproxy.sh to 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; \