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

[Rafael Laboissiere]

SVN commit 4208 by rafael:

Housekeeping regarding the Debian-specific changes in the Makefiles 
 
The treatment of files make.inc and testing/Makefile was quite confuse and  
inconsistent.  In particular, the pic.patch patch was interfering with the  
way the OPTS variable must to be set, on a per-architecture basis.  As a  
bonus, there is no file left behind after running "debian/rules clean" and  
the .diff.gz file is clean now.  As an extra bonus, there is no need for  
build-depending on cdbs anymore.

 M  +9 -0      lapack/trunk/debian/changelog  
 M  +1 -1      lapack/trunk/debian/control  
 D             lapack/trunk/debian/patches (directory)  
 M  +15 -23    lapack/trunk/debian/rules  


--- lapack/trunk/debian/changelog #4207:4208
@@ -3,9 +3,18 @@
   [ Rafael Laboissiere ]
   * Upload to unstable
   * debian/control: Bump Standards-Version to 3.8.1 (no changes needed)
+
   * debian/control, debian/compat:  Bump build-dependency and compatibility
     level to debhelper >= 7 (version 4 is now deprecated)
 
+  * debian/patches/pic.patch: Drop this patch, since it interferes with
+    the way the OPTS variable must be set, on a per-architecture basis
+  * debian/control: As a consequence of the above, drop the
+    build-dependency on cdbs
+  * debian/rules: Fix the building/cleaning of make.inc and
+    testing/Makefile files, which were being left behind after running
+    debian/rules clean
+
   [ Sylvestre Ledru ]
   * typo fixed in debian/rules
 
--- lapack/trunk/debian/control #4207:4208
@@ -6,7 +6,7 @@
  Ondrej Certik <ondrej at certik.cz>,
  Sylvestre Ledru <sylvestre.ledru at inria.fr>,
  Rafael Laboissiere <rafael at debian.org>
-Build-Depends: debhelper (>= 7), gfortran, libblas-dev, cdbs
+Build-Depends: debhelper (>= 7), gfortran, libblas-dev
 Standards-Version: 3.8.1
 Homepage: http://www.netlib.org/lapack/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/lapack/
--- lapack/trunk/debian/rules #4207:4208
@@ -5,9 +5,7 @@
 
 # This is the debhelper compatability version to use.
 #export DH_COMPAT=2
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-
 SO:=3gf
 MN:=0
 VERS:=$(SO).$(MN)
@@ -69,7 +67,7 @@
 
 %.3: %.l
 	cat $< | sed "s,^.TH  *\([^ ]*\)  *l  *\(.*\),.TH \1 3 \2,1" >$@
-	@echo Converted $< to $@, diff: 
+	@echo Converted $< to $@, diff:
 	diff -u $< $@ || true
 
 debian/errata.lug debian/installation.hints:
@@ -91,37 +89,27 @@
      debian/release_notes.html debian/errata.lug debian/installation.hints\
      debian/faq.html
 
-debian/makes: make.inc testing/Makefile
-	rm -f debian/unmakes
-	touch $@
-
-debian/unmakes:
-	! [ -e make.inc.ori ] || mv make.inc.ori make.inc
-	! [ -e testing/Makefile.ori ] || mv testing/Makefile.ori testing/Makefile
-	rm -f debian/makes
-	touch $@
-
 #
 #
 # Configure
 #
 #
 
-make.inc: install/make.inc.gfortran 
+make.inc: install/make.inc.gfortran
 	cat $< | sed -e "s,g77,$(F77),g" \
 		     -e "s,\(^NOOPT  *=\),\1 \$$(PICOPTS) $(FOPTS),1" \
 		     -e "s,-O3,\$$(PICOPTS) $(FOPTS) $(OPTOPTS),1" \
-		     -e "s,-funroll-all-loops,$(UNROLL),g" \
+		     -e "s,\(^OPTS  *=\).*,\1 $(UNROLL) \$$(PICOPTS) $(OPTOPTS),1" \
 		     -e "s,[^ ]*blas[^ ]*\.a,-lblas,1" \
 		     -e "s,TIMER. *,#&," > $@
 	echo "TIMER = INT_ETIME" >> $@
 
 TIMEOUT:=1800
 
-testing/Makefile.ori: 
+testing/Makefile.ori:
 	cp testing/Makefile $@
 
-testing/Makefile: testing/Makefile.ori 
+testing/Makefile: testing/Makefile.ori
 	cat $< | sed -e "s,\./x,$(ignore_testing_failures)../debian/trun $(TIMEOUT) ./x,g" >$@
 
 #
@@ -152,8 +140,8 @@
 
 liblapack.a: make.inc testing/Makefile
 	$(MAKE) cleanlib
-	$(MAKE) lapack_install 
-	$(MAKE) lib        
+	$(MAKE) lapack_install
+	$(MAKE) lib
 	mv lapack_LINUX.a $@
 
 BF:=liblapack.a liblapack.so
@@ -190,7 +178,7 @@
 
 TESF:=$(addprefix testing/,$(addsuffix .out,$(TESF)))
 
-libblas.so: 
+libblas.so:
 	cp -d /usr/lib/libblas.so.$(SO).* libblas.so
 
 $(TB) $(TESF): libblas.so liblapack.so
@@ -268,17 +256,21 @@
 #
 
 
-clean::  make.inc
+clean:: make.inc
 	dh_testdir
 	dh_testroot
 	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 -rf *.a install/test* debian/test/ debian/time/
 	rm -f debian/test_results debian/liblapack3gf.templates
-	rm -f debian/makes debian/unmakes testing/tmp
+	rm -f testing/tmp
 
 	touch TESTING/xlinfoo TESTING/xeigfoo  && $(MAKE) clean
+	rm -f make.inc
 
+	-[ -e testing/Makefile.ori ] \
+		&& mv testing/Makefile.ori testing/Makefile
+
 	dh_clean
 
 #