[Pkg-octave-commit] [SCM] dynare branch, master, updated. 19c9d5e371654c572bbb2fbb7e9b5e395bfee775

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 19c9d5e371654c572bbb2fbb7e9b5e395bfee775
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Sun May 31 23:41:17 2009 +0200

    Added new patch for reference manual

diff --git a/debian/changelog b/debian/changelog
index 04749c3..df47eb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ dynare (4.0.3-2) UNRELEASED; urgency=low
   * dynare-matlab: new contrib binary package aimed at MATLAB users. Contains
     the MEX files source code. The postinst script builds them on the user
     machine.
+  * manual-fix-for-debian: new patch for reference manual
 
  -- Rafael Laboissiere <rafael at debian.org>  Mon, 25 May 2009 21:44:20 +0200
 
diff --git a/debian/patches/manual-fix-for-debian b/debian/patches/manual-fix-for-debian
new file mode 100644
index 0000000..f39d293
--- /dev/null
+++ b/debian/patches/manual-fix-for-debian
@@ -0,0 +1,36 @@
+Fix reference manual with respect to Debian packaging.
+--- a/doc/manual.xml
++++ b/doc/manual.xml
+@@ -167,9 +167,9 @@
+ </sect2>
+ 
+ <sect2><title>On Debian GNU/Linux and Ubuntu</title>
+-<para>Please refer to <ulink url="http://www.dynare.org/DynareWiki/InstallOnDebianOrUbuntu">InstallOnDebianOrUbuntu</ulink> on Dynare Wiki for detailed instructions.</para>
++<para>Install the <literal>dynare</literal> package. Documentation is in the <literal>dynare-doc</literal> package. MATLAB users should install the <literal>dynare-matlab</literal> package.</para>
+ 
+-<para>Dynare will be installed under <filename>/usr/lib/dynare</filename>. Documentation will be under <filename>/usr/share/doc/dynare</filename>.</para>
++<para>Dynare will be installed under <filename>/usr/share/dynare</filename> and <filename>/usr/lib/dynare</filename>. Documentation will be under <filename>/usr/share/doc/dynare-doc</filename>.</para>
+ </sect2>
+ 
+ <sect2 id="install_other_systems"><title>For other systems</title>
+@@ -196,7 +196,7 @@
+ 
+   <para>Under Debian GNU/Linux or Ubuntu, type:</para>
+   <programlisting>
+-   addpath /usr/lib/dynare/matlab
++   addpath /usr/share/dynare/matlab
+   </programlisting>
+ 
+  <para><trademark class="registered">Matlab</trademark> will not remember this setting next time you run it, and you will have
+@@ -221,10 +221,7 @@
+   addpath c:\dynare\4.x.y\matlab
+ </programlisting>
+ 
+-<para>Under Debian GNU/Linux or Ubuntu, type:</para>
+-<programlisting>
+-  addpath /usr/lib/dynare/matlab
+-</programlisting>
++<para>Under Debian GNU/Linux or Ubuntu, there is no need to use <command>addpath</command>; the packaging does it for you.</para>
+ 
+ <para>You will also want to tell to Octave to accept the short syntax (without parentheses and quotes) for the <command>dynare</command> command, by typing:</para>
+ <programlisting>
diff --git a/debian/patches/series b/debian/patches/series
index 26ae828..d76d1fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ bashisms-in-makefiles
 table-name-clash
 rows-name-clash
 build-matlab
+manual-fix-for-debian

-- 
dynare