r38668 - in /packages/blas/trunk: cblas/ debian/ debian/blas.patch debian/changelog debian/control

Thu Aug 4 23:13:28 UTC 2011

Author: sylvestre
Date: Thu Aug  4 23:13:28 2011
New Revision: 38668

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38668
Log:
new upstream release

Removed:
    packages/blas/trunk/cblas/
Modified:
    packages/blas/trunk/debian/   (props changed)
    packages/blas/trunk/debian/blas.patch
    packages/blas/trunk/debian/changelog
    packages/blas/trunk/debian/control

Propchange: packages/blas/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Modified: packages/blas/trunk/debian/blas.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/blas/trunk/debian/blas.patch?rev=38668&op=diff
==============================================================================

--- packages/blas/trunk/debian/blas.patch (original)
+++ packages/blas/trunk/debian/blas.patch Thu Aug  4 23:13:28 2011
@@ -7019,7 +7019,7 @@
 --- a/src/xerbla.f
 +++ b/src/xerbla.f
 @@ -1,4 +1,4 @@
--      SUBROUTINE XERBLA(SRNAME,INFO)
+-      SUBROUTINE XERBLA( SRNAME, INFO )
 +      SUBROUTINE XERBLI(SRNAME,INFO)
  *
  *  -- LAPACK auxiliary routine (preliminary version) --
@@ -7036,7 +7036,7 @@
 @@ -23,7 +23,7 @@
  *  =========
  *
- *  SRNAME  (input) CHARACTER*6
+ *  SRNAME  (input) CHARACTER*(*)
 -*          The name of the routine which called XERBLA.
 +*          The name of the routine which called XERBLI.
  *
@@ -7771,12 +7771,12 @@
  .SH SYNOPSIS
  .TP 31
  subroutine zscal(n,za,zx,incx)
-Index: b/src/crotg.f
+Index: blas-1.2.orig/src/crotg.f
 ===================================================================
---- a/src/crotg.f
-+++ b/src/crotg.f
-@@ -10,22 +10,23 @@
- *  CROTG determines a complex Givens rotation.
+--- blas-1.2.orig.orig/src/crotg.f	2011-08-05 01:02:50.000000000 +0200
++++ blas-1.2.orig/src/crotg.f	2011-08-05 01:04:13.000000000 +0200
+@@ -12,21 +12,22 @@
+ *  =====================================================================
  *
  *     .. Local Scalars ..
 -      COMPLEX ALPHA
@@ -7788,23 +7788,22 @@
        INTRINSIC CABS,CONJG,SQRT
  *     ..
 +      CABS3(CDUM) = sqrt(real(CDUM)**2 + aimag(CDUM)**2)
-       IF (CABS(CA).NE.0.) GO TO 10
-       C = 0.
-       S = (1.,0.)
-       CA = CB
-       GO TO 20
-    10 CONTINUE
--      SCALE = CABS(CA) + CABS(CB)
--      NORM = SCALE*SQRT((CABS(CA/SCALE))**2+ (CABS(CB/SCALE))**2)
--      ALPHA = CA/CABS(CA)
--      C = CABS(CA)/NORM
-+      SCALE = CABS3(CA) + CABS3(CB)
-+      NORM = SCALE*SQRT((CABS3(CA/SCALE))**2+ (CABS3(CB/SCALE))**2)
-+      ALPHA = CA/CABS3(CA)
-+      C = CABS3(CA)/NORM
-       S = ALPHA*CONJG(CB)/NORM
-       CA = ALPHA*NORM
-    20 CONTINUE
+       IF (CABS(CA).EQ.0.) THEN
+          C = 0.
+          S = (1.,0.)
+          CA = CB
+       ELSE
+-         SCALE = CABS(CA) + CABS(CB)
+-         NORM = SCALE*SQRT((CABS(CA/SCALE))**2+ (CABS(CB/SCALE))**2)
+-         ALPHA = CA/CABS(CA)
+-         C = CABS(CA)/NORM
++         SCALE = CABS3(CA) + CABS3(CB)
++	 NORM = SCALE*SQRT((CABS3(CA/SCALE))**2+ (CABS3(CB/SCALE))**2)
++	 ALPHA = CA/CABS3(CA)
++	 C = CABS3(CA)/NORM
+          S = ALPHA*CONJG(CB)/NORM
+          CA = ALPHA*NORM
+       END IF
 --- a/cblas/testing/c_xerbla.c	1999-03-16 01:43:14.000000000 +0530
 +++ b/cblas/testing/c_xerbla.c	2007-12-29 21:59:21.000000000 +0530
 @@ -5,12 +5,14 @@

Modified: packages/blas/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/blas/trunk/debian/changelog?rev=38668&op=diff
==============================================================================
--- packages/blas/trunk/debian/changelog (original)
+++ packages/blas/trunk/debian/changelog Thu Aug  4 23:13:28 2011
@@ -1,3 +1,13 @@
+blas (1.2.20110419-1) unstable; urgency=low
+
+  * New upstream release
+    - Fix the FTBFS due to changes in the returned values (Closes: #625723)
+      (LP: #765998)
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Standards-Version updated to version 3.9.2
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 05 Aug 2011 00:40:45 +0200
+
 blas (1.2-8) unstable; urgency=low
 
   [ Kumar Appaiah ]

Modified: packages/blas/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/blas/trunk/debian/control?rev=38668&op=diff
==============================================================================
--- packages/blas/trunk/debian/control (original)
+++ packages/blas/trunk/debian/control Thu Aug  4 23:13:28 2011
@@ -2,9 +2,8 @@
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>
-Standards-Version: 3.8.4
-Build-Depends: gfortran, debhelper ( >= 5 ), 
- texlive-latex-recommended
+Standards-Version: 3.9.2
+Build-Depends: gfortran, debhelper ( >= 5 ), texlive-latex-recommended
 Section: libs
 Homepage: http://www.netlib.org/blas/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/blas/trunk/


