r46379 - in /packages/superlu/trunk/debian: ./ patches/
sebastien at users.alioth.debian.org
sebastien at users.alioth.debian.org
Wed Nov 27 21:40:08 UTC 2013
Author: sebastien
Date: Wed Nov 27 21:40:07 2013
New Revision: 46379
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46379
Log:
* Repackage the upstream tarball to remove non-free code (mc64{a,i}d
functions)
* As a consequence, provide stubs for these functions in no-mc64ad.patch:
if the removed functionality is used, the library will simply abort.
* Document the removed functionality in README.Debian.
* debian/copyright: rewrite using machine-readable format 1.0.
* Use new scheme for BLAS dependencies.
* Remove the broken infrastructure for running tests from /usr/share/doc.
* Add new libsuperlu-doc package.
Added:
packages/superlu/trunk/debian/libsuperlu-doc.doc-base.manual
packages/superlu/trunk/debian/libsuperlu-doc.doc-base.userguide
packages/superlu/trunk/debian/libsuperlu-doc.docs
packages/superlu/trunk/debian/libsuperlu-doc.examples
packages/superlu/trunk/debian/orig-tar.sh (with props)
packages/superlu/trunk/debian/patches/mc64ad-stub.patch
Removed:
packages/superlu/trunk/debian/patches/fixbuild.patch
Modified:
packages/superlu/trunk/debian/README.Debian
packages/superlu/trunk/debian/changelog
packages/superlu/trunk/debian/control
packages/superlu/trunk/debian/copyright
packages/superlu/trunk/debian/libsuperlu4-dev.install
packages/superlu/trunk/debian/patches/Makefile.patch
packages/superlu/trunk/debian/patches/series
packages/superlu/trunk/debian/rules
packages/superlu/trunk/debian/watch
Modified: packages/superlu/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/README.Debian?rev=46379&op=diff
==============================================================================
--- packages/superlu/trunk/debian/README.Debian (original)
+++ packages/superlu/trunk/debian/README.Debian Wed Nov 27 21:40:07 2013
@@ -1,17 +1,20 @@
SuperLU for Debian
-------------------
+==================
SuperLU might be useful in conjunction with some other packages like:
petsc or arpack. Otherwise it is widely used in the scientific
computing community.
-I wrote a little script so that you can run the SuperLU tests.
-Just type:
-sh /usr/share/doc/libsuperlu-dev/runtests.sh /tmp
+Warning about removed functionality
+-----------------------------------
-it will run all the tests in /tmp/tests. Check the .out files to see
-what happened in each tests.
+Since version 4.3, SuperLU contains non-free code, which is used for implemented
+the so-called MC64 functionality. This code has been stripped from the Debian
+package.
+Concretely, this means that you cannot use 'options->RowPerm = LargeDiag' for the
+{S,D,C,Z}GSISX routines.
+ -- Sébastien Villemot <sebastien at debian.org>, Wed, 27 Nov 2013 22:21:06 +0100
-- Christophe Prud'homme <prudhomm at debian.org>, Fri, 7 Apr 2006 09:45:25 +0200
Modified: packages/superlu/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/changelog?rev=46379&op=diff
==============================================================================
--- packages/superlu/trunk/debian/changelog (original)
+++ packages/superlu/trunk/debian/changelog Wed Nov 27 21:40:07 2013
@@ -1,31 +1,36 @@
-superlu (4.3.dfsg-1.1) unstable; urgency=low
+superlu (4.3+dfsg-1) UNRELEASED; urgency=low
- * Non-maintainer upload.
- * New upstream release
+ [ Sébastien Villemot ]
+ * Repackage the upstream tarball to remove non-free code (mc64{a,i}d
+ functions)
+ * As a consequence, provide stubs for these functions in no-mc64ad.patch:
+ if the removed functionality is used, the library will simply abort.
+ * Document the removed functionality in README.Debian.
+ * debian/copyright: rewrite using machine-readable format 1.0.
+ * Use new scheme for BLAS dependencies.
+ * Remove the broken infrastructure for running tests from /usr/share/doc.
+ * Add new libsuperlu-doc package.
+
+ [ Christophe Trophime ]
+ * New upstream release (Closes: #709165)
* debian/rules:
- - swith from cdbs to debhelper
+ - switch to debhelper
- simplify rules
* Add patch format-security.patch
* Add patch Makefile.patch
- * Add debian/source
+ * Convert to 3.0 (quilt) source format
* debian/control: updated Standards-Version to 3.9.3
-
- -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Fri, 22 Jun 2012 17:05:57 +0200
-superlu (4.0-1) unstable; urgency=low
-
- [Daniel Leidert]
+ [ Daniel Leidert ]
* debian/control: Added Homepage field.
(Vcs-Svn): Fixed.
(Depends): ${Source-Version} is deprecated (make the package binNMU safe).
* debian/dirs: Dropped.
* debian/rules (clean): Fixed debian-rules-ignores-make-clean-error.
- [Christophe Prud'homme]
- * New upstream release
- * debian/{control,rules}: use cdbs now
+ [ Christophe Prud'homme ]
+ * New upstream release (4.0)
* Fixed all lintian warnings
- * debian/control: updated Standards-Version to 3.8.2
-- Christophe Prud'homme <prudhomm at debian.org> Sat, 01 Aug 2009 19:32:45 +0200
Modified: packages/superlu/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/control?rev=46379&op=diff
==============================================================================
--- packages/superlu/trunk/debian/control (original)
+++ packages/superlu/trunk/debian/control Wed Nov 27 21:40:07 2013
@@ -3,16 +3,16 @@
Section: devel
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: debhelper (>= 9), gcc (>= 3.0), csh, libblas-dev | libblas-3gf.so
+Build-Depends: debhelper (>= 9), gcc (>= 3.0), csh, libblas-dev | libblas.so
Standards-Version: 3.9.3
-Homepage: http://crd.lbl.gov/~xiaoye/SuperLU/
+Homepage: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/superlu/trunk
Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk
Package: libsuperlu4
Section: libs
Architecture: any
-Depends: libblas3gf, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Direct solution of large, sparse systems of linear equations
SuperLU is a general purpose library for the direct solution of
large, sparse, nonsymmetric systems of linear equations on high
@@ -34,6 +34,7 @@
Section: libdevel
Architecture: any
Depends: libsuperlu4 (= ${binary:Version}), libblas-dev, ${misc:Depends}
+Suggests: libsuperlu-doc
Conflicts: libsuperlu3-dev
Description: Direct solution of large, sparse systems of linear equations
Development files for SuperLU.
@@ -78,3 +79,10 @@
the relative backward error, and estimate error bounds for the refined
solutions.
+Package: libsuperlu-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Documentation for SuperLU
+ This package contains the user guide and the reference manual of SuperLU.
+ It also includes some example programs.
Modified: packages/superlu/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/copyright?rev=46379&op=diff
==============================================================================
--- packages/superlu/trunk/debian/copyright (original)
+++ packages/superlu/trunk/debian/copyright Wed Nov 27 21:40:07 2013
@@ -1,42 +1,143 @@
-This package was debianized by Christophe Prud'homme <prudhomm at debian.org> on
-Mon, 26 Jul 2004 14:14:12 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: SuperLU
+Upstream-Contact: xsli at lbl.gov
+Source: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
+ The following non-free files were removed from the upstream tarball:
+ SRC/mc64ad.c SRC/mc64ad.f.bak MATLAB/spypart.m MATLAB/time.m
-It was downloaded from http://crd.lbl.gov/~xiaoye/SuperLU/superlu_3.0.tar.gz
+Files: *
+Copyright: 2003, The Regents of the University of California, through Lawrence
+ Berkeley National Laboratory (subject to receipt of any required
+ approvals from U.S. Dept. of Energy)
+License: BSD-3-clause
-Upstream Authors:
-Jim Demmel
-John Gilbert
-Xiaoye (Sherry) Li
+Files: MATLAB/copyright.m
+ MATLAB/permutation.m
+ MATLAB/lusolve.m
+ MATLAB/resetrandoms.m
+ MATLAB/spart2.m
+ MATLAB/superlu.m
+ MATLAB/try2.m
+ MATLAB/try3.m
+ MATLAB/try4.m
+ MATLAB/trylusolve.m
+ MATLAB/trysuperlu.m
+ MATLAB/trytime.m
+ SRC/ccolumn_bmod.c
+ SRC/ccolumn_dfs.c
+ SRC/ccopy_to_ucol.c
+ SRC/cgstrf.c
+ SRC/cgstrs.c
+ SRC/cpanel_bmod.c
+ SRC/cpanel_dfs.c
+ SRC/cpivotL.c
+ SRC/cpruneL.c
+ SRC/csnode_bmod.c
+ SRC/csnode_dfs.c
+ SRC/cutil.c
+ SRC/dcolumn_bmod.c
+ SRC/dcolumn_dfs.c
+ SRC/dcopy_to_ucol.c
+ SRC/dgstrf.c
+ SRC/dgstrs.c
+ SRC/dpanel_bmod.c
+ SRC/dpanel_dfs.c
+ SRC/dpivotL.c
+ SRC/dpruneL.c
+ SRC/dsnode_bmod.c
+ SRC/dsnode_dfs.c
+ SRC/dutil.c
+ SRC/heap_relax_snode.c
+ SRC/relax_snode.c
+ SRC/scolumn_bmod.c
+ SRC/scolumn_dfs.c
+ SRC/scopy_to_ucol.c
+ SRC/sgstrf.c
+ SRC/sgstrs.c
+ SRC/sp_coletree.c
+ SRC/spanel_bmod.c
+ SRC/spanel_dfs.c
+ SRC/spivotL.c
+ SRC/spruneL.c
+ SRC/ssnode_bmod.c
+ SRC/ssnode_dfs.c
+ SRC/sutil.c
+ SRC/util.c
+ SRC/zcolumn_bmod.c
+ SRC/zcolumn_dfs.c
+ SRC/zcopy_to_ucol.c
+ SRC/zgstrf.c
+ SRC/zgstrs.c
+ SRC/zpanel_bmod.c
+ SRC/zpanel_dfs.c
+ SRC/zpivotL.c
+ SRC/zpruneL.c
+ SRC/zsnode_bmod.c
+ SRC/zsnode_dfs.c
+ SRC/zutil.c
+Copyright: 1990-1995 Xerox Corporation
+License: permissive
+ THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY
+ EXPRESSED OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
+ .
+ Permission is hereby granted to use or copy this program for any
+ purpose, provided the above notices are retained on all copies.
+ Permission to modify the code and to distribute modified code is
+ granted, provided the above notices are retained, and a notice that
+ the code was modified is included with the above copyright notice.
-Copyright:
+Files: EXAMPLE/cfgmr.c
+ EXAMPLE/dfgmr.c
+ EXAMPLE/sfgmr.c
+ EXAMPLE/zfgmr.c
+Copyright: 2006, the University of Minnesota
+License: GPL-2+
+ ITSOL is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free
+ Software Foundation [version 2 of the License, or any later version]
+ For details, see
+ .
+ http://www.gnu.org/copyleft/gpl.html
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
-Copyright (c) 2003, The Regents of the University of California, through
-Lawrence Berkeley National Laboratory (subject to receipt of any required
-approvals from U.S. Dept. of Energy)
+Files: SRC/colamd.c
+ SRC/colamd.h
+Copyright: 1998-2003 the University of Florida
+License: permissive
+ THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY
+ EXPRESSED OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
+ .
+ Permission is hereby granted to use, copy, modify, and/or distribute
+ this program, provided that the Copyright, this License, and the
+ Availability of the original version is retained on all copies and made
+ accessible to the end-user of any code or package that includes COLAMD
+ or any modified version of COLAMD.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-(1) Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-(2) Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-(3) Neither the name of Lawrence Berkeley National Laboratory, U.S. Dept. of
-Energy nor the names of its contributors may be used to endorse or promote
-products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+ (1) Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ (2) Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ (3) Neither the name of Lawrence Berkeley National Laboratory, U.S. Dept. of
+ Energy nor the names of its contributors may be used to endorse or promote
+ products derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
Added: packages/superlu/trunk/debian/libsuperlu-doc.doc-base.manual
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/libsuperlu-doc.doc-base.manual?rev=46379&op=file
==============================================================================
--- packages/superlu/trunk/debian/libsuperlu-doc.doc-base.manual (added)
+++ packages/superlu/trunk/debian/libsuperlu-doc.doc-base.manual Wed Nov 27 21:40:07 2013
@@ -0,0 +1,7 @@
+Document: libsuperlu-manual
+Title: SuperLU Reference Manual
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libsuperlu-doc/html/index.html
+Files: /usr/share/doc/libsuperlu-doc/html/*
Added: packages/superlu/trunk/debian/libsuperlu-doc.doc-base.userguide
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/libsuperlu-doc.doc-base.userguide?rev=46379&op=file
==============================================================================
--- packages/superlu/trunk/debian/libsuperlu-doc.doc-base.userguide (added)
+++ packages/superlu/trunk/debian/libsuperlu-doc.doc-base.userguide Wed Nov 27 21:40:07 2013
@@ -0,0 +1,6 @@
+Document: libsuperlu-userguide
+Title: SuperLU User Guide
+Section: Programming
+
+Format: PDF
+Files: /usr/share/doc/libsuperlu-doc/ug.pdf.gz
Added: packages/superlu/trunk/debian/libsuperlu-doc.docs
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/libsuperlu-doc.docs?rev=46379&op=file
==============================================================================
--- packages/superlu/trunk/debian/libsuperlu-doc.docs (added)
+++ packages/superlu/trunk/debian/libsuperlu-doc.docs Wed Nov 27 21:40:07 2013
@@ -0,0 +1,2 @@
+DOC/html/
+DOC/ug.pdf
Added: packages/superlu/trunk/debian/libsuperlu-doc.examples
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/libsuperlu-doc.examples?rev=46379&op=file
==============================================================================
--- packages/superlu/trunk/debian/libsuperlu-doc.examples (added)
+++ packages/superlu/trunk/debian/libsuperlu-doc.examples Wed Nov 27 21:40:07 2013
@@ -0,0 +1,4 @@
+EXAMPLE/*.c
+EXAMPLE/*.rua
+EXAMPLE/README
+EXAMPLE/Makefile
Modified: packages/superlu/trunk/debian/libsuperlu4-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/libsuperlu4-dev.install?rev=46379&op=diff
==============================================================================
--- packages/superlu/trunk/debian/libsuperlu4-dev.install (original)
+++ packages/superlu/trunk/debian/libsuperlu4-dev.install Wed Nov 27 21:40:07 2013
@@ -1,8 +1,3 @@
libsuperlu.so /usr/lib
libsuperlu.a /usr/lib
SRC/*.h /usr/include/superlu
-README /usr/share/doc/libsuperlu-dev
-EXAMPLE/* /usr/share/doc/libsuperlu-dev/examples
-TESTING/* /usr/share/doc/libsuperlu-dev/tests
-make.inc /usr/share/doc/libsuperlu-dev/
-debian/runtests.sh /usr/share/doc/libsuperlu-dev/
Added: packages/superlu/trunk/debian/orig-tar.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/orig-tar.sh?rev=46379&op=file
==============================================================================
--- packages/superlu/trunk/debian/orig-tar.sh (added)
+++ packages/superlu/trunk/debian/orig-tar.sh Wed Nov 27 21:40:07 2013
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=SuperLU_$2
+DIRTARGET=superlu-$2
+TAR=../superlu_$2+dfsg.orig.tar.xz
+
+# clean up the upstream tarball by removing non-free files
+tar xaf $3
+mv $DIR $DIRTARGET
+rm -f $DIRTARGET/SRC/mc64ad.c $DIRTARGET/SRC/mc64ad.f.bak $DIRTARGET/MATLAB/spypart.m $DIRTARGET/MATLAB/time.m
+tar caf $TAR $DIRTARGET
+rm -rf $DIRTARGET
+
+echo Created repackaged tarball $TAR
Propchange: packages/superlu/trunk/debian/orig-tar.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/superlu/trunk/debian/patches/Makefile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/patches/Makefile.patch?rev=46379&op=diff
==============================================================================
--- packages/superlu/trunk/debian/patches/Makefile.patch (original)
+++ packages/superlu/trunk/debian/patches/Makefile.patch Wed Nov 27 21:40:07 2013
@@ -1,7 +1,5 @@
-Index: superlu-4.3/EXAMPLE/Makefile
-===================================================================
---- superlu-4.3.orig/EXAMPLE/Makefile 2013-09-17 14:26:47.000000000 +0200
-+++ superlu-4.3/EXAMPLE/Makefile 2013-09-17 14:26:47.000000000 +0200
+--- a/EXAMPLE/Makefile
++++ b/EXAMPLE/Makefile
@@ -33,14 +33,13 @@
#######################################################################
@@ -197,34 +195,9 @@
-
-
+ rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 superlu
-Index: superlu-4.3/Makefile
-===================================================================
---- superlu-4.3.orig/Makefile 2013-09-17 14:26:47.000000000 +0200
-+++ superlu-4.3/Makefile 2013-09-17 14:26:47.000000000 +0200
-@@ -8,17 +8,16 @@
- #
- # Creation date: October 2, 1995
- #
--# Modified: February 4, 1997 Version 1.0
--# November 15, 1997 Version 1.1
--# September 1, 1999 Version 2.0
--# October 15, 2003 Version 3.0
--# August 1, 2008 Version 3.1
-+# Modified: February 4, 1997 Version 1.0
-+# November 15, 1997 Version 1.1
-+# September 1, 1999 Version 2.0
-+# October 15, 2003 Version 3.0
- #
- ############################################################################
-
- include make.inc
-
--all: install lib
-+all: install lib testing
-
- lib: superlulib tmglib
-
-@@ -44,9 +43,6 @@
+--- a/Makefile
++++ b/Makefile
+@@ -44,9 +44,6 @@
testing:
( cd TESTING ; $(MAKE) )
@@ -234,11 +207,9 @@
cleanlib:
( cd SRC; $(MAKE) clean )
( cd TESTING/MATGEN; $(MAKE) clean )
-Index: superlu-4.3/SRC/Makefile
-===================================================================
---- superlu-4.3.orig/SRC/Makefile 2013-09-17 14:26:47.000000000 +0200
-+++ superlu-4.3/SRC/Makefile 2013-09-17 14:30:08.000000000 +0200
-@@ -114,24 +108,24 @@
+--- a/SRC/Makefile
++++ b/SRC/Makefile
+@@ -114,24 +114,24 @@
all: single double complex complex16
single: $(SLUSRC) $(ALLAUX) $(LAAUX) $(SLASRC) $(SCLAUX)
@@ -271,7 +242,7 @@
##################################
-@@ -145,8 +139,5 @@
+@@ -145,8 +145,5 @@
.c.o:
$(CC) $(CFLAGS) $(CDEFS) $(BLASDEF) -c $< $(VERBOSE)
@@ -281,10 +252,8 @@
clean:
- rm -f *.o $(SUPERLULIB)
+ rm -f *.o libsuperlu.*
-Index: superlu-4.3/make.inc
-===================================================================
---- superlu-4.3.orig/make.inc 2013-09-17 14:26:47.000000000 +0200
-+++ superlu-4.3/make.inc 2013-09-17 14:26:47.000000000 +0200
+--- a/make.inc
++++ b/make.inc
@@ -16,26 +16,14 @@
#
# The machine (platform) identifier to append to the library names
@@ -343,10 +312,8 @@
-MATLAB = /usr/sww/matlab
-
+MATLAB = /opt/matlab
-Index: superlu-4.3/TESTING/Makefile
-===================================================================
---- superlu-4.3.orig/TESTING/Makefile 2013-09-17 14:26:47.000000000 +0200
-+++ superlu-4.3/TESTING/Makefile 2013-09-17 14:26:47.000000000 +0200
+--- a/TESTING/Makefile
++++ b/TESTING/Makefile
@@ -52,9 +52,9 @@
single: ./stest stest.out
Added: packages/superlu/trunk/debian/patches/mc64ad-stub.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/patches/mc64ad-stub.patch?rev=46379&op=file
==============================================================================
--- packages/superlu/trunk/debian/patches/mc64ad-stub.patch (added)
+++ packages/superlu/trunk/debian/patches/mc64ad-stub.patch Wed Nov 27 21:40:07 2013
@@ -0,0 +1,25 @@
+Description: Provide stubs for the two functions whose implementation is nonfree
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-11-27
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- /dev/null
++++ b/SRC/mc64ad.c
+@@ -0,0 +1,16 @@
++#include <stdio.h>
++#include <stdlib.h>
++
++void mc64id_(int *a)
++{
++ fprintf(stderr, "SuperLU: MC64 functionality not available (it uses non-free code). Aborting.\n");
++ abort();
++}
++
++void mc64ad_(int *a, int *b, int *c, int d[], int e[], double f[],
++ int *g, int h[], int *i, int j[], int *k, double l[],
++ int m[], int n[])
++{
++ fprintf(stderr, "SuperLU: MC64 functionality not available (it uses non-free code). Aborting.\n");
++ abort();
++}
Modified: packages/superlu/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/patches/series?rev=46379&op=diff
==============================================================================
--- packages/superlu/trunk/debian/patches/series (original)
+++ packages/superlu/trunk/debian/patches/series Wed Nov 27 21:40:07 2013
@@ -1,3 +1,3 @@
-fixbuild.patch
format-security.patch
Makefile.patch
+mc64ad-stub.patch
Modified: packages/superlu/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/rules?rev=46379&op=diff
==============================================================================
--- packages/superlu/trunk/debian/rules (original)
+++ packages/superlu/trunk/debian/rules Wed Nov 27 21:40:07 2013
@@ -25,17 +25,17 @@
cd SRC && $(MAKE) clean
cd SRC && $(MAKE) NOOPTS="-fPIC" CFLAGS="$(CFLAGS) -fPIC -pipe" DEBUGFLAGS="-DNDEBUG" LDFLAGS="$(LDFLAGS)"
- cd SRC && gcc -shared -Wl,-soname,libsuperlu.so.$(major) -o ../libsuperlu.so.$(version) `ls *.o` -lblas -lm
+ cd SRC && gcc -shared $(LDFLAGS) -Wl,-soname,libsuperlu.so.$(major) -o ../libsuperlu.so.$(version) `ls *.o` -lblas -lm
ln -sf libsuperlu.so.$(version) libsuperlu.so.$(major)
ln -sf libsuperlu.so.$(version) libsuperlu.so
cd SRC && $(MAKE) clean
override_dh_auto_clean:
[ ! -f Makefile ] || $(MAKE) clean
+ rm -f libsuperlu.a libsuperlu.so*
override_dh_strip:
dh_strip --dbg-package=libsuperlu4-dbg
- dh_strip
override_dh_auto_test:
cd TESTING && $(MAKE)
Modified: packages/superlu/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/watch?rev=46379&op=diff
==============================================================================
--- packages/superlu/trunk/debian/watch (original)
+++ packages/superlu/trunk/debian/watch Wed Nov 27 21:40:07 2013
@@ -1,3 +1,3 @@
version=3
-opts=dversionmangle=s/\.dfsg// \
- http://crd.lbl.gov/~xiaoye/SuperLU/superlu_([\d.]+)\.tar\.gz
+opts=dversionmangle=s/\+dfsg// \
+http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) debian debian/orig-tar.sh
More information about the debian-science-commits
mailing list