[Pkg-octave-commit] [SCM] dynare branch, master, updated. bb6bcc2ad7229f408a124db6d4962e4a769cd5d8
Sébastien Villemot
sebastien.villemot at ens.fr
Wed Jan 13 17:48:02 UTC 2010
The following commit has been merged in the master branch:
commit bb6bcc2ad7229f408a124db6d4962e4a769cd5d8
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date: Wed Jan 13 18:16:16 2010 +0100
Various changes reflecting changes upstream
diff --git a/debian/changelog b/debian/changelog
index 3b9a5c9..965724c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
dynare (4.1.0-1) UNRELEASED; urgency=low
* New upstream version
+ * Add standalone dynare++ program to the package, with a dedicated manpage.
* debian/patches/testsuite-octave3.2-crash-workaround,
debian/patches/mcmcdiagnostics,
debian/patches/manual-fix-for-debian,
@@ -17,7 +18,7 @@ dynare (4.1.0-1) UNRELEASED; urgency=low
* Switch to 3.0 (quilt) source format. As a consequence, removed
debian/README.source.
- -- Sébastien Villemot <sebastien.villemot at ens.fr> Wed, 13 Jan 2010 18:11:50 +0100
+ -- Sébastien Villemot <sebastien.villemot at ens.fr> Wed, 13 Jan 2010 18:15:03 +0100
dynare (4.0.4-6) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 1bc8f1c..c6c4f55 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,9 @@ Uploaders: Sébastien Villemot <sebastien.villemot at ens.fr>,
DM-Upload-Allowed: yes
Section: math
Priority: optional
-Build-Depends: debhelper (>= 7), octave3.2-headers (>= 3.2.2), flex, bison,
- texlive, texlive-publishers, xsltproc, dblatex, latex-beamer, docbook-xsl,
+Build-Depends: debhelper (>= 7), octave3.2-headers (>= 3.2.2),
+ libboost-graph-dev, texlive, texlive-publishers, texlive-extra-utils,
+ texlive-formats-extra, xsltproc, dblatex, latex-beamer, docbook-xsl,
quilt, po-debconf, gnuplot-nox
Build-Conflicts: octave3.0
Standards-Version: 3.8.3
@@ -19,6 +20,7 @@ Package: dynare
Architecture: any
Depends: octave3.2 (>= 3.2.2), dynare-common, ${shlibs:Depends}, ${misc:Depends}
Suggests: dynare-doc
+Recommends: octave3.2-headers (>= 3.2.2)
Description: suite for non-linear models with forward looking variables
Dynare is a pre-preprocessor and a collection of GNU Octave and
MATLAB routines which can solve, simulate and estimate non-linear
@@ -33,6 +35,7 @@ Description: suite for non-linear models with forward looking variables
It contains:
* the binary preprocessor
* dynamic loadable libraries for faster computation, compiled for Octave
+ * the standalone program Dynare++ for higher-order approximations
Package: dynare-common
Architecture: all
diff --git a/debian/dynare++.1 b/debian/dynare++.1
new file mode 100644
index 0000000..e4d1d8a
--- /dev/null
+++ b/debian/dynare++.1
@@ -0,0 +1,11 @@
+.TH dynare++ 1 "January 12, 2010" "Dynare++" "Dynare++"
+.SH NAME
+dynare++ \- compute higher order approximations of DSGE models
+.SH DESCRIPTION
+Dynare++ is used to compute higher order approximations of Dynamic
+Stochastic General Equilibrium models.
+.PP
+For a full documentation, including the list of options, please refer to the
+documentation in /usr/share/doc/dynare-doc/.
+.SH AUTHOR
+Ondra Kamenik
diff --git a/debian/dynare-common.install b/debian/dynare-common.install
index 768024f..a37dc5d 100644
--- a/debian/dynare-common.install
+++ b/debian/dynare-common.install
@@ -1,6 +1,9 @@
-matlab/*.m /usr/share/dynare/matlab
-matlab/gensylv/*.m /usr/share/dynare/matlab/gensylv
-matlab/qz/*.m /usr/share/dynare/matlab/qz
-matlab/kronecker/*.m /usr/share/dynare/matlab/kronecker
-matlab/distributions/*.m /usr/share/dynare/matlab/distributions
-matlab/AIM/*.m /usr/share/dynare/matlab/AIM
+matlab/*.m /usr/share/dynare/matlab
+matlab/gensylv/*.m /usr/share/dynare/matlab/gensylv
+matlab/qz/*.m /usr/share/dynare/matlab/qz
+matlab/kronecker/*.m /usr/share/dynare/matlab/kronecker
+matlab/distributions/*.m /usr/share/dynare/matlab/distributions
+matlab/AIM/*.m /usr/share/dynare/matlab/AIM
+matlab/kalman/*.m /usr/share/dynare/matlab/kalman
+matlab/kalman/likelihood/*.m /usr/share/dynare/matlab/kalman/likelihood
+matlab/missing/* /usr/share/dynare/matlab/missing
diff --git a/debian/dynare-doc.doc-base.manual b/debian/dynare-doc.doc-base.manual
index 4c0dfd9..12a6b19 100644
--- a/debian/dynare-doc.doc-base.manual
+++ b/debian/dynare-doc.doc-base.manual
@@ -1,6 +1,6 @@
Document: dynare-manual
Title: Dynare Manual
-Author: Michel Juillard
+Author: Dynare Team
Abstract: Reference manual describing Dynare usage and all the commands allowed in a MOD file
Section: Science/Mathematics
diff --git a/debian/dynare-doc.docs b/debian/dynare-doc.docs
index 4c35ead..daaa59c 100644
--- a/debian/dynare-doc.docs
+++ b/debian/dynare-doc.docs
@@ -5,3 +5,10 @@ doc/macroprocessor/macroprocessor.pdf
doc/bvar-a-la-sims.pdf
doc/preprocessor/preprocessor.pdf
doc/userguide/UserGuide.pdf
+doc/dr.pdf
+dynare++/doc/dynare++-tutorial.pdf
+dynare++/doc/dynare++-ramsey.pdf
+dynare++/sylv/sylvester.pdf
+dynare++/tl/cc/tl.pdf
+dynare++/integ/cc/integ.pdf
+dynare++/kord/kord.pdf
diff --git a/debian/dynare-doc.examples b/debian/dynare-doc.examples
index c2ff6df..69551f0 100644
--- a/debian/dynare-doc.examples
+++ b/debian/dynare-doc.examples
@@ -1,4 +1,5 @@
tests/ramst.mod
tests/example1.mod
+tests/example2.mod
tests/fs2000/fs2000.mod
tests/fs2000/fsdat.m
diff --git a/debian/dynare-matlab.install b/debian/dynare-matlab.install
index b323f04..674300f 100644
--- a/debian/dynare-matlab.install
+++ b/debian/dynare-matlab.install
@@ -1,10 +1,17 @@
-mex/sources/build_matlab.m /usr/src/dynare-matlab
-mex/sources/matlab_versions_compatibility.h /usr/src/dynare-matlab
-mex/sources/mjdgges/*.c /usr/src/dynare-matlab/mjdgges
-mex/sources/gensylv/cc/*.cpp /usr/src/dynare-matlab/gensylv/cc
-mex/sources/gensylv/cc/*.h /usr/src/dynare-matlab/gensylv/cc
-mex/sources/gensylv/matlab/*.cpp /usr/src/dynare-matlab/gensylv/matlab
-mex/sources/kronecker/*.cc /usr/src/dynare-matlab/kronecker
-mex/sources/simulate/*.cc /usr/src/dynare-matlab/simulate
-mex/sources/simulate/*.hh /usr/src/dynare-matlab/simulate
-preprocessor/include/CodeInterpreter.hh /usr/src/dynare-matlab/simulate
+mex/sources/* /usr/src/dynare-matlab/mex/sources
+preprocessor/CodeInterpreter.hh /usr/src/dynare-matlab/preprocessor
+dynare++/src/*.h /usr/src/dynare-matlab/dynare++/src
+dynare++/src/*.cpp /usr/src/dynare-matlab/dynare++/src
+dynare++/kord/*.h /usr/src/dynare-matlab/dynare++/kord
+dynare++/kord/*.cpp /usr/src/dynare-matlab/dynare++/kord
+dynare++/sylv/cc/*.h /usr/src/dynare-matlab/dynare++/sylv/cc
+dynare++/sylv/cc/*.cpp /usr/src/dynare-matlab/dynare++/sylv/cc
+dynare++/sylv/matlab/*.cpp /usr/src/dynare-matlab/dynare++/sylv/matlab
+dynare++/integ/cc/*.h /usr/src/dynare-matlab/dynare++/integ/cc
+dynare++/integ/cc/*.cpp /usr/src/dynare-matlab/dynare++/integ/cc
+dynare++/integ/cc/*.dat /usr/src/dynare-matlab/dynare++/integ/cc
+dynare++/tl/cc/*.h /usr/src/dynare-matlab/dynare++/tl/cc
+dynare++/tl/cc/*.cpp /usr/src/dynare-matlab/dynare++/tl/cc
+dynare++/utils/cc/*.h /usr/src/dynare-matlab/dynare++/utils/cc
+dynare++/utils/cc/*.cpp /usr/src/dynare-matlab/dynare++/utils/cc
+dynare++/extern/matlab/*.cpp /usr/src/dynare-matlab/dynare++/extern/matlab
diff --git a/debian/dynare-matlab.postinst b/debian/dynare-matlab.postinst
index 464bdcd..a3461ab 100644
--- a/debian/dynare-matlab.postinst
+++ b/debian/dynare-matlab.postinst
@@ -32,12 +32,12 @@ fi
# Build the MEX files
-mkdir -p /usr/lib/dynare/mex/2007a /usr/lib/dynare/mex/2007b
+mkdir -p /usr/lib/dynare/mex/matlab
db_get dynare-matlab/matlab-user
MATLAB_USER=$RET
-cd /usr/src/dynare-matlab
+cd /usr/src/dynare-matlab/mex/sources
if [ -z "$MATLAB_USER" ]
then
@@ -45,9 +45,9 @@ then
else
db_input critical dynare-matlab/license-manager || true
db_go || true
- chown -R $MATLAB_USER /usr/lib/dynare/mex/2007a /usr/lib/dynare/mex/2007b
+ chown -R $MATLAB_USER /usr/lib/dynare/mex/matlab
sudo -u $MATLAB_USER $MATLAB -nodisplay -r build_matlab
- chown -R root:root /usr/lib/dynare/mex/2007a /usr/lib/dynare/mex/2007b
+ chown -R root:root /usr/lib/dynare/mex/matlab
fi
#DEBHELPER#
diff --git a/debian/dynare-matlab.prerm b/debian/dynare-matlab.prerm
index 940bcd3..7ec880e 100644
--- a/debian/dynare-matlab.prerm
+++ b/debian/dynare-matlab.prerm
@@ -1,6 +1,6 @@
#!/bin/sh
set -e
-rm -rf /usr/lib/dynare/mex/2007a /usr/lib/dynare/mex/2007b
+rm -rf /usr/lib/dynare/mex/matlab
#DEBHELPER#
diff --git a/debian/dynare.install b/debian/dynare.install
index a96ea4a..fcb9158 100644
--- a/debian/dynare.install
+++ b/debian/dynare.install
@@ -1,2 +1,8 @@
-mex/octave/*.mex /usr/lib/dynare/mex/octave
-preprocessor/dynare_m /usr/lib/dynare/matlab
+preprocessor/dynare_m /usr/lib/dynare/matlab
+mex/build/octave/dynare_simul_/*.mex /usr/lib/dynare/mex/octave
+mex/build/octave/k_order_perturbation/*.mex /usr/lib/dynare/mex/octave
+mex/build/octave/bytecode/*.mex /usr/lib/dynare/mex/octave
+mex/build/octave/kronecker/*.mex /usr/lib/dynare/mex/octave
+mex/build/octave/mjdgges/*.mex /usr/lib/dynare/mex/octave
+mex/build/octave/gensylv/*.mex /usr/lib/dynare/mex/octave
+dynare++/src/dynare++ /usr/bin
diff --git a/debian/dynare.manpages b/debian/dynare.manpages
new file mode 100644
index 0000000..e4cf87c
--- /dev/null
+++ b/debian/dynare.manpages
@@ -0,0 +1 @@
+debian/dynare++.1
diff --git a/debian/rules b/debian/rules
index 3671c47..2853b09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,32 +6,16 @@ include /usr/share/octave/debian/defs.make
build: patch build-stamp
build-stamp:
dh_testdir
-
- # Building preprocessor
- make -C preprocessor
-
- # Building Octave MEX/OCT files
- cd mex/sources && octave --no-history build_octave.m
-
- # Building documentation
- make -C doc
-
- # Exercise the testsuite
+ dh_auto_configure
+ dh_auto_build -- all pdf html
QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null pop -R 2
dh_auto_test
QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null push 2
-
touch build-stamp
clean: unpatch
- dh_testdir
- make clean -C preprocessor
- make clean -C doc
- make clean -C tests
- find mex/sources -name *.o | xargs rm -f
- rm -f mex/octave/*.mex
- rm -f matlab/dynare_m
- dh_clean
+ dh clean
+ rm -f tests/example2_simul # File forgotten in the build system of version 4.1.0
binary-arch: build
dh binary-arch
@@ -47,9 +31,6 @@ VERSION = $(shell dpkg-parsechangelog \
| sed -ne 's/^Version: \([0-9.]\+\).*/\1/p')
get-orig-source:
- svn checkout https://www.dynare.org/svn/dynare/tags/dynare-$(VERSION)
- cd dynare-$(VERSION) && make srctarball
- mv dynare-$(VERSION).tar.gz dynare_$(VERSION).orig.tar.gz
- rm -rf dynare-$(VERSION)
+ wget -O dynare_$(VERSION).orig.tar.gz http://www.dynare.org/download/dynare-4.1/source/dynare-$(VERSION).tar.gz/at_download/file
.PHONY: build clean binary-arch binary-indep binary get-orig-source
--
dynare
More information about the Pkg-octave-commit
mailing list