prepare package for inital upload

11 files changed, 275 insertions, 250 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index c6a08a3..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,13 +0,0 @@
-sparskit for Debian
--------------------
-
-ln -s /usr/bin/gfortran /usr/bin/f77
-
-package: make
-make-dfsg-3.81$ grep -r f77 .
-./default.c:    "CF", "cf77",
-./default.c:    "FC", "f77",
-
-
-
- -- Dominique Belhachemi <domibel@cs.tu-berlin.de>  Thu, 11 Sep 2008 23:22:53 +0200
diff --git a/debian/changelog b/debian/changelog
index 3cf0db4..a7c7415 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@cs.tu-berlin.de>  Thu, 11 Sep 2008 23:22:53 +0200
-
+ -- Dominique Belhachemi <domibel@cs.tu-berlin.de>  Sat, 03 Apr 2010 10:18:28 -0400
diff --git a/debian/control b/debian/control
index e43c44f..58d4c32 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,29 @@ Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Dominique Belhachemi <domibel@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 @@ Description: A basic tool-kit for sparse matrix computations
  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.
diff --git a/debian/copyright b/debian/copyright
index 91ca3d8..8718062 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,4 +14,5 @@ License: LGPL-2.1
 Files: debian/*
 Copyright: Copyright 2008, Dominique Belhachemi <domibel@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'
diff --git a/debian/libsparskit2.0.lintian-overrides b/debian/libsparskit2.0.lintian-overrides
new file mode 100644
index 0000000..96437f7
--- /dev/null
+++ b/debian/libsparskit2.0.lintian-overrides
@@ -0,0 +1 @@
+libsparskit2.0: package-name-doesnt-match-sonames libskit2.0
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index b0a598d..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-50_gfortran.dpatch
diff --git a/debian/patches/50_all_changes.diff b/debian/patches/50_all_changes.diff
new file mode 100644
index 0000000..371becf
--- /dev/null
+++ b/debian/patches/50_all_changes.diff
@@ -0,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)
diff --git a/debian/patches/50_gfortran.dpatch b/debian/patches/50_gfortran.dpatch
deleted file mode 100755
index 75ca9a2..0000000
--- a/debian/patches/50_gfortran.dpatch
+++ /dev/null
@@ -1,187 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_gfortran.dpatch by  <domibel@sid1500>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: replaces f77 by gfortran
-
-@DPATCH@
-diff -urNad sparskit-2.0.0~/BLASSM/makefile sparskit-2.0.0/BLASSM/makefile
---- sparskit-2.0.0~/BLASSM/makefile	1996-08-13 01:13:02.000000000 +0200
-+++ sparskit-2.0.0/BLASSM/makefile	2008-09-12 15:05:38.000000000 +0200
-@@ -1,8 +1,5 @@
- FFLAGS = 
--F77 = f77
--
--#F77 = cf77
--#FFLAGS = -Wf"-dp"
-+F77 = gfortran
- 
- mvec.ex: rmatvec.o ../MATGEN/FDIF/functns.o ../libskit.a
- 	$(F77) $(FFLAGS) -o mvec.ex rmatvec.o ../MATGEN/FDIF/functns.o ../libskit.a
-diff -urNad sparskit-2.0.0~/FORMATS/makefile sparskit-2.0.0/FORMATS/makefile
---- sparskit-2.0.0~/FORMATS/makefile	1996-08-13 01:13:24.000000000 +0200
-+++ sparskit-2.0.0/FORMATS/makefile	2008-09-12 15:05:38.000000000 +0200
-@@ -1,8 +1,6 @@
- FFLAGS =
--F77 = f77
--
--#F77 = cf77
--#FFLAGS = -Wf"-dp"
-+F77 = gfortran
-+FC = gfortran
- 
- FILES1 = chkun.o 
- FILES2 = chkfmt1.o 
-diff -urNad sparskit-2.0.0~/INFO/makefile sparskit-2.0.0/INFO/makefile
---- sparskit-2.0.0~/INFO/makefile	2003-07-11 23:38:12.000000000 +0200
-+++ sparskit-2.0.0/INFO/makefile	2008-09-12 15:06:55.000000000 +0200
-@@ -1,18 +1,14 @@
--# 
--F77 = f77
--#F77 = cf77
-+FC = gfortran
-+F77 = gfortran
- FFLAGS = -g -Wall 
- 
- FILES = rinfo1.o dinfo13.o
- ## needs library libskit.a in whatever machine version -- 
- 
--LIB   = -L/project/darpa/lib/PC -lskit
--##LIB   = -L/project/darpa/lib/solaris -lskit
--
- info1.ex: $(FILES) 
--	$(F77) -o info1.ex $(FILES) $(LIB) 
-+	$(F77) -o info1.ex $(FILES) ../libskit.a
- 
- clean:
- 	rm -f *.o *.ex core *.trace *~ 
- 
--.f.o  : ;       $(F77) $(FFLAGS) -c $*.f -o $*.o
-\ No newline at end of file
-+.f.o  : ;       $(F77) $(FFLAGS) -c $*.f -o $*.o
-diff -urNad sparskit-2.0.0~/INOUT/makefile sparskit-2.0.0/INOUT/makefile
---- sparskit-2.0.0~/INOUT/makefile	1996-08-13 01:13:40.000000000 +0200
-+++ sparskit-2.0.0/INOUT/makefile	2008-09-12 15:05:38.000000000 +0200
-@@ -1,5 +1,6 @@
- FFLAGS = 
--F77 = f77
-+F77 = gfortran
-+FC = gfortran
- 
- #F77 = cf77
- #FFLAGS = -Wf"-dp"
-diff -urNad sparskit-2.0.0~/ITSOL/makefile sparskit-2.0.0/ITSOL/makefile
---- sparskit-2.0.0~/ITSOL/makefile	1996-08-13 01:13:46.000000000 +0200
-+++ sparskit-2.0.0/ITSOL/makefile	2008-09-12 15:05:38.000000000 +0200
-@@ -1,8 +1,6 @@
- FFLAGS =
--F77 = f77
--
--#F77 = cf77
--#FFLAGS = -Wf"-dp"
-+F77 = gfortran
-+FC = gfortran
- 
- LIBS =  ../libskit.a ../UNSUPP/BLAS1/blas1.o
- 
-diff -urNad sparskit-2.0.0~/MATGEN/FDIF/makefile sparskit-2.0.0/MATGEN/FDIF/makefile
---- sparskit-2.0.0~/MATGEN/FDIF/makefile	1996-08-13 01:13:56.000000000 +0200
-+++ sparskit-2.0.0/MATGEN/FDIF/makefile	2008-09-12 15:05:38.000000000 +0200
-@@ -1,8 +1,6 @@
- FFLAGS = 
--F77 = f77
--
--#F77 = cf77
--#FFLAGS = -Wf"-dp"
-+F77 = gfortran
-+FC = gfortran
- 
- FILES1 = rgen5pt.o functns.o 
- 
-diff -urNad sparskit-2.0.0~/MATGEN/FEM/makefile sparskit-2.0.0/MATGEN/FEM/makefile
---- sparskit-2.0.0~/MATGEN/FEM/makefile	1996-08-13 01:14:02.000000000 +0200
-+++ sparskit-2.0.0/MATGEN/FEM/makefile	2008-09-12 15:05:38.000000000 +0200
-@@ -1,8 +1,6 @@
- FFLAGS = 
--F77 = f77
--
--#F77 = cf77
--#FFLAGS = -Wf"-dp"
-+F77 = gfortran
-+FC = gfortran
- 
- FILES = convdif.o functns2.o
- 
-diff -urNad sparskit-2.0.0~/MATGEN/MISC/makefile sparskit-2.0.0/MATGEN/MISC/makefile
---- sparskit-2.0.0~/MATGEN/MISC/makefile	1996-08-13 01:14:08.000000000 +0200
-+++ sparskit-2.0.0/MATGEN/MISC/makefile	2008-09-12 15:05:38.000000000 +0200
-@@ -1,5 +1,6 @@
- FFLAGS = 
--F77 = f77
-+F77 = gfortran
-+FC = gfortran
- 
- #F77 = cf77
- #FFLAGS = -Wf"-dp"
-diff -urNad sparskit-2.0.0~/UNSUPP/MATEXP/makefile sparskit-2.0.0/UNSUPP/MATEXP/makefile
---- sparskit-2.0.0~/UNSUPP/MATEXP/makefile	1996-08-13 01:14:17.000000000 +0200
-+++ sparskit-2.0.0/UNSUPP/MATEXP/makefile	2008-09-12 15:05:38.000000000 +0200
-@@ -1,8 +1,6 @@
- FFLAGS = 
--F77 = f77
--
--#F77 = cf77
--#FFLAGS = -Wf"-dp"
-+F77 = gfortran
-+FC = gfortran
- 
- FILES1 = rexp.o exppro.o 
- FILES2 = rphi.o phipro.o 
-diff -urNad sparskit-2.0.0~/makefile sparskit-2.0.0/makefile
---- sparskit-2.0.0~/makefile	2001-07-13 00:01:39.000000000 +0200
-+++ sparskit-2.0.0/makefile	2008-09-12 15:05:38.000000000 +0200
-@@ -20,28 +20,27 @@
- # Last Updated:  May 9, 1994.
- 
- SHELL = /bin/sh
--F77 = f77 
--# F77 = f77 
-+F77 = gfortran
-+FC = gfortran
- # AR = ar rcv 
- AR = ar -rcv 
- # OPT = -c 
- # OPT = -c -static -64 -mips4 -O3 -r10000
- OPT = -c -O
- 
--# Cray options
--#F77 = cf77
--#AR = bld rv
--#OPT = -c -Wf"-dp" 
- 
- #
- # library objects
- #
- OBJ =	BLASSM/blassm.o		\
- 	BLASSM/matvec.o		\
-+	BLASSM/rmatvec.o 	\
-+	BLASSM/tester.o 	\
- 	FORMATS/formats.o	\
- 	FORMATS/unary.o		\
- 	INFO/infofun.o		\
- 	INOUT/inout.o		\
-+	INOUT/chkio.f		\
- 	ITSOL/ilut.o		\
- 	ITSOL/iters.o		\
- 	MATGEN/FDIF/genmat.o	\
-@@ -103,6 +102,10 @@
- 	(cd BLASSM ; $(F77)  $(OPT) blassm.f)
- BLASSM/matvec.o: BLASSM/matvec.f
- 	(cd BLASSM ; $(F77)  $(OPT) matvec.f)
-+BLASSM/rmatvec.o: BLASSM/rmatvec.f
-+	(cd BLASSM ; $(F77)  $(OPT) rmatvec.f)
-+BLASSM/tester.o: BLASSM/tester.f
-+	(cd BLASSM ; $(F77)  $(OPT) tester.f)
- FORMATS/formats.o: FORMATS/formats.f
- 	(cd FORMATS ; $(F77)  $(OPT) formats.f)
- FORMATS/unary.o: FORMATS/unary.f
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0084ac9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+50_all_changes.diff
diff --git a/debian/rules b/debian/rules
index b9c0118..f63d390 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ export DH_VERBOSE=1
 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 @@ build-stamp: configure-stamp
 	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 @@ clean-patched:
 	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
-
-	dh_install -plibsparskit2       libskit.a          usr/lib
-
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp        install -C $(STATIC_BUILD_PATH)
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp/shared install -C $(SHARED_BUILD_PATH)
 
+	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 @@ binary-arch: build install
 	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
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)