[Pkg-octave-commit] [SCM] dynare branch, master, updated. 304ca1e6661520b1ae552a2a989b90bd5c477272

[Vincent Crevot]

The following commit has been merged in the master branch:
commit 1ec32ac3fb7a56d68fed5db307316f63eaa5cdfc
Author: Vincent Crevot <vincent.crevot at nodalink.com>
Date:   Wed Feb 16 07:49:58 2011 +0100

    Build and install info doc

diff --git a/debian/changelog b/debian/changelog
index 0a9a930..1938b70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,14 +6,21 @@ dynare (4.2.0-1) UNRELEASED; urgency=low
   * debian/control:
     - Bump boost dependency to 1.36.
     - Add boost dependency to dynare-matlab package.
-    - Add dependency to texlive-generic-recommended which contains the epsf
+    - Add dependency on texlive-generic-recommended which contains the epsf
       package needed by doc/parallel/parallel.tex.
+    - Add dependency on docbook2x to build the info doc. 
+  * debian/rules:
+    Build the info doc.
   * patches/extra-addpath:
     Refreshed patch.
   * debian/patches/build-matlab:
     Removed patch.
+  * patches/info-filename-and-category:
+    Rename info doc file and give it a directory category as per lintian.
   * debian/dynare-common.install:
     Install new matlab files.
+  * debian/dynare-doc.info:
+    Install info doc.
 
  -- Vincent Crevot <vincent.crevot at nodalink.com>  Wed, 16 Feb 2011 04:51:03 +0100
 
diff --git a/debian/control b/debian/control
index d294136..fa055da 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Priority: optional
 Build-Depends: debhelper (>= 7.0.50), octave3.2-headers (>= 3.2.2),
  libboost-graph-dev (>= 1.36), texlive, texlive-publishers, texlive-extra-utils,
  texlive-formats-extra, texlive-generic-recommended, xsltproc, dblatex (>=0.2.12-3),
- latex-beamer, docbook-xsl, quilt, po-debconf, gnuplot-nox
+ latex-beamer, docbook-xsl, quilt, po-debconf, gnuplot-nox, docbook2x
 Build-Conflicts: octave3.0
 Standards-Version: 3.9.1
 Homepage: http://www.dynare.org/
diff --git a/debian/dynare-doc.info b/debian/dynare-doc.info
new file mode 100644
index 0000000..17467d6
--- /dev/null
+++ b/debian/dynare-doc.info
@@ -0,0 +1 @@
+doc/dynare.info
diff --git a/debian/patches/info-filename-and-category b/debian/patches/info-filename-and-category
new file mode 100644
index 0000000..f6ce788
--- /dev/null
+++ b/debian/patches/info-filename-and-category
@@ -0,0 +1,61 @@
+Description: Rename texinfo file and and add directory category
+Author: Vincent Crevot <vincent.crevot at nodalink.com>
+
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -17,7 +17,7 @@
+ INFO_TARGETS =
+ 
+ if HAVE_DOCBOOK2XTEXI_MAKEINFO
+-INFO_TARGETS += manual.info
++INFO_TARGETS += dynare.info
+ endif
+ 
+ info-local: $(INFO_TARGETS)
+@@ -46,12 +46,12 @@
+ manual.pdf: manual.xml
+ 	$(DBLATEX) manual.xml
+ 
+-manual.texi: manual.xml
+-	$(DOCBOOK2XTEXI) --encoding=utf-8//TRANSLIT --string-param output-file=manual $<
++dynare.texi: manual.xml
++	$(DOCBOOK2XTEXI) --encoding=utf-8//TRANSLIT --string-param output-file=dynare --string-param directory-category=Math --string-param directory-description="Dynare suite" $<
+ 
+-manual.info: manual.texi
++dynare.info: dynare.texi
+ 	$(MAKEINFO) $<
+ 
+ clean-local:
+-	rm -f *~ *.pdf *.log *.aux *.out manual.texi manual.info
++	rm -f *~ *.pdf *.log *.aux *.out dynare.texi dynare.info
+ 	rm -rf manual-html
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -35,7 +35,7 @@
+ host_triplet = @host@
+ @HAVE_PDFLATEX_TRUE at am__append_1 = guide.pdf bvar-a-la-sims.pdf dr.pdf
+ @HAVE_DBLATEX_TRUE at am__append_2 = manual.pdf
+- at HAVE_DOCBOOK2XTEXI_MAKEINFO_TRUE@am__append_3 = manual.info
++ at HAVE_DOCBOOK2XTEXI_MAKEINFO_TRUE@am__append_3 = dynare.info
+ subdir = doc
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -604,14 +604,14 @@
+ manual.pdf: manual.xml
+ 	$(DBLATEX) manual.xml
+ 
+-manual.texi: manual.xml
+-	$(DOCBOOK2XTEXI) --encoding=utf-8//TRANSLIT --string-param output-file=manual $<
++dynare.texi: manual.xml
++	$(DOCBOOK2XTEXI) --encoding=utf-8//TRANSLIT --string-param output-file=dynare --string-param directory-category=Math --string-param directory-description="Dynare suite" $<
+ 
+-manual.info: manual.texi
++dynare.info: dynare.texi
+ 	$(MAKEINFO) $<
+ 
+ clean-local:
+-	rm -f *~ *.pdf *.log *.aux *.out manual.texi manual.info
++	rm -f *~ *.pdf *.log *.aux *.out dynare.texi dynare.info
+ 	rm -rf manual-html
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/debian/patches/series b/debian/patches/series
index 944e12e..350f0fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 extra-addpath
 fhs-compliance
+info-filename-and-category
diff --git a/debian/rules b/debian/rules
index 4fc3bf2..e499bd8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/octave/debian/defs.make
 	dh $@
 
 override_dh_auto_build:
-	dh_auto_build -- all pdf html
+	dh_auto_build -- all pdf html info
 
 # Don't run the testsuite
 override_dh_auto_test:

-- 
dynare