r46288 - in /packages/superlu/trunk/debian: changelog control patches/Makefile.patch rules watch
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Tue Sep 17 14:04:07 UTC 2013
Author: trophime-guest
Date: Tue Sep 17 14:04:06 2013
New Revision: 46288
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46288
Log:
finalize upgrade to 4.3
Modified:
packages/superlu/trunk/debian/changelog
packages/superlu/trunk/debian/control
packages/superlu/trunk/debian/patches/Makefile.patch
packages/superlu/trunk/debian/rules
packages/superlu/trunk/debian/watch
Modified: packages/superlu/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/changelog?rev=46288&op=diff
==============================================================================
--- packages/superlu/trunk/debian/changelog (original)
+++ packages/superlu/trunk/debian/changelog Tue Sep 17 14:04:06 2013
@@ -1,4 +1,4 @@
-superlu (4.3-1.1) unstable; urgency=low
+superlu (4.3.dfsg-1.1) unstable; urgency=low
* Non-maintainer upload.
* New upstream release
Modified: packages/superlu/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/control?rev=46288&op=diff
==============================================================================
--- packages/superlu/trunk/debian/control (original)
+++ packages/superlu/trunk/debian/control Tue Sep 17 14:04:06 2013
@@ -13,8 +13,6 @@
Section: libs
Architecture: any
Depends: libblas3gf, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libsuperlu3
-Provides: libsuperlu3
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
@@ -37,7 +35,6 @@
Architecture: any
Depends: libsuperlu4 (= ${binary:Version}), libblas-dev, ${misc:Depends}
Conflicts: libsuperlu3-dev
-Provides: libsuperlu3-dev
Description: Direct solution of large, sparse systems of linear equations
Development files for SuperLU.
.
Modified: packages/superlu/trunk/debian/patches/Makefile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/patches/Makefile.patch?rev=46288&op=diff
==============================================================================
--- packages/superlu/trunk/debian/patches/Makefile.patch (original)
+++ packages/superlu/trunk/debian/patches/Makefile.patch Tue Sep 17 14:04:06 2013
@@ -1,7 +1,7 @@
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
+--- 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
@@ -33,14 +33,13 @@
#######################################################################
@@ -199,8 +199,8 @@
+ 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
+--- 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
@@ -236,84 +236,9 @@
( 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
-
+--- 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 @@
all: single double complex complex16
single: $(SLUSRC) $(ALLAUX) $(LAAUX) $(SLASRC) $(SCLAUX)
@@ -346,7 +271,7 @@
##################################
-@@ -145,8 +123,5 @@
+@@ -145,8 +139,5 @@
.c.o:
$(CC) $(CFLAGS) $(CDEFS) $(BLASDEF) -c $< $(VERBOSE)
@@ -358,8 +283,8 @@
+ 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
+--- 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
@@ -16,26 +16,14 @@
#
# The machine (platform) identifier to append to the library names
@@ -420,8 +345,8 @@
+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
+--- 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
@@ -52,9 +52,9 @@
single: ./stest stest.out
Modified: packages/superlu/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/rules?rev=46288&op=diff
==============================================================================
--- packages/superlu/trunk/debian/rules (original)
+++ packages/superlu/trunk/debian/rules Tue Sep 17 14:04:06 2013
@@ -37,9 +37,25 @@
dh_strip --dbg-package=libsuperlu4-dbg
dh_strip
+override_dh_auto_test:
+ cd TESTING && $(MAKE)
-DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.*$$//p')
-SUPERLU_VERSION=$(DEB_STRIPPED_UPSTREAM_VERSION)
+DEB_SOURCE_PACKAGE = superlu
+DEB_UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
+DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
+USCAN_DESTDIR := $(CURDIR)
get-orig-source:
- uscan --force-download --rename --verbose --upstream-version $(SUPERLU_VERSION)
+ uscan --force-download --verbose --check-dirname-level 0 --destdir $(USCAN_DESTDIR) --download-version $(DEB_STRIPPED_UPSTREAM_VERSION) --upstream-version $(DEB_STRIPPED_UPSTREAM_VERSION) ; \
+ set -ex ;
+ test -d $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig && rm -rf $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig ; \
+ TMPDIR=$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig; \
+ mkdir $$TMPDIR; \
+ cp $(USCAN_DESTDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_STRIPPED_UPSTREAM_VERSION).orig.tar.gz "$$TMPDIR" ; \
+ tar -C "$$TMPDIR" --strip-components 1 -xzf "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)_$(DEB_STRIPPED_UPSTREAM_VERSION).orig.tar.gz ; \
+ rm -f "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)*.tar.gz ; \
+ find "$$TMPDIR" -name \*.pdf | xargs rm ; \
+ GZIP=-9 tar -czf \
+ $(CURDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
+ $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig ; \
+ rm -rf "$$TMPDIR"
Modified: packages/superlu/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/watch?rev=46288&op=diff
==============================================================================
--- packages/superlu/trunk/debian/watch (original)
+++ packages/superlu/trunk/debian/watch Tue Sep 17 14:04:06 2013
@@ -1,2 +1,3 @@
version=3
-http://crd.lbl.gov/~xiaoye/SuperLU/superlu_([\d.]+)\.tar\.gz
+opts=dversionmangle=s/\.dfsg// \
+ http://crd.lbl.gov/~xiaoye/SuperLU/superlu_([\d.]+)\.tar\.gz
More information about the debian-science-commits
mailing list