r45169 - in /packages/superlu/trunk: ./ EXAMPLE/ SRC/ TESTING/ debian/ debian/patches/ debian/source/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Fri Jun 29 16:46:07 UTC 2012
Author: trophime-guest
Date: Fri Jun 29 16:46:06 2012
New Revision: 45169
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45169
Log:
some cleanup and update to 4.3
Added:
packages/superlu/trunk/debian/patches/Makefile.patch
packages/superlu/trunk/debian/patches/format-security.patch
packages/superlu/trunk/debian/source/
packages/superlu/trunk/debian/source/format
Removed:
packages/superlu/trunk/EXAMPLE/
packages/superlu/trunk/Makefile
packages/superlu/trunk/SRC/
packages/superlu/trunk/TESTING/
packages/superlu/trunk/make.inc
Modified:
packages/superlu/trunk/debian/changelog
packages/superlu/trunk/debian/compat
packages/superlu/trunk/debian/control
packages/superlu/trunk/debian/libsuperlu4-dev.install
packages/superlu/trunk/debian/libsuperlu4.install
packages/superlu/trunk/debian/patches/series
packages/superlu/trunk/debian/rules
Modified: packages/superlu/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/changelog?rev=45169&op=diff
==============================================================================
--- packages/superlu/trunk/debian/changelog (original)
+++ packages/superlu/trunk/debian/changelog Fri Jun 29 16:46:06 2012
@@ -1,3 +1,17 @@
+superlu (4.3-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release
+ * debian/rules:
+ - swith from cdbs to debhelper
+ - simplify rules
+ * Add patch format-security.patch
+ * Add patch Makefile.patch
+ * Add debian/source
+ * 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]
Modified: packages/superlu/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/compat?rev=45169&op=diff
==============================================================================
--- packages/superlu/trunk/debian/compat (original)
+++ packages/superlu/trunk/debian/compat Fri Jun 29 16:46:06 2012
@@ -1,1 +1,1 @@
-5
+9
Modified: packages/superlu/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/control?rev=45169&op=diff
==============================================================================
--- packages/superlu/trunk/debian/control (original)
+++ packages/superlu/trunk/debian/control Fri Jun 29 16:46:06 2012
@@ -3,8 +3,8 @@
Section: devel
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: cdbs, quilt, debhelper (>= 7), gcc (>= 3.0), csh, libblas-dev
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 9), gcc (>= 3.0), csh, libblas-dev | libblas-3gf.so
+Standards-Version: 3.9.3
Homepage: http://crd.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
@@ -35,7 +35,7 @@
Package: libsuperlu4-dev
Section: libdevel
Architecture: any
-Depends: libsuperlu4 (= ${binary:Version}), libblas-dev
+Depends: libsuperlu4 (= ${binary:Version}), libblas-dev, ${misc:Depends}
Conflicts: libsuperlu3-dev
Provides: libsuperlu3-dev
Description: Direct solution of large, sparse systems of linear equations
@@ -58,9 +58,10 @@
solutions.
Package: libsuperlu4-dbg
+Priority: extra
Section: debug
Architecture: any
-Depends: libsuperlu4 (= ${binary:Version})
+Depends: libsuperlu4 (= ${binary:Version}), ${misc:Depends}
Description: Direct solution of large, sparse systems of linear equations
Debug files for SuperLU.
.
Modified: packages/superlu/trunk/debian/libsuperlu4-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/libsuperlu4-dev.install?rev=45169&op=diff
==============================================================================
--- packages/superlu/trunk/debian/libsuperlu4-dev.install (original)
+++ packages/superlu/trunk/debian/libsuperlu4-dev.install Fri Jun 29 16:46:06 2012
@@ -1,5 +1,5 @@
-shared/SRC/libsuperlu.so /usr/lib
-static/libsuperlu.a /usr/lib
+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
Modified: packages/superlu/trunk/debian/libsuperlu4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/libsuperlu4.install?rev=45169&op=diff
==============================================================================
--- packages/superlu/trunk/debian/libsuperlu4.install (original)
+++ packages/superlu/trunk/debian/libsuperlu4.install Fri Jun 29 16:46:06 2012
@@ -1,2 +1,2 @@
-shared/SRC/libsuperlu.so.* /usr/lib
-README /usr/share/doc/libsuperlu3
+libsuperlu.so.* /usr/lib
+README /usr/share/doc/libsuperlu4
Added: packages/superlu/trunk/debian/patches/Makefile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/patches/Makefile.patch?rev=45169&op=file
==============================================================================
--- packages/superlu/trunk/debian/patches/Makefile.patch (added)
+++ packages/superlu/trunk/debian/patches/Makefile.patch Fri Jun 29 16:46:06 2012
@@ -1,0 +1,472 @@
+Index: superlu-4.3/EXAMPLE/Makefile
+===================================================================
+--- superlu-4.3.orig/EXAMPLE/Makefile 2011-10-27 21:49:47.000000000 +0200
++++ superlu-4.3/EXAMPLE/Makefile 2012-06-29 17:57:10.000000000 +0200
+@@ -33,14 +33,13 @@
+ #######################################################################
+
+ HEADER = ../SRC
++LIBS = ../$(SUPERLULIB) $(BLASLIB) -lm
+
+ SLINEXM = slinsol.o
+ SLINEXM1 = slinsol1.o
+ SLINXEXM = slinsolx.o
+ SLINXEXM1 = slinsolx1.o
+ SLINXEXM2 = slinsolx2.o
+-SITSOL = sitersol.o sfgmr.o
+-SITSOL1 = sitersol1.o sfgmr.o
+
+ DLINEXM = dlinsol.o
+ DLINEXM1 = dlinsol1.o
+@@ -48,130 +47,95 @@
+ DLINXEXM1 = dlinsolx1.o
+ DLINXEXM2 = dlinsolx2.o
+ SUPERLUEXM = superlu.o sp_ienv.o
+-DITSOL = ditersol.o dfgmr.o
+-DITSOL1 = ditersol1.o dfgmr.o
+
+ CLINEXM = clinsol.o
+ CLINEXM1 = clinsol1.o
+ CLINXEXM = clinsolx.o
+ CLINXEXM1 = clinsolx1.o
+ CLINXEXM2 = clinsolx2.o
+-CITSOL = citersol.o cfgmr.o
+-CITSOL1 = citersol1.o cfgmr.o
+
+ ZLINEXM = zlinsol.o
+ ZLINEXM1 = zlinsol1.o
+ ZLINXEXM = zlinsolx.o
+ ZLINXEXM1 = zlinsolx1.o
+ ZLINXEXM2 = zlinsolx2.o
+-ZITSOL = zitersol.o zfgmr.o
+-ZITSOL1 = zitersol1.o zfgmr.o
+
+
+ all: single double complex complex16
+
+-single: slinsol slinsol1 slinsolx slinsolx1 slinsolx2 sitersol sitersol1
+-double: dlinsol dlinsol1 dlinsolx dlinsolx1 dlinsolx2 superlu \
+- ditersol ditersol1
+-complex: clinsol clinsol1 clinsolx clinsolx1 clinsolx2 citersol citersol1
+-complex16: zlinsol zlinsol1 zlinsolx zlinsolx1 zlinsolx2 zitersol zitersol1
++single: slinsol slinsol1 slinsolx slinsolx1 slinsolx2
++double: dlinsol dlinsol1 dlinsolx dlinsolx1 dlinsolx2 superlu
++complex: clinsol clinsol1 clinsolx clinsolx1 clinsolx2
++complex16: zlinsol zlinsol1 zlinsolx zlinsolx1 zlinsolx2
+
+-slinsol: $(SLINEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(SLINEXM) $(LIBS) -lm -o $@
++slinsol: $(SLINEXM) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(SLINEXM) $(LIBS) -o $@
+
+-slinsol1: $(SLINEXM1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(SLINEXM1) $(LIBS) -lm -o $@
++slinsol1: $(SLINEXM1) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(SLINEXM1) $(LIBS) -o $@
+
+-slinsolx: $(SLINXEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(SLINXEXM) $(LIBS) -lm -o $@
++slinsolx: $(SLINXEXM) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(SLINXEXM) $(LIBS) -o $@
+
+-slinsolx1: $(SLINXEXM1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(SLINXEXM1) $(LIBS) -lm -o $@
++slinsolx1: $(SLINXEXM1) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(SLINXEXM1) $(LIBS) -o $@
+
+-slinsolx2: $(SLINXEXM2) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(SLINXEXM2) $(LIBS) -lm -o $@
++slinsolx2: $(SLINXEXM2) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(SLINXEXM2) $(LIBS) -o $@
+
+-sitersol: $(SITSOL) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(SITSOL) $(LIBS) -lm -o $@
++dlinsol: $(DLINEXM) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(DLINEXM) $(LIBS) -o $@
+
+-sitersol1: $(SITSOL1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(SITSOL1) $(LIBS) -lm -o $@
++dlinsol1: $(DLINEXM1) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(DLINEXM1) $(LIBS) -o $@
+
+-dlinsol: $(DLINEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(DLINEXM) $(LIBS) -lm -o $@
++dlinsolx: $(DLINXEXM) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(DLINXEXM) $(LIBS) -o $@
+
+-dlinsol1: $(DLINEXM1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(DLINEXM1) $(LIBS) -lm -o $@
++dlinsolx1: $(DLINXEXM1) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(DLINXEXM1) $(LIBS) -o $@
+
+-dlinsolx: $(DLINXEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(DLINXEXM) $(LIBS) -lm -o $@
++dlinsolx2: $(DLINXEXM2) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(DLINXEXM2) $(LIBS) -o $@
+
+-dlinsolx1: $(DLINXEXM1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(DLINXEXM1) $(LIBS) -lm -o $@
++superlu: $(SUPERLUEXM) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(SUPERLUEXM) $(LIBS) -o $@
+
+-dlinsolx2: $(DLINXEXM2) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(DLINXEXM2) $(LIBS) -lm -o $@
++clinsol: $(CLINEXM) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(CLINEXM) $(LIBS) -o $@
+
+-superlu: $(SUPERLUEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(SUPERLUEXM) $(LIBS) -lm -o $@
++clinsol1: $(CLINEXM1) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(CLINEXM1) $(LIBS) -o $@
+
+-ditersol: $(DITSOL) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(DITSOL) $(LIBS) -lm -o $@
++clinsolx: $(CLINXEXM) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(CLINXEXM) $(LIBS) -o $@
+
+-ditersol1: $(DITSOL1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(DITSOL1) $(LIBS) -lm -o $@
++clinsolx1: $(CLINXEXM1) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(CLINXEXM1) $(LIBS) -o $@
+
+-clinsol: $(CLINEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(CLINEXM) $(LIBS) -lm -o $@
++clinsolx2: $(CLINXEXM2) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(CLINXEXM2) $(LIBS) -o $@
+
+-clinsol1: $(CLINEXM1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(CLINEXM1) $(LIBS) -lm -o $@
++zlinsol: $(ZLINEXM) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(ZLINEXM) $(LIBS) -o $@
+
+-clinsolx: $(CLINXEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(CLINXEXM) $(LIBS) -lm -o $@
++zlinsol1: $(ZLINEXM1) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(ZLINEXM1) $(LIBS) -o $@
+
+-clinsolx1: $(CLINXEXM1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(CLINXEXM1) $(LIBS) -lm -o $@
++zlinsolx: $(ZLINXEXM) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(ZLINXEXM) $(LIBS) -o $@
+
+-clinsolx2: $(CLINXEXM2) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(CLINXEXM2) $(LIBS) -lm -o $@
++zlinsolx1: $(ZLINXEXM1) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(ZLINXEXM1) $(LIBS) -o $@
+
+-citersol: $(CITSOL) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(CITSOL) $(LIBS) -lm -o $@
+-
+-citersol1: $(CITSOL1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(CITSOL1) $(LIBS) -lm -o $@
+-
+-zlinsol: $(ZLINEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(ZLINEXM) $(LIBS) -lm -o $@
+-
+-zlinsol1: $(ZLINEXM1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(ZLINEXM1) $(LIBS) -lm -o $@
+-
+-zlinsolx: $(ZLINXEXM) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(ZLINXEXM) $(LIBS) -lm -o $@
+-
+-zlinsolx1: $(ZLINXEXM1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(ZLINXEXM1) $(LIBS) -lm -o $@
+-
+-zlinsolx2: $(ZLINXEXM2) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(ZLINXEXM2) $(LIBS) -lm -o $@
+-
+-zitersol: $(ZITSOL) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(ZITSOL) $(LIBS) -lm -o $@
+-
+-zitersol1: $(ZITSOL1) $(SUPERLULIB)
+- $(LOADER) $(LOADOPTS) $(ZITSOL1) $(LIBS) -lm -o $@
++zlinsolx2: $(ZLINXEXM2) ../$(SUPERLULIB)
++ $(LOADER) $(LOADOPTS) $(ZLINXEXM2) $(LIBS) -o $@
+
+ .c.o:
+- $(CC) $(CFLAGS) $(CDEFS) -I$(HEADER) -c $< $(VERBOSE)
++ $(CC) $(CFLAGS) -I$(HEADER) -c $< $(VERBOSE)
+
+ .f.o:
+ $(FORTRAN) $(FFLAGS) -c $< $(VERBOSE)
+
+ clean:
+- rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 \
+- superlu *itersol
+-
+-
+-
++ rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 superlu
+Index: superlu-4.3/Makefile
+===================================================================
+--- superlu-4.3.orig/Makefile 2012-06-29 17:57:10.000000000 +0200
++++ superlu-4.3/Makefile 2012-06-29 17:57:10.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 @@
+ testing:
+ ( cd TESTING ; $(MAKE) )
+
+-doc:
+- doxygen Doxyfile
+-
+ cleanlib:
+ ( cd SRC; $(MAKE) clean )
+ ( cd TESTING/MATGEN; $(MAKE) clean )
+Index: superlu-4.3/SRC/Makefile
+===================================================================
+--- superlu-4.3.orig/SRC/Makefile 2011-10-27 21:49:47.000000000 +0200
++++ superlu-4.3/SRC/Makefile 2012-06-29 17:57:10.000000000 +0200
+@@ -49,9 +49,7 @@
+ ### SuperLU
+ ALLAUX = superlu_timer.o util.o memory.o get_perm_c.o mmd.o \
+ sp_coletree.o sp_preorder.o sp_ienv.o relax_snode.o \
+- heap_relax_snode.o colamd.o \
+- ilu_relax_snode.o ilu_heap_relax_snode.o mark_relax.o \
+- mc64ad.o qselect.o
++ heap_relax_snode.o colamd.o
+
+ SLUSRC = \
+ sgssv.o sgssvx.o \
+@@ -59,79 +57,59 @@
+ slangs.o sgsequ.o slaqgs.o spivotgrowth.o \
+ sgsrfs.o sgstrf.o sgstrs.o scopy_to_ucol.o \
+ ssnode_dfs.o ssnode_bmod.o \
+- spanel_dfs.o spanel_bmod.o \
+- sreadhb.o sreadrb.o sreadtriple.o \
++ spanel_dfs.o spanel_bmod.o sreadhb.o \
+ scolumn_dfs.o scolumn_bmod.o spivotL.o spruneL.o \
+- smemory.o sutil.o smyblas2.o \
+- sgsisx.o sgsitrf.o sldperm.o \
+- ilu_sdrop_row.o ilu_ssnode_dfs.o \
+- ilu_scolumn_dfs.o ilu_spanel_dfs.o ilu_scopy_to_ucol.o \
+- ilu_spivotL.o sdiagonal.o
++ smemory.o sutil.o smyblas2.o
+
+ DLUSRC = \
+ dgssv.o dgssvx.o \
+ dsp_blas2.o dsp_blas3.o dgscon.o \
+ dlangs.o dgsequ.o dlaqgs.o dpivotgrowth.o \
+ dgsrfs.o dgstrf.o dgstrs.o dcopy_to_ucol.o \
+- dsnode_dfs.o dsnode_bmod.o dpanel_dfs.o dpanel_bmod.o \
+- dreadhb.o dreadrb.o dreadtriple.o \
++ dsnode_dfs.o dsnode_bmod.o \
++ dpanel_dfs.o dpanel_bmod.o dreadhb.o \
+ dcolumn_dfs.o dcolumn_bmod.o dpivotL.o dpruneL.o \
+- dmemory.o dutil.o dmyblas2.o \
+- dgsisx.o dgsitrf.o dldperm.o \
+- ilu_ddrop_row.o ilu_dsnode_dfs.o \
+- ilu_dcolumn_dfs.o ilu_dpanel_dfs.o ilu_dcopy_to_ucol.o \
+- ilu_dpivotL.o ddiagonal.o
+- ## dgstrsL.o dgstrsU.o
++ dmemory.o dutil.o dmyblas2.o
+
+ CLUSRC = \
+ scomplex.o cgssv.o cgssvx.o csp_blas2.o csp_blas3.o cgscon.o \
+ clangs.o cgsequ.o claqgs.o cpivotgrowth.o \
+ cgsrfs.o cgstrf.o cgstrs.o ccopy_to_ucol.o \
+ csnode_dfs.o csnode_bmod.o \
+- cpanel_dfs.o cpanel_bmod.o \
+- creadhb.o creadrb.o creadtriple.o \
++ cpanel_dfs.o cpanel_bmod.o creadhb.o \
+ ccolumn_dfs.o ccolumn_bmod.o cpivotL.o cpruneL.o \
+- cmemory.o cutil.o cmyblas2.o \
+- cgsisx.o cgsitrf.o cldperm.o \
+- ilu_cdrop_row.o ilu_csnode_dfs.o \
+- ilu_ccolumn_dfs.o ilu_cpanel_dfs.o ilu_ccopy_to_ucol.o \
+- ilu_cpivotL.o cdiagonal.o
++ cmemory.o cutil.o cmyblas2.o
+
+ ZLUSRC = \
+ dcomplex.o zgssv.o zgssvx.o zsp_blas2.o zsp_blas3.o zgscon.o \
+ zlangs.o zgsequ.o zlaqgs.o zpivotgrowth.o \
+ zgsrfs.o zgstrf.o zgstrs.o zcopy_to_ucol.o \
+ zsnode_dfs.o zsnode_bmod.o \
+- zpanel_dfs.o zpanel_bmod.o \
+- zreadhb.o zreadrb.o zreadtriple.o \
++ zpanel_dfs.o zpanel_bmod.o zreadhb.o \
+ zcolumn_dfs.o zcolumn_bmod.o zpivotL.o zpruneL.o \
+- zmemory.o zutil.o zmyblas2.o \
+- zgsisx.o zgsitrf.o zldperm.o \
+- ilu_zdrop_row.o ilu_zsnode_dfs.o \
+- ilu_zcolumn_dfs.o ilu_zpanel_dfs.o ilu_zcopy_to_ucol.o \
+- ilu_zpivotL.o zdiagonal.o
++ zmemory.o zutil.o zmyblas2.o
+
+ all: single double complex complex16
+
+ single: $(SLUSRC) $(ALLAUX) $(LAAUX) $(SLASRC) $(SCLAUX)
+- $(ARCH) $(ARCHFLAGS) $(SUPERLULIB) \
++ $(ARCH) $(ARCHFLAGS) ../$(SUPERLULIB) \
+ $(SLUSRC) $(ALLAUX) $(LAAUX) $(SLASRC) $(SCLAUX)
+- $(RANLIB) $(SUPERLULIB)
++ $(RANLIB) ../$(SUPERLULIB)
+
+ double: $(DLUSRC) $(ALLAUX) $(LAAUX) $(DLASRC) $(DZLAUX)
+- $(ARCH) $(ARCHFLAGS) $(SUPERLULIB) \
++ $(ARCH) $(ARCHFLAGS) ../$(SUPERLULIB) \
+ $(DLUSRC) $(ALLAUX) $(LAAUX) $(DLASRC) $(DZLAUX)
+- $(RANLIB) $(SUPERLULIB)
++ $(RANLIB) ../$(SUPERLULIB)
+
+ complex: $(CLUSRC) $(ALLAUX) $(LAAUX) $(CLASRC) $(SCLAUX)
+- $(ARCH) $(ARCHFLAGS) $(SUPERLULIB) \
++ $(ARCH) $(ARCHFLAGS) ../$(SUPERLULIB) \
+ $(CLUSRC) $(ALLAUX) $(LAAUX) $(CLASRC) $(SCLAUX)
+- $(RANLIB) $(SUPERLULIB)
++ $(RANLIB) ../$(SUPERLULIB)
+
+ complex16: $(ZLUSRC) $(ALLAUX) $(LAAUX) $(ZLASRC) $(DZLAUX)
+- $(ARCH) $(ARCHFLAGS) $(SUPERLULIB) \
++ $(ARCH) $(ARCHFLAGS) ../$(SUPERLULIB) \
+ $(ZLUSRC) $(ALLAUX) $(LAAUX) $(ZLASRC) $(DZLAUX)
+- $(RANLIB) $(SUPERLULIB)
++ $(RANLIB) ../$(SUPERLULIB)
+
+
+ ##################################
+@@ -145,8 +123,5 @@
+ .c.o:
+ $(CC) $(CFLAGS) $(CDEFS) $(BLASDEF) -c $< $(VERBOSE)
+
+-.f.o:
+- $(FORTRAN) $(FFLAGS) -c $<
+-
+ clean:
+- rm -f *.o $(SUPERLULIB)
++ rm -f *.o libsuperlu.*
+Index: superlu-4.3/make.inc
+===================================================================
+--- superlu-4.3.orig/make.inc 2011-12-12 23:34:18.000000000 +0100
++++ superlu-4.3/make.inc 2012-06-29 17:57:10.000000000 +0200
+@@ -16,26 +16,14 @@
+ #
+ # The machine (platform) identifier to append to the library names
+ #
+-PLAT = _linux
++PLAT =
+
+ #
+ # The name of the libraries to be created/linked to
+ #
+-SuperLUroot = $(HOME)/Codes/SuperLU/SuperLU_4.3
+-SUPERLULIB = $(SuperLUroot)/lib/libsuperlu_4.3.a
+-TMGLIB = libtmglib.a
+-
+-## BLASLIB = $(SuperLUroot)/lib/libblas.a
+-
+-BLASDEF = -DUSE_VENDOR_BLAS
+-BLASLIB = -L$(HOME)/lib/GotoBLAS -lgoto
+-
+-## ATLAS BLAS causes single-precision to fail
+-#BLASLIB = -L/usr/lib/atlas -lblas
+-## This BLAS causes single-precision to fail the test in SuperLU
+-#BLASLIB = -L/usr/lib -lblas
+-
+-LIBS = $(SUPERLULIB) $(BLASLIB)
++TMGLIB = libtmglib$(PLAT).a
++SUPERLULIB = libsuperlu$(PLAT).a
++BLASLIB = -lblas
+
+ #
+ # The archiver and the flag(s) to use when building archive (library)
+@@ -46,20 +34,17 @@
+ RANLIB = ranlib
+
+ CC = gcc
+-CFLAGS = -DPRNTlevel=0 -O3
+-NOOPTS =
++CFLAGS = -O2
+ FORTRAN = g77
+-FFLAGS = -O2
+-LOADER = $(CC)
+-LOADOPTS =
++FFLAGS = -O
++LOADER = gcc
++LOADOPTS =
+
+ #
+-# C preprocessor defs for compilation for the Fortran interface
+-# (-DNoChange, -DAdd_, -DAdd__, or -DUpCase)
++# C preprocessor defs for compilation (-DNoChange, -DAdd_, or -DUpCase)
+ #
+ CDEFS = -DAdd_
+ #
+ # The directory in which Matlab is installed
+ #
+-MATLAB = /usr/sww/matlab
+-
++MATLAB = /opt/matlab
+Index: superlu-4.3/TESTING/Makefile
+===================================================================
+--- superlu-4.3.orig/TESTING/Makefile 2011-10-27 21:49:47.000000000 +0200
++++ superlu-4.3/TESTING/Makefile 2012-06-29 18:01:58.000000000 +0200
+@@ -52,9 +52,9 @@
+
+ single: ./stest stest.out
+
+-./stest: $(SLINTST) $(ALINTST) $(SUPERLULIB) $(TMGLIB)
++./stest: $(SLINTST) $(ALINTST) ../$(SUPERLULIB) $(TMGLIB)
+ $(LOADER) $(LOADOPTS) $(SLINTST) $(ALINTST) \
+- $(TMGLIB) $(SUPERLULIB) $(BLASLIB) -lm -o $@
++ $(TMGLIB) ../$(SUPERLULIB) $(BLASLIB) -lm -o $@
+
+ stest.out: stest stest.csh
+ @echo Testing SINGLE PRECISION linear equation routines
+@@ -62,9 +62,9 @@
+
+ double: ./dtest dtest.out
+
+-./dtest: $(DLINTST) $(ALINTST) $(SUPERLULIB) $(TMGLIB)
++./dtest: $(DLINTST) $(ALINTST) ../$(SUPERLULIB) $(TMGLIB)
+ $(LOADER) $(LOADOPTS) $(DLINTST) $(ALINTST) \
+- $(TMGLIB) $(SUPERLULIB) $(BLASLIB) -lm -o $@
++ $(TMGLIB) ../$(SUPERLULIB) $(BLASLIB) -lm -o $@
+
+ dtest.out: dtest dtest.csh
+ @echo Testing DOUBLE PRECISION linear equation routines
+@@ -72,9 +72,9 @@
+
+ complex: ./ctest ctest.out
+
+-./ctest: $(CLINTST) $(ALINTST) $(SUPERLULIB) $(TMGLIB)
++./ctest: $(CLINTST) $(ALINTST) ../$(SUPERLULIB) $(TMGLIB)
+ $(LOADER) $(LOADOPTS) $(CLINTST) $(ALINTST) \
+- $(TMGLIB) $(SUPERLULIB) $(BLASLIB) -lm -o $@
++ $(TMGLIB) ../$(SUPERLULIB) $(BLASLIB) -lm -o $@
+
+ ctest.out: ctest ctest.csh
+ @echo Testing SINGLE COMPLEX linear equation routines
+@@ -82,9 +82,9 @@
+
+ complex16: ./ztest ztest.out
+
+-./ztest: $(ZLINTST) $(ALINTST) $(SUPERLULIB) $(TMGLIB)
++./ztest: $(ZLINTST) $(ALINTST) ../$(SUPERLULIB) $(TMGLIB)
+ $(LOADER) $(LOADOPTS) $(ZLINTST) $(ALINTST) \
+- $(TMGLIB) $(SUPERLULIB) $(BLASLIB) -lm -o $@
++ $(TMGLIB) ../$(SUPERLULIB) $(BLASLIB) -lm -o $@
+
+ ztest.out: ztest ztest.csh
+ @echo Testing DOUBLE COMPLEX linear equation routines
Added: packages/superlu/trunk/debian/patches/format-security.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/patches/format-security.patch?rev=45169&op=file
==============================================================================
--- packages/superlu/trunk/debian/patches/format-security.patch (added)
+++ packages/superlu/trunk/debian/patches/format-security.patch Fri Jun 29 16:46:06 2012
@@ -1,0 +1,13 @@
+Index: superlu-4.3/SRC/util.c
+===================================================================
+--- superlu-4.3.orig/SRC/util.c 2011-10-27 21:49:47.000000000 +0200
++++ superlu-4.3/SRC/util.c 2012-06-29 16:51:29.000000000 +0200
+@@ -29,7 +29,7 @@
+
+ void superlu_abort_and_exit(char* msg)
+ {
+- fprintf(stderr, msg);
++ fprintf(stderr, "%s", msg);
+ exit (-1);
+ }
+
Modified: packages/superlu/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/patches/series?rev=45169&op=diff
==============================================================================
--- packages/superlu/trunk/debian/patches/series (original)
+++ packages/superlu/trunk/debian/patches/series Fri Jun 29 16:46:06 2012
@@ -1,1 +1,3 @@
fixbuild.patch
+format-security.patch
+Makefile.patch
Modified: packages/superlu/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/rules?rev=45169&op=diff
==============================================================================
--- packages/superlu/trunk/debian/rules (original)
+++ packages/superlu/trunk/debian/rules Fri Jun 29 16:46:06 2012
@@ -6,36 +6,37 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+%:
+ dh $@ --parallel
+
+#include /usr/share/hardening-includes/hardening.make
+#
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+#CFLAGS+=$(HARDENING_CFLAGS)
+#LDFLAGS+=$(HARDENING_LDFLAGS)
# shared library versions, option 1
version=4.0.0
major=4
-# 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)}'`
-build/libsuperlu4::
- -mkdir -p shared/SRC
- cd shared/SRC ; \
- srcdir=../../SRC; \
- $(MAKE) -f $$srcdir/Makefile -I $$srcdir VPATH="$$srcdir" srcdir="$$srcdir" NOOPTS="-fPIC" CFLAGS="-O3 -fPIC -pipe" DEBUGFLAGS="-DNDEBUG" ; \
- gcc -shared -Wl,-soname,libsuperlu.so.$(major) -o libsuperlu.so.$(version) `ls *.o` -lblas -lm
- ( cd shared/SRC && ln -sf libsuperlu.so.$(version) libsuperlu.so.$(major) )
- ( cd shared/SRC && ln -sf libsuperlu.so.$(version) libsuperlu.so )
+override_dh_auto_build:
+ cd SRC && $(MAKE) CFLAGS="$(CFLAGS) -pipe" DEBUGFLAGS="-DNDEBUG" LDFLAGS="$(LDFLAGS) -s"
+ 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
+ ln -sf libsuperlu.so.$(version) libsuperlu.so.$(major)
+ ln -sf libsuperlu.so.$(version) libsuperlu.so
+ cd SRC && $(MAKE) clean
- -mkdir -p static/SRC
- cd static/SRC ; \
- srcdir=../../SRC; \
- $(MAKE) -f $$srcdir/Makefile -I $$srcdir VPATH="$$srcdir" srcdir="$$srcdir" CFLAGS="-O3 -pipe" DEBUGFLAGS="-DNDEBUG" LDFLAGS="-s" ;
+override_dh_auto_clean:
+ [ ! -f Makefile ] || $(MAKE) clean
-clean::
- -rm -rf shared static
-# [ ! -f Makefile ] || $(MAKE) distclean
+override_dh_strip:
+ dh_strip --dbg-package=libsuperlu4-dbg
+ dh_strip
+
DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.*$$//p')
SUPERLU_VERSION=$(DEB_STRIPPED_UPSTREAM_VERSION)
Added: packages/superlu/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/source/format?rev=45169&op=file
==============================================================================
--- packages/superlu/trunk/debian/source/format (added)
+++ packages/superlu/trunk/debian/source/format Fri Jun 29 16:46:06 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the debian-science-commits
mailing list