r36364 - in /packages/sparskit/trunk/debian: README.Debian changelog control copyright libsparskit2.0.lintian-overrides patches/00list patches/50_all_changes.diff patches/50_gfortran.dpatch patches/series rules source/ source/format
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Sat Apr 10 14:27:49 UTC 2010
Author: domibel-guest
Date: Sat Apr 10 14:27:41 2010
New Revision: 36364
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36364
Log:
prepare package for inital upload
Added:
packages/sparskit/trunk/debian/libsparskit2.0.lintian-overrides
packages/sparskit/trunk/debian/patches/50_all_changes.diff
packages/sparskit/trunk/debian/patches/series
packages/sparskit/trunk/debian/source/
packages/sparskit/trunk/debian/source/format
Removed:
packages/sparskit/trunk/debian/README.Debian
packages/sparskit/trunk/debian/patches/00list
packages/sparskit/trunk/debian/patches/50_gfortran.dpatch
Modified:
packages/sparskit/trunk/debian/changelog
packages/sparskit/trunk/debian/control
packages/sparskit/trunk/debian/copyright
packages/sparskit/trunk/debian/rules
Modified: packages/sparskit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/sparskit/trunk/debian/changelog?rev=36364&op=diff
==============================================================================
--- packages/sparskit/trunk/debian/changelog (original)
+++ packages/sparskit/trunk/debian/changelog Sat Apr 10 14:27:41 2010
@@ -1,6 +1,5 @@
-sparskit (2.0.0-1) intrepid; urgency=low
+sparskit (2.0.0-1) unstable; urgency=low
* Initial release (Closes: #498653)
- -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Thu, 11 Sep 2008 23:22:53 +0200
-
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sat, 03 Apr 2010 10:18:28 -0400
Modified: packages/sparskit/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/sparskit/trunk/debian/control?rev=36364&op=diff
==============================================================================
--- packages/sparskit/trunk/debian/control (original)
+++ packages/sparskit/trunk/debian/control Sat Apr 10 14:27:41 2010
@@ -3,16 +3,29 @@
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
-Build-Depends: debhelper (>= 7), dpatch, gfortran
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), quilt, gfortran, cmake, liblapack-dev
+Standards-Version: 3.8.4
Section: libs
Homepage: http://www-users.cs.umn.edu/~saad/software/SPARSKIT/sparskit.html
+
+Package: libsparskit2.0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A basic tool-kit for sparse matrix computations - runtime
+ SPARSKIT a basic tool-kit for sparse matrix computations. Sparskit is a
+ general purpose FORTRAN-77 library for sparse matrix computations. It has
+ been gathered over several years and includes some of the most useful tools
+ for developing and implementing sparse matrix techniques, particularly for
+ iterative solvers. If you need a simple routine for doing a sparse matrix
+ operation (e.g., adding two sparse matrices, or reordering a sparse matrix)
+ it is likely to be available in SPARSKIT. SPARSKIT also contains most of
+ the iterative accelarators and a number of efficient preconditioners.
Package: libsparskit-dev
Section: libdevel
Architecture: any
-Depends: libsparskit2 (= ${binary:Version})
-Description: A basic tool-kit for sparse matrix computations
+Depends: libsparskit2.0 (= ${binary:Version}), ${misc:Depends}
+Description: A basic tool-kit for sparse matrix computations - devel
SPARSKIT a basic tool-kit for sparse matrix computations. Sparskit is a general
purpose FORTRAN-77 library for sparse matrix computations. It has been
gathered over several years and includes some of the most useful tools for
@@ -21,17 +34,3 @@
operation (e.g., adding two sparse matrices, or reordering a sparse matrix) it
is likely to be available in SPARSKIT. SPARSKIT also contains most of the
iterative accelarators and a number of efficient preconditioners.
-
-Package: libsparskit2
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A basic tool-kit for sparse matrix computations
- SPARSKIT a basic tool-kit for sparse matrix computations. Sparskit is a
- general purpose FORTRAN-77 library for sparse matrix computations. It has
- been gathered over several years and includes some of the most useful tools
- for developing and implementing sparse matrix techniques, particularly for
- iterative solvers. If you need a simple routine for doing a sparse matrix
- operation (e.g., adding two sparse matrices, or reordering a sparse matrix)
- it is likely to be available in SPARSKIT. SPARSKIT also contains most of
- the iterative accelarators and a number of efficient preconditioners.
Modified: packages/sparskit/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/sparskit/trunk/debian/copyright?rev=36364&op=diff
==============================================================================
--- packages/sparskit/trunk/debian/copyright (original)
+++ packages/sparskit/trunk/debian/copyright Sat Apr 10 14:27:41 2010
@@ -14,4 +14,5 @@
Files: debian/*
Copyright: Copyright 2008, Dominique Belhachemi <domibel at cs.tu-berlin.de>
License: GPL-2+
- The Debian packaging is licensed under the GPL, see `/usr/share/common-licenses/GPL'
+ The Debian packaging is licensed under the LGPL-2.1,
+ see `/usr/share/common-licenses/LGPL-2.1'
Added: packages/sparskit/trunk/debian/libsparskit2.0.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/sparskit/trunk/debian/libsparskit2.0.lintian-overrides?rev=36364&op=file
==============================================================================
--- packages/sparskit/trunk/debian/libsparskit2.0.lintian-overrides (added)
+++ packages/sparskit/trunk/debian/libsparskit2.0.lintian-overrides Sat Apr 10 14:27:41 2010
@@ -1,0 +1,1 @@
+libsparskit2.0: package-name-doesnt-match-sonames libskit2.0
Added: packages/sparskit/trunk/debian/patches/50_all_changes.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/sparskit/trunk/debian/patches/50_all_changes.diff?rev=36364&op=file
==============================================================================
--- packages/sparskit/trunk/debian/patches/50_all_changes.diff (added)
+++ packages/sparskit/trunk/debian/patches/50_all_changes.diff Sat Apr 10 14:27:41 2010
@@ -1,0 +1,202 @@
+CMake'ing sparskit
+Index: sparskit-2.0.0/BLASSM/CMakeLists.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ sparskit-2.0.0/BLASSM/CMakeLists.txt 2010-04-10 08:10:47.000000000 -0400
+@@ -0,0 +1,9 @@
++enable_language( Fortran )
++
++set(CMAKE_Fortran_FLAGS "-g")
++
++add_executable(mvec.ex rmatvec.f ../MATGEN/FDIF/functns.f)
++target_link_libraries (mvec.ex skit skit_helper blas)
++
++add_executable(tester.ex rmatvec.f ../MATGEN/FDIF/functns.f)
++target_link_libraries (tester.ex skit)
+Index: sparskit-2.0.0/CMakeLists.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ sparskit-2.0.0/CMakeLists.txt 2010-04-10 08:10:35.000000000 -0400
+@@ -0,0 +1,76 @@
++cmake_minimum_required(VERSION 2.6)
++
++# Input directories must have CMakeLists.txt.
++cmake_policy(SET CMP0014 NEW)
++
++
++project (sparskit)
++
++
++set(STATIC_LIBRARY_FLAGS "-rcv")
++set(CMAKE_Fortran_FLAGS " -g -ffixed-line-length-none -ffree-line-length-none")
++#set(CMAKE_Fortran_FLAGS " -c -g -Wall -ffixed-line-length-none -ffree-line-length-none")
++
++enable_language(Fortran)
++
++
++# Create a library called "skit".
++add_library (skit
++ BLASSM/blassm.f
++ BLASSM/matvec.f
++ FORMATS/formats.f
++ FORMATS/unary.f
++ INFO/infofun.f
++ INOUT/inout.f
++ ITSOL/ilut.f
++ ITSOL/iters.f
++ MATGEN/FDIF/genmat.f
++ MATGEN/FEM/elmtlib2.f
++ MATGEN/FEM/femgen.f
++ MATGEN/FEM/meshes.f
++ MATGEN/MISC/sobel.f
++ MATGEN/MISC/zlatev.f
++ ORDERINGS/ccn.f
++ ORDERINGS/color.f
++ ORDERINGS/dsepart.f
++)
++
++SET_TARGET_PROPERTIES(skit PROPERTIES
++ LINKER_LANGUAGE Fortran
++ SOVERSION 2.0
++ VERSION 2.0.0
++)
++
++install(TARGETS skit
++ RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
++ LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
++ ARCHIVE DESTINATION lib COMPONENT Development
++)
++
++
++OPTION(BUILD_TESTING "Enable this to perform testing of sparskit" ON)
++
++IF(BUILD_TESTING)
++ # non-library and unsupported objects
++ add_library (skit_helper
++ ITSOL/itaux.f
++ MATGEN/FDIF/functns.f
++ MATGEN/FEM/functns2.f
++ UNSUPP/BLAS1/blas1.f
++ UNSUPP/MATEXP/exppro.f
++ UNSUPP/MATEXP/phipro.f
++ UNSUPP/PLOTS/psgrd.f
++ UNSUPP/PLOTS/texgrid1.f
++ UNSUPP/PLOTS/texplt1.f
++ )
++ add_subdirectory (BLASSM)
++ add_subdirectory (FORMATS)
++ add_subdirectory (INFO)
++ add_subdirectory (INOUT)
++ add_subdirectory (ITSOL)
++ add_subdirectory (MATGEN/FDIF)
++ add_subdirectory (MATGEN/FEM)
++ add_subdirectory (MATGEN/MISC)
++ add_subdirectory (UNSUPP/MATEXP)
++ENDIF(BUILD_TESTING)
++
+Index: sparskit-2.0.0/FORMATS/CMakeLists.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ sparskit-2.0.0/FORMATS/CMakeLists.txt 2010-04-10 08:11:10.000000000 -0400
+@@ -0,0 +1,12 @@
++#enable_language( Fortran )
++
++set(CMAKE_Fortran_FLAGS "-g")
++
++add_executable(un.ex chkun.f ../MATGEN/FDIF/functns.f)
++target_link_libraries (un.ex skit)
++
++add_executable(chkfmt.ex chkfmt1.f ../MATGEN/FDIF/functns.f)
++target_link_libraries (chkfmt.ex skit)
++
++add_executable(rvbr.ex rvbr.f ../MATGEN/FDIF/functns.f)
++target_link_libraries (rvbr.ex skit)
+Index: sparskit-2.0.0/INFO/CMakeLists.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ sparskit-2.0.0/INFO/CMakeLists.txt 2010-04-10 08:11:15.000000000 -0400
+@@ -0,0 +1,4 @@
++set(CMAKE_Fortran_FLAGS "-g")
++
++add_executable(info1.ex rinfo1.f dinfo13.f)
++target_link_libraries (info1.ex skit)
+Index: sparskit-2.0.0/INOUT/CMakeLists.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ sparskit-2.0.0/INOUT/CMakeLists.txt 2010-04-10 08:10:41.000000000 -0400
+@@ -0,0 +1,10 @@
++set(CMAKE_Fortran_FLAGS "-g")
++
++add_executable(chk.ex chkio.f ../MATGEN/FDIF/functns.f)
++target_link_libraries (chk.ex skit)
++
++add_executable(hb2ps.ex hb2ps.f)
++target_link_libraries (hb2ps.ex skit)
++
++add_executable(hb2pic.ex hb2pic.f)
++target_link_libraries (hb2pic.ex skit)
+Index: sparskit-2.0.0/ITSOL/CMakeLists.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ sparskit-2.0.0/ITSOL/CMakeLists.txt 2010-04-10 08:09:48.000000000 -0400
+@@ -0,0 +1,11 @@
++set(CMAKE_Fortran_FLAGS "-g")
++
++add_executable(riters.ex riters.f iters.f ilut.f itaux.f ../UNSUPP/BLAS1/blas1.f)
++target_link_libraries (riters.ex skit)
++
++add_executable(rilut.ex rilut.f ilut.f iters.f itaux.f ../UNSUPP/BLAS1/blas1.f)
++target_link_libraries (rilut.ex skit)
++
++add_executable(riter2.ex riter2.f iters.f ilut.f itaux.f ../UNSUPP/BLAS1/blas1.f)
++target_link_libraries (riter2.ex skit)
++
+Index: sparskit-2.0.0/MATGEN/FDIF/CMakeLists.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ sparskit-2.0.0/MATGEN/FDIF/CMakeLists.txt 2010-04-10 08:11:05.000000000 -0400
+@@ -0,0 +1,7 @@
++set(CMAKE_Fortran_FLAGS "-g")
++
++add_executable(gen5.ex rgen5pt.f functns.f)
++target_link_libraries (gen5.ex skit)
++
++add_executable(genbl.ex rgenblk.f functns.f)
++target_link_libraries (genbl.ex skit)
+Index: sparskit-2.0.0/MATGEN/FEM/CMakeLists.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ sparskit-2.0.0/MATGEN/FEM/CMakeLists.txt 2010-04-10 08:10:58.000000000 -0400
+@@ -0,0 +1,4 @@
++set(CMAKE_Fortran_FLAGS "-g")
++
++add_executable(fem.ex convdif.f functns2.f ../../UNSUPP/PLOTS/psgrd.f )
++target_link_libraries (fem.ex skit)
+Index: sparskit-2.0.0/MATGEN/MISC/CMakeLists.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ sparskit-2.0.0/MATGEN/MISC/CMakeLists.txt 2010-04-10 08:10:52.000000000 -0400
+@@ -0,0 +1,11 @@
++set(CMAKE_Fortran_FLAGS "-g")
++
++add_executable(sobel.ex rsobel.f)
++target_link_libraries (sobel.ex skit)
++
++add_executable(zlatev.ex rzlatev.f)
++target_link_libraries (zlatev.ex skit)
++
++add_executable(markov.ex markov.f)
++target_link_libraries (markov.ex skit)
++
+Index: sparskit-2.0.0/UNSUPP/MATEXP/CMakeLists.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ sparskit-2.0.0/UNSUPP/MATEXP/CMakeLists.txt 2010-04-10 08:11:21.000000000 -0400
+@@ -0,0 +1,7 @@
++set(CMAKE_Fortran_FLAGS "-g")
++
++add_executable(exp.ex rexp.f exppro.f)
++target_link_libraries (exp.ex skit)
++
++add_executable(phi.ex rphi.f phipro.f)
++target_link_libraries (phi.ex skit)
Added: packages/sparskit/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/sparskit/trunk/debian/patches/series?rev=36364&op=file
==============================================================================
--- packages/sparskit/trunk/debian/patches/series (added)
+++ packages/sparskit/trunk/debian/patches/series Sat Apr 10 14:27:41 2010
@@ -1,0 +1,1 @@
+50_all_changes.diff
Modified: packages/sparskit/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/sparskit/trunk/debian/rules?rev=36364&op=diff
==============================================================================
--- packages/sparskit/trunk/debian/rules (original)
+++ packages/sparskit/trunk/debian/rules Sat Apr 10 14:27:41 2010
@@ -2,9 +2,12 @@
PACKAGE=sparskit
-# DPatch
DEB_SOURCE_PACKAGE:=$(PACKAGE)
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
+
+STATIC_BUILD_PATH = DEB_build_static
+SHARED_BUILD_PATH = DEB_build_shared
+
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
@@ -12,12 +15,30 @@
get-orig-source:
. debian/get-orig-source
+CMAKE_FLAGS = -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
+ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
+ -DCMAKE_SKIP_RPATH:BOOL=ON
+
+
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp: $(QUILT_STAMPFN)
dh_testdir
# Add here commands to configure the package.
- touch configure-stamp
+ if [ ! -d $(STATIC_BUILD_PATH) ]; then mkdir $(STATIC_BUILD_PATH); fi
+ cd $(STATIC_BUILD_PATH) \
+ && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON
+ cd $(STATIC_BUILD_PATH) \
+ && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON
+
+ if [ ! -d $(SHARED_BUILD_PATH) ]; then mkdir $(SHARED_BUILD_PATH); fi
+ cd $(SHARED_BUILD_PATH) \
+ && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_TESTING:BOOL=OFF
+ cd $(SHARED_BUILD_PATH) \
+ && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_TESTING:BOOL=OFF
+
+ touch $@
build: build-stamp
@@ -25,8 +46,18 @@
dh_testdir
# Add here commands to compile the package.
+
+ # build static libs
+ $(MAKE) $(JOBS) -C $(STATIC_BUILD_PATH)
+
+ # build shared libs and binaries
+ $(MAKE) $(JOBS) -C $(SHARED_BUILD_PATH)
+
+ # run a test
+ ./DEB_build_static/ITSOL/riters.ex
+
# $(MAKE)
- ./dotests
+# ./dotests
touch $@
@@ -37,24 +68,26 @@
dh_testroot
rm -f build-stamp configure-stamp
- # Add here commands to clean up after the build process.
- $(MAKE) clean
- - rm libskit.a
+ rm -rf $(STATIC_BUILD_PATH)
+ rm -rf $(SHARED_BUILD_PATH)
+
+# $(MAKE) clean
+# - rm libskit.a
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
- # Add here commands to install the package into debian/tmp
-# $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install -C $(STATIC_BUILD_PATH)
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/shared install -C $(SHARED_BUILD_PATH)
- dh_install -plibsparskit2 libskit.a usr/lib
-
-
+ dh_install -plibsparskit-dev usr/lib/libskit.a usr/lib
+ dh_install -plibsparskit-dev shared/usr/lib/libskit.so usr/lib
+ dh_install -plibsparskit2.0 shared/usr/lib/libskit.so.* usr/lib
# Build architecture-independent files here.
binary-indep: build install
@@ -66,25 +99,14 @@
dh_testroot
dh_installchangelogs
dh_installdocs
+ dh_lintian
dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
-# dh_perl
-# dh_python
-# dh_makeshlibs
+ dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
Added: packages/sparskit/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-science/packages/sparskit/trunk/debian/source/format?rev=36364&op=file
==============================================================================
--- packages/sparskit/trunk/debian/source/format (added)
+++ packages/sparskit/trunk/debian/source/format Sat Apr 10 14:27:41 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the debian-science-commits
mailing list