r44252 - in /packages/lapack/trunk/debian: ./ patches/
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Mon Dec 26 08:31:19 UTC 2011
Author: sylvestre
Date: Mon Dec 26 08:31:17 2011
New Revision: 44252
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44252
Log:
lapack (3.4.0-1~exp1) experimental; urgency=low
* New upstream release
* manpages removed and repack script updated (LP: #764445)
* New packages liblapacke & liblapacke-dev (C library) added (LP: #767108)
* Update the whole lapack documentation. Now uses the generated documentation
produced by doxygen.
* Package liblapack-doc-man introduced with the manpages of the function.
* Remove the deprecated documentation.
Added:
packages/lapack/trunk/debian/liblapack-dev.install
- copied, changed from r43901, packages/lapack/trunk/debian/liblapack-dev.files
packages/lapack/trunk/debian/liblapack-doc-man.manpages
packages/lapack/trunk/debian/liblapack-pic.install
- copied, changed from r43901, packages/lapack/trunk/debian/liblapack-pic.files
packages/lapack/trunk/debian/liblapack-test.install
- copied, changed from r44029, packages/lapack/trunk/debian/liblapack-test.files
packages/lapack/trunk/debian/liblapack3.install
- copied, changed from r44029, packages/lapack/trunk/debian/liblapack3.files
packages/lapack/trunk/debian/liblapacke-dev.install
packages/lapack/trunk/debian/liblapacke.install
packages/lapack/trunk/debian/patches/lapack_testing.patch
packages/lapack/trunk/debian/patches/lapackversion.diff
packages/lapack/trunk/debian/patches/pic.diff
Removed:
packages/lapack/trunk/debian/README.Debian
packages/lapack/trunk/debian/errata.lug
packages/lapack/trunk/debian/faq.html
packages/lapack/trunk/debian/installation.hints
packages/lapack/trunk/debian/lapackqref.ps
packages/lapack/trunk/debian/liblapack-dev.files
packages/lapack/trunk/debian/liblapack-doc.doc-base.faq
packages/lapack/trunk/debian/liblapack-doc.doc-base.qref
packages/lapack/trunk/debian/liblapack-doc.doc-base.release
packages/lapack/trunk/debian/liblapack-doc.manpages
packages/lapack/trunk/debian/liblapack-pic.files
packages/lapack/trunk/debian/liblapack-test.1
packages/lapack/trunk/debian/liblapack-test.files
packages/lapack/trunk/debian/liblapack-test.manpages
packages/lapack/trunk/debian/liblapack3.files
packages/lapack/trunk/debian/lug_l2h.css
packages/lapack/trunk/debian/rawk
packages/lapack/trunk/debian/release_notes.html
packages/lapack/trunk/debian/shlibs.local
packages/lapack/trunk/debian/xeigtimc.1
packages/lapack/trunk/debian/xeigtimd.1
packages/lapack/trunk/debian/xeigtims.1
packages/lapack/trunk/debian/xeigtimz.1
packages/lapack/trunk/debian/xeigtstc.1
packages/lapack/trunk/debian/xeigtstd.1
packages/lapack/trunk/debian/xeigtsts.1
packages/lapack/trunk/debian/xeigtstz.1
packages/lapack/trunk/debian/xlintimc.1
packages/lapack/trunk/debian/xlintimd.1
packages/lapack/trunk/debian/xlintims.1
packages/lapack/trunk/debian/xlintimz.1
packages/lapack/trunk/debian/xlintstc.1
packages/lapack/trunk/debian/xlintstd.1
packages/lapack/trunk/debian/xlintsts.1
packages/lapack/trunk/debian/xlintstz.1
Modified:
packages/lapack/trunk/debian/changelog
packages/lapack/trunk/debian/control
packages/lapack/trunk/debian/liblapack-doc.doc-base.lug
packages/lapack/trunk/debian/liblapack-doc.docs
packages/lapack/trunk/debian/liblapack3.docs
packages/lapack/trunk/debian/orig-tar.sh
packages/lapack/trunk/debian/patches/series
packages/lapack/trunk/debian/rules
Modified: packages/lapack/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/changelog?rev=44252&op=diff
==============================================================================
--- packages/lapack/trunk/debian/changelog (original)
+++ packages/lapack/trunk/debian/changelog Mon Dec 26 08:31:17 2011
@@ -1,3 +1,15 @@
+lapack (3.4.0-1~exp1) experimental; urgency=low
+
+ * New upstream release
+ * manpages removed and repack script updated (LP: #764445)
+ * New packages liblapacke & liblapacke-dev (C library) added (LP: #767108)
+ * Update the whole lapack documentation. Now uses the generated documentation
+ produced by doxygen.
+ * Package liblapack-doc-man introduced with the manpages of the function.
+ * Remove the deprecated documentation.
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 15 Nov 2011 17:07:42 +0100
+
lapack (3.3.1-2) experimental; urgency=low
* Standards-Version updated to version 3.9.2
Modified: packages/lapack/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/control?rev=44252&op=diff
==============================================================================
--- packages/lapack/trunk/debian/control (original)
+++ packages/lapack/trunk/debian/control Mon Dec 26 08:31:17 2011
@@ -3,7 +3,8 @@
Priority: optional
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: debhelper (>= 7), gfortran, libblas-dev (>= 1.2-7)
+Build-Depends: debhelper (>= 7), gfortran, libblas-dev (>= 1.2-7),
+ doxygen, python
Standards-Version: 3.9.2
Homepage: http://www.netlib.org/lapack/
Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/lapack/
@@ -11,7 +12,7 @@
Package: liblapack3
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, debconf | debconf-2.0
+Depends: ${misc:Depends}, ${shlibs:Depends}
Provides: liblapack.so.3gf, liblapack.so.3
Conflicts: lapack99, liblapack3gf
Replaces: lapack99, liblapack3gf
@@ -22,6 +23,34 @@
analysis, singular value decomposition, etc. It is a very
comprehensive and reputable package that has found extensive
use in the scientific community.
+
+Package: liblapacke
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Provides: liblapacke.so.3
+Description: Library of linear algebra routines 3 - C lib shared version
+ LAPACK version 3.X is a comprehensive FORTRAN library that does
+ linear algebra operations including matrix inversions, least
+ squared solutions to linear sets of equations, eigenvector
+ analysis, singular value decomposition, etc. It is a very
+ comprehensive and reputable package that has found extensive
+ use in the scientific community.
+ .
+ This package contains the Standard C language library for LAPACK.
+
+Package: liblapacke-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, liblapacke (= ${binary:Version})
+Description: library of linear algebra routines 3 - Headers
+ LAPACK version 3.X is a comprehensive FORTRAN library that does
+ linear algebra operations including matrix inversions, least
+ squared solutions to linear sets of equations, eigenvector
+ analysis, singular value decomposition, etc. It is a very
+ comprehensive and reputable package that has found extensive
+ use in the scientific community.
+ .
+ This package contains the Standard C language headers for LAPACK.
Package: liblapack-dev
Section: libdevel
@@ -44,8 +73,7 @@
Architecture: any
Conflicts: lapack-pic, lapack3-pic
Replaces: lapack-pic, lapack3-pic
-Depends: ${misc:Depends}, liblapack3 (= ${binary:Version}),
- libblas-dev | libatlas-base-dev | libblas-3.so
+Depends: ${misc:Depends}, liblapack3 (= ${binary:Version})
Description: library of linear algebra routines 3 - static PIC version
LAPACK version 3.X is a comprehensive FORTRAN library that does
linear algebra operations including matrix inversions, least
@@ -95,7 +123,21 @@
comprehensive and reputable package that has found extensive
use in the scientific community.
.
- This package contains manual pages for the routines, a
- "Quick-Reference" guide, release notes, a frequently asked
- questions document, and a copy of the Lapack User's Guide
- manual in html format.
+ This package contains the Lapack User's Guide manual in html format.
+ .
+ Since version 3.4.0, the HTML documentation is generated thanks to doxygen.
+
+Package: liblapack-doc-man
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: library of linear algebra routines 3 - documentation (manual pages)
+ LAPACK version 3.X is a comprehensive FORTRAN library that does
+ linear algebra operations including matrix inversions, least
+ squared solutions to linear sets of equations, eigenvector
+ analysis, singular value decomposition, etc. It is a very
+ comprehensive and reputable package that has found extensive
+ use in the scientific community.
+ .
+ This package contains the Lapack User's Guide manual in man format.
+
Copied: packages/lapack/trunk/debian/liblapack-dev.install (from r43901, packages/lapack/trunk/debian/liblapack-dev.files)
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/liblapack-dev.install?rev=44252&op=diff
==============================================================================
--- packages/lapack/trunk/debian/liblapack-dev.files (original)
+++ packages/lapack/trunk/debian/liblapack-dev.install Mon Dec 26 08:31:17 2011
@@ -1,2 +1,2 @@
-usr/lib/lapack/*.so
-usr/lib/lapack/liblapack.a
+liblapack.so usr/lib/lapack/
+liblapack.a usr/lib/lapack/
Added: packages/lapack/trunk/debian/liblapack-doc-man.manpages
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/liblapack-doc-man.manpages?rev=44252&op=file
==============================================================================
--- packages/lapack/trunk/debian/liblapack-doc-man.manpages (added)
+++ packages/lapack/trunk/debian/liblapack-doc-man.manpages Mon Dec 26 08:31:17 2011
@@ -1,0 +1,1 @@
+DOCS/man/man3/*
Modified: packages/lapack/trunk/debian/liblapack-doc.doc-base.lug
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/liblapack-doc.doc-base.lug?rev=44252&op=diff
==============================================================================
--- packages/lapack/trunk/debian/liblapack-doc.doc-base.lug (original)
+++ packages/lapack/trunk/debian/liblapack-doc.doc-base.lug Mon Dec 26 08:31:17 2011
@@ -1,9 +1,9 @@
Document: liblapack-doc.lug
-Title: Debian Lapack Manual
+Title: Lapack Manual
Author: J. Dongarra, et. al.
Abstract: Lapack User's Guide
Section: Programming
Format: HTML
-Index: /usr/share/doc/liblapack-doc/lug/index.html
-Files: /usr/share/doc/liblapack-doc/lug/*.html
+Index: /usr/share/doc/liblapack-doc/explore-html/index.html
+
Modified: packages/lapack/trunk/debian/liblapack-doc.docs
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/liblapack-doc.docs?rev=44252&op=diff
==============================================================================
--- packages/lapack/trunk/debian/liblapack-doc.docs (original)
+++ packages/lapack/trunk/debian/liblapack-doc.docs Mon Dec 26 08:31:17 2011
@@ -1,6 +1,1 @@
-debian/lapackqref.ps
-debian/errata.lug
-debian/installation.hints
-debian/release_notes.html
-debian/faq.html
-lug/
+DOCS/explore-html/
Copied: packages/lapack/trunk/debian/liblapack-pic.install (from r43901, packages/lapack/trunk/debian/liblapack-pic.files)
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/liblapack-pic.install?rev=44252&op=diff
==============================================================================
--- packages/lapack/trunk/debian/liblapack-pic.files (original)
+++ packages/lapack/trunk/debian/liblapack-pic.install Mon Dec 26 08:31:17 2011
@@ -1,1 +1,1 @@
-usr/lib/lapack/liblapack_pic.a
+liblapack_pic.a usr/lib/lapack/
Copied: packages/lapack/trunk/debian/liblapack-test.install (from r44029, packages/lapack/trunk/debian/liblapack-test.files)
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/liblapack-test.install?rev=44252&op=diff
==============================================================================
--- packages/lapack/trunk/debian/liblapack-test.files (original)
+++ packages/lapack/trunk/debian/liblapack-test.install Mon Dec 26 08:31:17 2011
@@ -1,1 +1,10 @@
-usr/lib/liblapack3
+testing/*.in usr/share/doc/liblapack-test/examples/
+testing/testing_results.txt usr/share/doc/liblapack-test/
+testing/xeigtstc usr/lib/lapack/
+testing/xeigtstd usr/lib/lapack/
+testing/xeigtsts usr/lib/lapack/
+testing/xeigtstz usr/lib/lapack/
+testing/xlintstc usr/lib/lapack/
+testing/xlintstd usr/lib/lapack/
+testing/xlintsts usr/lib/lapack/
+testing/xlintstz usr/lib/lapack/
Modified: packages/lapack/trunk/debian/liblapack3.docs
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/liblapack3.docs?rev=44252&op=diff
==============================================================================
--- packages/lapack/trunk/debian/liblapack3.docs (original)
+++ packages/lapack/trunk/debian/liblapack3.docs Mon Dec 26 08:31:17 2011
@@ -1,3 +1,2 @@
debian/test_results
README
-debian/README.Debian
Copied: packages/lapack/trunk/debian/liblapack3.install (from r44029, packages/lapack/trunk/debian/liblapack3.files)
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/liblapack3.install?rev=44252&op=diff
==============================================================================
--- packages/lapack/trunk/debian/liblapack3.files (original)
+++ packages/lapack/trunk/debian/liblapack3.install Mon Dec 26 08:31:17 2011
@@ -1,1 +1,1 @@
-usr/lib/lapack/*.so.*
+liblapack.so.* usr/lib/lapack/
Added: packages/lapack/trunk/debian/liblapacke-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/liblapacke-dev.install?rev=44252&op=file
==============================================================================
--- packages/lapack/trunk/debian/liblapacke-dev.install (added)
+++ packages/lapack/trunk/debian/liblapacke-dev.install Mon Dec 26 08:31:17 2011
@@ -1,0 +1,2 @@
+lapacke/include/ /usr/
+lapacke/liblapacke.so usr/lib/lapack/
Added: packages/lapack/trunk/debian/liblapacke.install
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/liblapacke.install?rev=44252&op=file
==============================================================================
--- packages/lapack/trunk/debian/liblapacke.install (added)
+++ packages/lapack/trunk/debian/liblapacke.install Mon Dec 26 08:31:17 2011
@@ -1,0 +1,1 @@
+lapacke/liblapacke.so.* usr/lib/lapack/
Modified: packages/lapack/trunk/debian/orig-tar.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/orig-tar.sh?rev=44252&op=diff
==============================================================================
--- packages/lapack/trunk/debian/orig-tar.sh (original)
+++ packages/lapack/trunk/debian/orig-tar.sh Mon Dec 26 08:31:17 2011
@@ -8,17 +8,10 @@
tar -z -x -f $3
rm $3
(cd $DIR
-echo ""
-echo "Downloading manpages from netlib website"
-wget http://www.netlib.org/lapack/manpages.tgz >/dev/null 2>&1
-echo "Unpack manpages.tgz"
-tar zxvf manpages.tgz --strip-components 1
-rm manpages.tgz
mv TESTING testing; ln -s testing TESTING
mv SRC src; ln -s src SRC
mv INSTALL install; ln -s install INSTALL
mv BLAS blas; ln -s blas BLAS
-rm -rf blas/man/
)
RULES=$(pwd)/debian/rules
(cd $DIR ; $RULES lug/index.html)
Added: packages/lapack/trunk/debian/patches/lapack_testing.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/patches/lapack_testing.patch?rev=44252&op=file
==============================================================================
--- packages/lapack/trunk/debian/patches/lapack_testing.patch (added)
+++ packages/lapack/trunk/debian/patches/lapack_testing.patch Mon Dec 26 08:31:17 2011
@@ -1,0 +1,13 @@
+--- ../plop/lapack-3.4.0/lapack_testing.py 2011-09-23 21:50:27.000000000 +0200
++++ ./lapack_testing.py 2011-12-22 15:34:20.177718465 +0100
+@@ -131,8 +131,8 @@
+ for line in pipe.readlines():
+ f.write(str(line))
+ words_in_line=line.split()
+- if (line.find("run")!=-1):
+-# print line
++ if (line.find("run)")!=-1):
++ print line
+ whereisrun=words_in_line.index("run)")
+ nb_test_run+=int(words_in_line[whereisrun-2])
+ if (line.find("out of")!=-1):
Added: packages/lapack/trunk/debian/patches/lapackversion.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/patches/lapackversion.diff?rev=44252&op=file
==============================================================================
--- packages/lapack/trunk/debian/patches/lapackversion.diff (added)
+++ packages/lapack/trunk/debian/patches/lapackversion.diff Mon Dec 26 08:31:17 2011
@@ -1,0 +1,18 @@
+Index: lapack-3.4.0/CMakeLists.txt
+===================================================================
+--- lapack-3.4.0.orig/CMakeLists.txt 2011-09-23 21:50:27.000000000 +0200
++++ lapack-3.4.0/CMakeLists.txt 2011-11-16 06:50:33.057486548 +0100
+@@ -146,10 +146,10 @@
+ SET(CPACK_PACKAGE_NAME "LAPACK")
+ SET(CPACK_PACKAGE_VENDOR "University of Tennessee, Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd")
+ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LAPACK- Linear Algebra Package")
+-set(LAPACK_VERSION 3.3.1)
++set(LAPACK_VERSION 3.4.0)
+ set(CPACK_PACKAGE_VERSION_MAJOR 3)
+-set(CPACK_PACKAGE_VERSION_MINOR 3)
+-set(CPACK_PACKAGE_VERSION_PATCH 1)
++set(CPACK_PACKAGE_VERSION_MINOR 4)
++set(CPACK_PACKAGE_VERSION_PATCH 0)
+ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+ SET(CPACK_PACKAGE_INSTALL_DIRECTORY "LAPACK")
+ IF(WIN32 AND NOT UNIX)
Added: packages/lapack/trunk/debian/patches/pic.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/patches/pic.diff?rev=44252&op=file
==============================================================================
--- packages/lapack/trunk/debian/patches/pic.diff (added)
+++ packages/lapack/trunk/debian/patches/pic.diff Mon Dec 26 08:31:17 2011
@@ -1,0 +1,21 @@
+Index: lapack-3.4.0/lapacke/make.inc
+===================================================================
+--- lapack-3.4.0.orig/lapacke/make.inc 2011-11-09 23:56:15.000000000 +0100
++++ lapack-3.4.0/lapacke/make.inc 2011-11-16 18:00:42.958453190 +0100
+@@ -48,14 +48,14 @@
+ # - gfortran, set: LINKER = gfortran
+ #
+ CC = gcc
+-CFLAGS =
++CFLAGS = -fPIC -O2 -Wall
+ LINKER = gfortran
+ LDFLAGS =
+ #
+ # The name of the libraries to be created/linked to
+ # Ensure that the libraries have the same data model (LP64/ILP64).
+ #
+-LAPACKE = lapacke.a
++LAPACKE = liblapacke.a
+ LIBS = /Users/julie/Documents/Boulot/lapack-dev/lapack/trunk/lapack_LINUX.a \
+ /Users/julie/Documents/Boulot/lapack-dev/lapack/trunk/blas_LINUX.a -lm
+ # The archiver and the flag(s) to use when building archive (library)
Modified: packages/lapack/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/patches/series?rev=44252&op=diff
==============================================================================
--- packages/lapack/trunk/debian/patches/series (original)
+++ packages/lapack/trunk/debian/patches/series Mon Dec 26 08:31:17 2011
@@ -1,2 +1,4 @@
-LAPACK_version.diff
-misaligned.diff
+#LAPACK_version.diff
+#misaligned.diff
+lapack_testing.patch
+
Modified: packages/lapack/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/lapack/trunk/debian/rules?rev=44252&op=diff
==============================================================================
--- packages/lapack/trunk/debian/rules (original)
+++ packages/lapack/trunk/debian/rules Mon Dec 26 08:31:17 2011
@@ -2,9 +2,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
-# This is the debhelper compatability version to use.
-#export DH_COMPAT=2
SO:=3
MN:=0
@@ -17,7 +14,7 @@
FOPTS:= #-ff90
#OPTOPTS:=-g
#UNROLL:=
-OPTOPTS:=-g -O3
+OPTOPTS:=-g -O3 -Wall
UNROLL:=-funroll-all-loops
ifneq (,$(filter $(ARCH), arm armel))
OPTOPTS:=-g -O0
@@ -41,54 +38,9 @@
export ignore_testing_failures = -
endif
-#
-#
-# Add-on documentation from upstream
-#
-#
-
-
-debian/lapackqref.ps debian/faq.html:
- cd $(@D) && wget -N ftp://ftp.netlib.org/lapack/$(@F)
-
-debian/release_notes.html:
- cd $(@D) && wget -N ftp://ftp.netlib.org/lapack/$(@F)
- cat $@ | sed -e "s,/lapack/html/,,g" \
- -e "s,errata.lug\",errata.lug.gz\",1" \
- -e "s,installation.hints\",installation.hints.gz\",1" >tmp
- mv tmp $@
-
-MF:=$(shell find man -type f)
-MANEXT:=3lapack
-MF3:=$(subst .l,.$(MANEXT),$(MF))
-man:
- cd debian && wget -N ftp://ftp.netlib.org/lapack/manpages.tgz
- tar zxf debian/manpages.tgz
- rm -rf debian/manpages.tgz blas/man
-
-%.$(MANEXT): %.l
- cat $< | sed "s,^.TH *\([^ ]*\) *. *\(.*\),.TH \1 $(MANEXT) \2,1" >$@
- @echo Converted $< to $@, diff:
- diff -u $< $@ || true
-
-debian/errata.lug debian/installation.hints:
- cd $(@D) && wget -N ftp://ftp.netlib.org/lapack/html/$(@F)
-
-lug/index.html:
- mkdir -p $(@D)
- cd $(@D) && \
- wget -r -N --no-parent -nH --cut-dirs=2 ftp://ftp.netlib.org/lapack/lug/
- cd $(@D) && \
- wget -r -N --no-parent -nH --cut-dirs=2 -A gif ftp://ftp.netlib.org/utk/icons/
- cd $(@D) && ( set -e ; \
- for i in $$(ls -1 *.html); do \
- cat $$i | sed "s,http://www.netlib.org/utk/icons/,,g" >tmp && mv tmp $$i ; \
- done )
- cd $(@D) && web2png -a -d
-
-doc: lug/index.html debian/lapackqref.ps man\
- debian/release_notes.html debian/errata.lug debian/installation.hints\
- debian/faq.html
+doc:
+ $(MAKE) html
+ $(MAKE) man
#
#
@@ -121,15 +73,16 @@
liblapack_pic.a: make.inc testing/Makefile
+ echo "Building liblapack_pic.a"
$(MAKE) cleanlib
$(MAKE) lapack_install PICOPTS=-fPIC
$(MAKE) lib PICOPTS=-fPIC
- mv lapack_LINUX.a $@
-
-liblapack.so.$(VERS): liblapack_pic.a libblas.so
- mkdir tmp
+ mv liblapack.a $@
+
+liblapack.so.$(VERS): liblapack_pic.a
+ echo "Building liblapack.so.$(VERS) from liblapack_pic.a"
+ mkdir -p tmp
cd tmp && ar x ../$<
-# Cannot link against blas -- causes circular dependency in atlas packages.
$(F77) -shared -Wl,-soname=liblapack.so.$(SO) -o $@ tmp/*.o -L. -lblas
rm -rf tmp
@@ -140,12 +93,42 @@
ln -snf $< $@
liblapack.a: make.inc testing/Makefile
- $(MAKE) cleanlib
+ echo "Building liblapack.a"
$(MAKE) lapack_install
$(MAKE) lib
- mv lapack_LINUX.a $@
-
-BF:=liblapack.a liblapack.so
+# mv lapack_LINUX.a $@
+
+liblapacke_pic.a: make.inc testing/Makefile
+ echo "Building liblapacke_pic.a"
+ cd lapacke; \
+ $(MAKE) cleanlib; \
+ $(MAKE) CFLAGS="$(OPTOPTS) -fPIC"; \
+ mv lapacke.a $@
+
+
+liblapacke.so.$(VERS): liblapacke_pic.a
+ echo "Building liblapacke.so.$(VERS) from liblapacke_pic.a"
+ cd lapacke; \
+ mkdir -p tmp; \
+ cd tmp && ar x ../$< && cd -; \
+ $(GCC) -shared -Wl,-soname=liblapacke.so.$(SO) -o $@ tmp/*.o -L. -lblas -llapack; \
+ rm -rf tmp
+
+liblapacke.so.$(SO): liblapacke.so.$(VERS)
+ cd lapacke; \
+ ln -snf $< $@
+
+liblapacke.so: liblapacke.so.$(SO)
+ cd lapacke; \
+ ln -snf $< $@
+
+liblapacke.a: make.inc testing/Makefile
+ echo "Building liblapacke.a"
+ cd lapacke; \
+ $(MAKE) CFLAGS="$(OPTOPTS)"; \
+ mv lapacke.a $@
+
+BF:=liblapack.a liblapack_pic.a liblapack.so liblapacke.a liblapacke_pic.a liblapacke.so
build: $(BF) make.inc
@@ -179,10 +162,7 @@
TESF:=$(addprefix testing/,$(addsuffix .out,$(TESF)))
-libblas.so:
- cp -d debian/tmp/usr/lib/libblas/libblas.so.$(SO).* libblas.so
-
-$(TB) $(TESF): libblas.so liblapack.so
+$(TB) $(TESF): liblapack.so
chmod +x debian/trun
grep -q debian/trun testing/Makefile \
|| sed -i -e "s,\./x,$(ignore_testing_failures)../debian/trun $(TIMEOUT) ./x,g" testing/Makefile
@@ -193,6 +173,7 @@
tail -f --pid=$$j --retry $(TESF) & \
wait $$j
+
$(subst testing,debian/test,$(TESF)):\
debian/test/%: testing/%
mkdir -m 777 -p $(@D)
@@ -235,16 +216,14 @@
install -m 755 $< $(@D)
-IF:=$(addprefix liblapack.,a so so.$(SO) so.$(VERS)) liblapack_pic.a
-IF:=$(addprefix debian/tmp/usr/lib/lapack/,$(IF))
-IF:=$(IF) $(addprefix debian/tmp/usr/lib/liblapack3gf/,$(subst testing/,,$(TB)))
+#IF:=$(addprefix liblapack.,a so so.$(SO) so.$(VERS)) liblapack_pic.a
+#IF:=$(addprefix debian/tmp/usr/lib/lapack/,$(IF))
+#IF:=$(IF) $(addprefix debian/tmp/usr/lib/liblapack3gf/,$(subst testing/,,$(TB)))
install: $(IF) $(MF3) debian/test_results debian/liblapack3gf.templates
-# Delete the empty man page
- rm man/manl/zbcon.$(MANEXT)
dh_testdir
dh_testroot
- dh_movefiles
+# dh_movefiles
#
@@ -258,11 +237,11 @@
dh_testdir
dh_testroot
rm -rf debian/*_stamp debian/*_results lib* testing/*out
- find man -name "*.$(MANEXT)" -exec rm {} \;
+# find man -name "*.$(MANEXT)" -exec rm {} \;
rm -rf *.a install/test* debian/test/ debian/time/
rm -f debian/test_results debian/liblapack3gf.templates
rm -f testing/tmp
-
+ cd lapacke && $(MAKE) clean
touch TESTING/xlinfoo TESTING/xeigfoo && $(MAKE) clean
rm -f make.inc
@@ -279,11 +258,10 @@
# Build architecture-independent files here.
-binary-indep: install
+binary-indep: doc install
dh_testdir -i
dh_testroot -i
- rm -f debian/liblapack-doc/usr/share/doc/liblapack-doc/lug/index.html
- rm -f debian/liblapack-doc/usr/share/doc/liblapack-doc/lug/robots.txt
+ dh_install -i
dh_installdocs -i
dh_installexamples -i
dh_installman -i -pliblapack-doc
@@ -303,6 +281,7 @@
binary-arch: install
dh_testdir -a
dh_testroot -a
+ dh_install -a
dh_installdocs -a
dh_installdebconf -a
dh_installexamples -a
@@ -312,16 +291,13 @@
dh_strip -a
dh_compress -a
dh_fixperms -a
- dh_makeshlibs -a -n -V "liblapack3gf | liblapack.so.3gf | libatlas3gf-base"
+ dh_makeshlibs -a
dh_installdeb -a
dh_shlibdeps -a -l $$(pwd)
- dh_gencontrol -a #-u"-Vg77=$(F77)"
+ dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
binary: binary-indep binary-arch
.PHONY: clean binary-indep binary-arch binary \
- debian/lapackqref.ps debian/manpages.tgz lug/index.html \
- debian/release_notes.html debian/faq.html debian/errata.lug \
- debian/installation.hints doc\
- build
+ doc build
More information about the debian-science-commits
mailing list