From f627730a3dbcbc31f647d1d74f71d190a84798e8 Mon Sep 17 00:00:00 2001
From: sebastien <sebastien@ac1d8469-bf42-47a9-8791-bf33cf982152>
Date: Fri, 20 Mar 2009 11:20:52 +0000
Subject: [PATCH] 4.0: merged r2271 changeset from trunk (windows package:
 updated README.txt for Octave/Windows VC++ 3.0.3) + minor modifications to
 Debian packaging

git-svn-id: https://www.dynare.org/svn/dynare/branches/4.0@2490 ac1d8469-bf42-47a9-8791-bf33cf982152
---
 debian/control     |  2 +-
 debian/copyright   |  2 +-
 windows/README.txt | 18 +++++++++++-------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 7f63de5617..253db184d2 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Package: dynare
 Architecture: any
 Depends: octave3.0, ${shlibs:Depends}
 Description: Software suite for non-linear models with forward looking variables
- Dynare is a pre-preprocesser and a collection of Octave and Matlab (R) routines
+ Dynare is a pre-preprocessor and a collection of Octave and Matlab (R) routines
  which can solve, simulate and estimate non-linear models with forward looking
  variables.
  .
diff --git a/debian/copyright b/debian/copyright
index aaa2e28e46..50dd8d626b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream source for Dynare can be found on:
 
 It can also be downloaded via subversion at:
 
-  http://www.cepremap.cnrs.fr/svn/
+  http://www.dynare.org/svn/dynare
 
 Debian packaging was done by Sébastien Villemot <sebastien.villemot@ens.fr>.
 
diff --git a/windows/README.txt b/windows/README.txt
index 3fe314de72..e1690f4a27 100644
--- a/windows/README.txt
+++ b/windows/README.txt
@@ -53,17 +53,21 @@ specify a MOD file.
 Using Dynare with Octave
 ------------------------
 
-Dynare is now available for Octave, a free clone of Matlab (R) (see
+Dynare is now available for GNU Octave, a free clone of Matlab (R) (see
 <http://www.octave.org>).
 
-For installing Octave on your Windows system, go to:
+The recommended Octave distribution is the Octave/Windows VC++ 3.0.3
+precompiled binaries from Octave Forge, available at:
 
-  http://sourceforge.net/project/showfiles.php?group_id=2888&package_id=40078
+ http://sourceforge.net/project/showfiles.php?group_id=2888&package_id=40078&release_id=642199
 
-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 (R).
+During installation, you will be asked which graphical backend to use. Neither
+of them works perfectly with Dynare at this time:
+
+ * GNUplot gives better-looking results when several graphics are plotted in the
+   same window, but window titles will not show up
+ * JHandles properly displays windows titles, but gives ugly results when several
+   plots are displayed in the same window 
 
 WARNING: the Octave binary distribution has a bug which makes Octave crash
 everytime one types 'clear all' (and therefore everytime one runs Dynare!). A
-- 
GitLab