diff --git a/debian/README.Debian b/debian/README.Debian
index 60a7431b24922f6b6b74ff135700b224ef084564..5fdffef6074c47fa21536212d3191432ab08a96d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -12,36 +12,36 @@ Or on Dynare Wiki:
http://www.cepremap.cnrs.fr/DynareWiki
-Using Dynare with Matlab
-------------------------
+Using Dynare with Matlab (R)
+----------------------------
-Dynare requires Matlab version 6.5 or above. With older versions of Matlab, it
-may fail or give unexpected results.
+Dynare requires Matlab (R) version 6.5 or above. With older versions of Matlab (R),
+it may fail or give unexpected results.
To use Dynare, you just have to add the 'matlab' subdirectory of your Dynare
-installation to Matlab's path. You have two options for doing that:
+installation to Matlab (R) path. You have two options for doing that:
* Use the addpath command, by typing the following:
addpath /usr/lib/dynare/matlab
- Matlab will not remember this setting next time you run it, and you will have
- to do it again.
+ Matlab (R) will not remember this setting next time you run it, and you will
+ have to do it again.
* Select the "Set Path" entry in the "File" menu, then click on "Add
Folder...", and select the '/usr/lib/dynare/matlab' directory. Note that you
SHOULD NOT use "Add with Subfolders...". Apply the settings by clicking on
- "Save". Note that Matlab will remember this setting next time you run it.
+ "Save". Note that Matlab (R) will remember this setting next time you run it.
-You can test your installation by typing 'dynare' at the Matlab prompt. This
-should give you an error message complaining that you did not specify a MOD
-file.
+You can test your installation by typing 'dynare' at the Matlab (R)
+prompt. This should give you an error message complaining that you did not
+specify a MOD file.
Using Dynare with Octave
------------------------
-Dynare is now available for Octave, a free clone of Matlab (see
+Dynare is now available for Octave, a free clone of Matlab (R) (see
<http://www.octave.org>).
Octave should already be installed on your system, as a dependency of the
@@ -73,8 +73,8 @@ which is faster than standard M-files. These parts are compiled and distributed
as dynamic loadable libraries (DLL), located in the 'mex' subdirectory of your
Dynare installation.
-If the DLL are correctly detected by Matlab or Octave, the following should be
-displayed when you launch Dynare:
+If the DLL are correctly detected by Matlab (R) or Octave, the following should
+be displayed when you launch Dynare:
Configuring Dynare ...
[mex] Generalized QZ.
@@ -92,13 +92,14 @@ alternatives written in M-files, and display the following:
[m] Sparse kronecker products.
In this last case, Dynare will run correctly, but with suboptimal speed. There
-could be several reasons for Matlab or Octave failing to detect the DLL:
+could be several reasons for Matlab (R) or Octave failing to detect the DLL:
* Your path settings may be wrong. Make sure that the 'matlab' subdirectory of
your Dynare installation is the only Dynare directory present in the path
variable.
-* Your Matlab or Octave version may be incompatible with the provided binaries.
+* Your Matlab (R) or Octave version may be incompatible with the provided
+ binaries.
* You may have a custom M-file in your search path with the same name than a
DLL, therefore overriding it.
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000000000000000000000000000000000000..1ff0d1dcdab91d4bb7484d0890b353135da54d9a
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,16 @@
+The 'rules' file can build packages dynare-matlab7.4 and dynare-matlab7.5,
+which contain DLLs for Matlab 7.4 and 7.5.
+
+By default, the 'rules' file assumes that you have installed these Matlab (R)
+versions in /usr/local/matlab74 and /usr/local/matlab75 respectively. If you
+installed them somewhere else, please correct the environment variables at the
+beginning of the 'rules' file.
+
+Note that if any of these two directories doesn't exist, the corresponding
+package will not be built.
+
+Also note that the 'rules' file plays with Matlab (R) license manager,
+launching it before building the MEX files, and killing it after. You must kill
+any license manager before building the package, otherwise it fill fail. Also
+note that if you have a single-user license, you must obviously build the
+package with the user account which has the right to use the license.
diff --git a/debian/changelog b/debian/changelog
index ee82005a8f86c71528320250ad21d720195b1db5..ec9d4fbfa3b539353567c6c77d0018685e14b289 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+dynare (4~svn.20080711) UNRELEASED; urgency=low
+
+ * New functions for posterior distribution processing
+ * Added diffuse_filter option
+ * Removed more global variables
+ * Improvements on numerical gradient in Sims optimizer
+ * Improvements on Octave compatibility
+ * Added a warning when Matlab < 6.5 or Octave < 3.0.0
+ * Many bug fixes
+ * Some updates to the manual (which is still far from up to date!)
+ * Packaging issues:
+ - Added copyright, README.Debian and README.source files
+ - Added documentation to package (manual and userguide are registered through
+ doc-base)
+ - Fixes for compilation on GNU/Linux on amd64 architecture
+
+ -- Sébastien Villemot <sebastien.villemot@ens.fr> Fri, 11 Jul 2008 15:38:01 +0200
+
dynare (4~svn.20080619) UNRELEASED; urgency=low
* New SVN snapshot.
diff --git a/debian/control b/debian/control
index dab38345b24e33017fcfabff19b9b8e45b61645e..7f63de56174fd6c323da4f5c1cd51382008cbaa4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: dynare
Maintainer: Sébastien Villemot <sebastien.villemot@ens.fr>
Section: math
Priority: optional
-Build-Depends: debhelper (>= 6), octave3.0-headers, g++-4.1, flex, bison, texlive, xsltproc, dblatex, latex-beamer
+Build-Depends: debhelper (>= 6), octave3.0-headers, g++-4.1, flex, bison, texlive, xsltproc, dblatex, latex-beamer, docbook-xsl
Standards-Version: 3.8.0
Homepage: http://www.dynare.org
diff --git a/debian/copyright b/debian/copyright
index 30990e0a148e908f4db5531c389b25cf9ceca8b6..afacea023168ef1c572723db5178a14ae6c0ce4f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,8 +12,9 @@ Debian packaging was done by Sébastien Villemot <sebastien.villemot@ens.fr>.
Copyright notice for software
-----------------------------
-Most Dynare source files are copyright 1996-2008 Dynare Team. There are some
-exceptions to this, which are described in source file headers when relevant.
+Most Dynare source files are Copyright (C) 1996-2008 Dynare Team. There are
+some exceptions to this, which are described in source file headers when
+relevant.
Dynare is free software: you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software
@@ -43,4 +44,4 @@ be found in `/usr/share/common-licenses/GFDL-1.2'.
Credits
-------
-Matlab is a registered trademark of The Mathworks, Inc.
+Matlab (R) is a registered trademark of The Mathworks, Inc.
diff --git a/debian/dynare.doc-base.manual b/debian/dynare.doc-base.manual
new file mode 100644
index 0000000000000000000000000000000000000000..d22c12a0ea506e330fe4b3fc473f622c971c7b51
--- /dev/null
+++ b/debian/dynare.doc-base.manual
@@ -0,0 +1,12 @@
+Document: dynare-manual
+Title: Dynare Manual
+Author: Michel Juillard
+Abstract: Reference manual describing Dynare usage and all the commands allowed in a MOD file
+Section: Science/Mathematics
+
+Format: HTML
+Index: /usr/share/doc/dynare/manual-html/index.html
+Files: /usr/share/doc/dynare/manual-html/*.html
+
+Format: PDF
+Files: /usr/share/doc/dynare/manual.pdf
diff --git a/debian/dynare.doc-base.userguide b/debian/dynare.doc-base.userguide
new file mode 100644
index 0000000000000000000000000000000000000000..ec50b6675fdb6bb894985aedc61177ed5440724c
--- /dev/null
+++ b/debian/dynare.doc-base.userguide
@@ -0,0 +1,8 @@
+Document: dynare-userguide
+Title: Dynare User Guide
+Author: Tommaso Mancini Griffoli
+Abstract: Introduces the reader to Dynare features and usage
+Section: Science/Mathematics
+
+Format: PDF
+Files: /usr/share/doc/dynare/Dynare_UserGuide_WebBeta.pdf
diff --git a/debian/dynare.docs b/debian/dynare.docs
index a0f690bd278380c57963527eb46315880348f067..c52c236cd74d8bb420b8c73cd9416191ad4217d9 100644
--- a/debian/dynare.docs
+++ b/debian/dynare.docs
@@ -3,4 +3,5 @@ doc/manual-html
doc/guide.pdf
doc/macroprocessor/macroprocessor.pdf
doc/bvar-a-la-sims.pdf
+doc/preprocessor/preprocessor.pdf
doc/userguide/Dynare_UserGuide_WebBeta.pdf
diff --git a/debian/rules b/debian/rules
index ddf4edf2db81fcc6050abe982feb6f636913f2d1..0c77d2b4ba44429a987e7f0ba51509c8dbfdfcda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,6 +59,7 @@ binary-arch: build
dh_install
dh_installchangelogs
dh_installdocs
+ dh_installdeb
-dh_lintian # Do not fail here, since dh_lintian is only present in debhelper >= 6.0.7, and Ubuntu Hardy has 6.0.4
dh_strip
dh_compress -X.pdf
diff --git a/windows/README.txt b/windows/README.txt
index 982064e529d02e2da551e992f1a7855089a6a6c7..86e9c061a4468f05752bb8fe8e0e1c7f021574e3 100644
--- a/windows/README.txt
+++ b/windows/README.txt
@@ -21,14 +21,14 @@ NOTE: Dynare comes with an automated uninstaller, which you can run from the
"Add/Remove Programs" menu of the Control Panel.
-Using Dynare with Matlab
-------------------------
+Using Dynare with Matlab (R)
+----------------------------
-Dynare requires Matlab version 6.5 or above. With older versions of Matlab, it
-may fail or give unexpected results.
+Dynare requires Matlab (R) version 6.5 or above. With older versions of Matlab (R),
+it may fail or give unexpected results.
To use Dynare, you just have to add the 'matlab' subdirectory of your Dynare
-installation to Matlab's path. You have two options for doing that:
+installation to Matlab (R) path. You have two options for doing that:
* Use the addpath command, by typing the following (assuming that you have
installed Dynare at the standard location, and replacing '4.x.y' by correct
@@ -36,24 +36,24 @@ installation to Matlab's path. You have two options for doing that:
addpath c:\dynare\4.x.y\matlab
- Matlab will not remember this setting next time you run it, and you will have
- to do it again.
+ Matlab (R) will not remember this setting next time you run it, and you will
+ have to do it again.
* Select the "Set Path" entry in the "File" menu, then click on "Add
Folder...", and select the 'matlab' subdirectory of your Dynare
installation. Note that you SHOULD NOT use "Add with Subfolders...". Apply
- the settings by clicking on "Save". Note that Matlab will remember this
+ the settings by clicking on "Save". Note that Matlab (R) will remember this
setting next time you run it.
-You can test your installation by typing 'dynare' at the Matlab prompt. This
-should give you an error message complaining that you did not specify a MOD
-file.
+You can test your installation by typing 'dynare' at the Matlab (R)
+prompt. This should give you an error message complaining that you did not
+specify a MOD file.
Using Dynare with Octave
------------------------
-Dynare is now available for Octave, a free clone of Matlab (see
+Dynare is now available for Octave, a free clone of Matlab (R) (see
<http://www.octave.org>).
For installing Octave on your Windows system, go to:
@@ -63,7 +63,7 @@ For installing Octave on your Windows system, go to:
Then pick the 'octave-3.0.1-vs2008-setup.exe' installer. Choose GNUplot
graphical backend (instead of JHandles) during installation. Also note that
this distribution contains a nice text editor, which you can invoke with "edit"
-as you would under Matlab.
+as you would under Matlab (R).
WARNING: the Octave binary distribution has a bug which makes Octave crash
everytime one types 'clear all' (and therefore everytime one runs Dynare!). A
@@ -101,8 +101,8 @@ which is faster than standard M-files. These parts are compiled and distributed
as dynamic loadable libraries (DLL), located in the 'mex' subdirectory of your
Dynare installation.
-If the DLL are correctly detected by Matlab or Octave, the following should be
-displayed when you launch Dynare:
+If the DLL are correctly detected by Matlab (R) or Octave, the following should
+be displayed when you launch Dynare:
Configuring Dynare ...
[mex] Generalized QZ.
@@ -120,13 +120,14 @@ alternatives written in M-files, and display the following:
[m] Sparse kronecker products.
In this last case, Dynare will run correctly, but with suboptimal speed. There
-could be several reasons for Matlab or Octave failing to detect the DLL:
+could be several reasons for Matlab (R) or Octave failing to detect the DLL:
* Your path settings may be wrong. Make sure that the 'matlab' subdirectory of
your Dynare installation is the only Dynare directory present in the path
variable.
-* Your Matlab or Octave version may be incompatible with the provided binaries.
+* Your Matlab (R) or Octave version may be incompatible with the provided
+ binaries.
* You may have a custom M-file in your search path with the same name than a
DLL, therefore overriding it.
@@ -135,8 +136,9 @@ could be several reasons for Matlab or Octave failing to detect the DLL:
Copyright notice for software
-----------------------------
-Most Dynare source files are copyright 1996-2008 Dynare Team. There are some
-exceptions to this, which are described in source file headers when relevant.
+Most Dynare source files are Copyright (C) 1996-2008 Dynare Team. There are
+some exceptions to this, which are described in source file headers when
+relevant.
Dynare is free software: you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software
@@ -165,4 +167,4 @@ A copy of the license can be found in the 'fdl.txt' file.
Credits
-------
-Matlab is a registered trademark of The Mathworks, Inc.
+Matlab (R) is a registered trademark of The Mathworks, Inc.
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index 561a243e9664406e6160136e73601abb03e3ebcc..352bd20bb58d29831a98c95bbbb3173bf0e353e9 100644
--- a/windows/dynare.nsi
+++ b/windows/dynare.nsi
@@ -69,7 +69,7 @@ Section
File ..\mex\octave\rcond.m ..\mex\octave\*.mex
SetOutPath $INSTDIR\doc
- File ..\doc\manual.pdf ..\doc\guide.pdf ..\doc\userguide\Dynare_UserGuide_WebBeta.pdf ..\doc\bvar-a-la-sims.pdf ..\doc\macroprocessor\macroprocessor.pdf
+ File ..\doc\manual.pdf ..\doc\guide.pdf ..\doc\userguide\Dynare_UserGuide_WebBeta.pdf ..\doc\bvar-a-la-sims.pdf ..\doc\macroprocessor\macroprocessor.pdf ..\doc\preprocessor\preprocessor.pdf
SetOutPath $INSTDIR\doc\manual-html
File ..\doc\manual-html\*.html