[Pkg-scicomp-commits] lapack/trunk/debian

[Sylvestre Ledru]

SVN commit 3945 by sylvestre-guest:

Merged with version 3.1.1-5

 M  +12 -3     lapack/trunk/debian/changelog  
 A             lapack/trunk/debian/liblapack-doc.manpages  
 A             lapack/trunk/debian/liblapack-test.manpages  
 AM            lapack/trunk/debian/orig-tar.sh  
 M  +12 -23    lapack/trunk/debian/rules  


--- lapack/trunk/debian/changelog #3944:3945
@@ -1,9 +1,18 @@
-lapack (3.1.1-4) UNRELEASED; urgency=low
+lapack (3.1.1-5) unstable; urgency=low
 
-  * Timing tests removed (advice of upstream)
+  * rename manpage lsame & xerbla to lsame-lapack & xerblas-lapack to 
+    avoid duplicate man page with libblas-doc (Closes: #500660)
+  * use dh_installman instead of dh_installmanpages
+  * Duplicate on liblapack-test.1 removed
+	
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Tue, 30 Sep 2008 23:16:04 +0200
 
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Sat, 20 Sep 2008 17:40:14 +0200
+lapack (3.1.1-4) unstable; urgency=low
 
+  * manpages are now installed (Closes: #500225)
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Fri, 26 Sep 2008 17:34:05 +0200
+
 lapack (3.1.1-3) unstable; urgency=low
 
   * Typos fixed in the manpages (Closes: #410309)
** lapack/trunk/debian/orig-tar.sh #property changes
Name: svn:executable
   + *
--- lapack/trunk/debian/rules #3944:3945
@@ -2,22 +2,13 @@
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
-# include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # This is the debhelper compatability version to use.
 #export DH_COMPAT=2
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-# shared library versions, option 1
-#version=2.0.5
-#major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
 SO:=3gf
 MN:=0
@@ -32,7 +23,6 @@
 #UNROLL:=
 OPTOPTS:=-g -O3
 UNROLL:=-funroll-all-loops
-
 ifneq (,$(filter $(ARCH), arm armel))
   OPTOPTS:=-g -O0
   UNROLL:=
@@ -51,6 +41,9 @@
   OPTOPTS:=-g -O0
 endif
 
+ifneq (,$(filter $(ARCH), none))
+  export ignore_testing_failures = -
+endif
 
 #
 #
@@ -143,7 +136,7 @@
 	rm -f debian/arch_patch_unapplied
 	touch $@ && chmod go+rw $@
 
-debian/makes: make.inc testing/Makefile 
+debian/makes: make.inc testing/Makefile
 	rm -f debian/unmakes
 	touch $@
 
@@ -181,7 +174,6 @@
 #
 #
 
-
 make.inc: install/make.inc.LINUX 
 	cat $< | sed -e "s,g77,$(F77),g" \
 		     -e "s,\(^NOOPT  *=\),\1 \$$(PICOPTS) $(FOPTS),1" \
@@ -290,12 +282,6 @@
 	$(F77) -v >>$@
 	cat $^ >>$@
 
-$(subst timing,debian/time,$(TIMF)):\
-	debian/time/%: timing/%
-	mkdir -m 777 -p $(@D)
-	echo Time file $(@F) >$@
-	cat $< >> $@
-
 debian/liblapack3gf.templates: debian/test_results
 	cp debian/main_templates $@
 #	chmod +x debian/rawk
@@ -339,6 +325,9 @@
 IF:=$(IF) $(addprefix debian/tmp/usr/lib/liblapack3gf/,$(subst testing/,,$(TB)) $(subst timing/,,$(MB)))
 
 install: $(IF) $(MF3) debian/test_results debian/liblapack3gf.templates
+	# File renamed to avoid conflict with blas (see #500660)
+	mv man/manl/xerbla.3 man/manl/xerbla-lapack.3
+	mv man/manl/lsame.3 man/manl/lsame-lapack.3
 	dh_testdir
 	dh_testroot
 	dh_movefiles
@@ -351,10 +340,10 @@
 #
 
 
-clean:: make.inc
+clean::  make.inc
 	dh_testdir
 	dh_testroot
-	rm -rf debian/*_stamp debian/*_results lib* testing/*out 
+	rm -rf debian/*_stamp debian/*_results lib* testing/*out
 	find man -name "*.3" -exec rm {} \;
 	rm -rf *.a install/test* debian/test/ debian/time/ 
 	rm -f debian/test_results debian/liblapack3gf.templates
@@ -379,7 +368,7 @@
 	rm -f debian/liblapack-doc/usr/share/doc/liblapack-doc/lug/robots.txt
 	dh_installdocs -i
 	dh_installexamples -i
-	dh_installmanpages -p liblapack-doc debian/*.1 man/manl/xerbla.3 man/manl/lsame.3 man/manl/zbcon.3
+	dh_installman -i -pliblapack-doc
 	dh_installchangelogs -i
 	dh_link -i
 	dh_strip -i
@@ -399,7 +388,7 @@
 	dh_installdocs -a
 	dh_installdebconf -a
 	dh_installexamples -a
-	dh_installmanpages -p liblapack-test $$(find man -type f)
+	dh_installman -a -pliblapack-test
 	dh_installchangelogs -a
 	dh_link -a
 	dh_strip -a