[Pkg-octave-commit] [dynare] 05/12: Simplify the packaging.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository dynare.

commit 2aeb332fe74cef6173d82540c5bb34ff61fb7648
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Dec 16 19:02:57 2013 +0100

    Simplify the packaging.
    
    This change ensures that we don't forget to add a matlab/ subdirectory or
    a *.mex file to the binary packages.
    
    Git-Dch: Ignore
---
 debian/dynare-common.install | 20 +-------------------
 debian/dynare.install        | 13 -------------
 debian/rules                 |  9 +++++++++
 3 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/debian/dynare-common.install b/debian/dynare-common.install
index 132aca4..5afc36d 100644
--- a/debian/dynare-common.install
+++ b/debian/dynare-common.install
@@ -1,21 +1,3 @@
-matlab/*.m                              /usr/share/dynare/matlab
-matlab/AIM                              /usr/share/dynare/matlab
-matlab/distributions                    /usr/share/dynare/matlab
-matlab/@dynDate                         /usr/share/dynare/matlab
-matlab/@dynDates                        /usr/share/dynare/matlab
-matlab/@dynSeries                       /usr/share/dynare/matlab
-matlab/@dynTime                         /usr/share/dynare/matlab
-matlab/ep                               /usr/share/dynare/matlab
-matlab/gensylv                          /usr/share/dynare/matlab
-matlab/gsa                              /usr/share/dynare/matlab
-matlab/kalman                           /usr/share/dynare/matlab
-matlab/kronecker                        /usr/share/dynare/matlab
-matlab/missing                          /usr/share/dynare/matlab
-matlab/ms-sbvar                         /usr/share/dynare/matlab
-matlab/parallel                         /usr/share/dynare/matlab
-matlab/partial_information              /usr/share/dynare/matlab
-matlab/particle                         /usr/share/dynare/matlab
-matlab/qz                               /usr/share/dynare/matlab
-matlab/utilities                        /usr/share/dynare/matlab
+matlab/                                 /usr/share/dynare/
 contrib/ms-sbvar/TZcode/MatlabFiles     /usr/share/dynare/contrib/ms-sbvar/TZcode/
 scripts/dynare.el                       /usr/share/emacs/site-lisp/dynare-common
diff --git a/debian/dynare.install b/debian/dynare.install
index 45cf7fe..70b7dfc 100644
--- a/debian/dynare.install
+++ b/debian/dynare.install
@@ -1,15 +1,2 @@
 preprocessor/dynare_m                        /usr/lib/dynare/matlab
-mex/build/octave/block_kalman_filter/*.mex   /usr/lib/dynare/mex/octave
-mex/build/octave/bytecode/*.mex              /usr/lib/dynare/mex/octave
-mex/build/octave/dynare_simul_/*.mex         /usr/lib/dynare/mex/octave
-mex/build/octave/gensylv/*.mex               /usr/lib/dynare/mex/octave
-mex/build/octave/kalman_steady_state/*.mex   /usr/lib/dynare/mex/octave
-mex/build/octave/k_order_perturbation/*.mex  /usr/lib/dynare/mex/octave
-mex/build/octave/kronecker/*.mex             /usr/lib/dynare/mex/octave
-mex/build/octave/local_state_space_iterations/*.mex /usr/lib/dynare/mex/octave
-mex/build/octave/mjdgges/*.mex               /usr/lib/dynare/mex/octave
-mex/build/octave/ms_sbvar/*.mex              /usr/lib/dynare/mex/octave
-mex/build/octave/ordschur/*.oct              /usr/lib/dynare/mex/octave
-mex/build/octave/qzcomplex/*.oct             /usr/lib/dynare/mex/octave
-mex/build/octave/sobol/*.mex                 /usr/lib/dynare/mex/octave
 dynare++/src/dynare++                        /usr/bin
diff --git a/debian/rules b/debian/rules
index 02d254c..5d56e0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,15 @@ override_dh_auto_install-indep:
 # Don't run the testsuite
 override_dh_auto_test:
 
+override_dh_install-arch:
+	dh_install -a
+	mkdir -p debian/dynare/usr/lib/dynare/mex/octave
+	cp mex/octave/* debian/dynare/usr/lib/dynare/mex/octave
+
+override_dh_install-indep:
+	dh_install -i
+	rm debian/dynare-common/usr/share/dynare/matlab/dynare_m
+
 override_dh_link:
 	dh_link --package=dynare-common /usr/share/dynare/matlab/dynare.m $(MDIR)/dynare.m
 

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/dynare.git