[Pkg-octave-commit] [SCM] Debian packaging for octave-control branch, master, updated. debian/2.4.2-1

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit c54e78b0b5bf78919cfdec8032be65060948d5bf
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Mon Sep 3 22:44:39 2012 +0200

    Use external SLICOT
    
    + Build-Depend on libslicot-dev
    + use-external-slicot.patch: new patch to src/Makefile

diff --git a/debian/control b/debian/control
index 9c99cf0..3b296be 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Thomas Weber <tweber at debian.org>,
            Sébastien Villemot <sebastien.villemot at ens.fr>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>= 1.0.0)
+Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>= 1.0.0), libslicot-dev
 Standards-Version: 3.9.3
 Homepage: http://octave.sourceforge.net/control
 Vcs-Git: git://git.debian.org/git/pkg-octave/octave-control.git
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fbe171c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-external-slicot.patch
diff --git a/debian/patches/use-external-slicot.patch b/debian/patches/use-external-slicot.patch
new file mode 100644
index 0000000..38cde3e
--- /dev/null
+++ b/debian/patches/use-external-slicot.patch
@@ -0,0 +1,43 @@
+Description: Use external SLICOT instead of embedded copy
+Author: Sébastien Villemot <sebastien.villemot at ens.fr>
+Forwarded: not-needed
+Last-Update: 2012-09-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -20,24 +20,13 @@
+ 
+ # TODO: Private oct-files for control package.
+ 
+-# unpack and compile SLICOT library
+-# Note that TG04BX is a custom routine.
+-# It has the extension .fortran such that
+-# it is not deleted by rm *.f when using
+-# the developer makefile makefile_control.m
+-slicotlibrary.a: slicot.tar.gz
+-	tar -xzf slicot.tar.gz
+-	mv slicot/src/*.f .
+-	mv slicot/src_aux/*.f .
++TG04BX.f: TG04BX.fortran
+ 	cp TG04BX.fortran TG04BX.f
+-	$(MKOCTFILE) -c *.f
+-	ar -rc slicotlibrary.a *.o
+-	rm -rf *.o *.f slicot
+ 
+ # slicot functions
+-control_slicot_functions.oct: control_slicot_functions.cc slicotlibrary.a
++control_slicot_functions.oct: control_slicot_functions.cc TG04BX.f
+ 	LFLAGS="$(LFLAGS)" \
+-    $(MKOCTFILE) control_slicot_functions.cc common.cc slicotlibrary.a
++    $(MKOCTFILE) control_slicot_functions.cc common.cc TG04BX.f -lslicot
+ 
+ # helpers
+ is_real_scalar.oct: is_real_scalar.cc
+@@ -59,4 +48,4 @@
+ 	rm -rf *.o core octave-core *.oct *~ *.f slicot
+ 
+ realclean: clean
+-	rm -rf *.a
+\ No newline at end of file
++	rm -rf *.a

-- 
Debian packaging for octave-control