[Pkg-octave-commit] [octave-optim] 03/04: Remove lyx from Suggests

[Rafael Laboissière]

This is an automated email from the git hooks/post-receive script.

rlaboiss-guest pushed a commit to branch master
in repository octave-optim.

commit 51eb8202d676378d75e466a3de2b465ef943ccb1
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Mon Dec 14 00:35:04 2015 -0200

    Remove lyx from Suggests
    
    The PDF file built from the LyX source of the Mini-HowTo is now
    shipped with the package.
    
    Closes: #807784
    Gbp-Dch: Full
---
 .gitignore                                  |  4 ++++
 debian/control                              |  5 +++--
 debian/octave-optim.doc-base.howto          | 12 ++++++++++++
 debian/octave-optim.docs                    |  3 +--
 debian/patches/includegraphics-format.patch | 17 +++++++++++++++++
 debian/patches/series                       |  1 +
 debian/rules                                | 10 ++++++++--
 7 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9087efc..46536b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,7 @@ debian/files
 debian/octave-optim
 debian/octave-optim.debhelper.log
 debian/octave-optim.substvars
+doc/figures/2D_slice-3.pdf
+doc/optim-mini-howto-2.aux
+doc/optim-mini-howto-2.log
+doc/optim-mini-howto-2.pdf
diff --git a/debian/control b/debian/control
index f931535..18e5215 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,9 @@ Priority: optional
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Sébastien Villemot <sebastien at debian.org>,
            Rafael Laboissiere <rafael at laboissiere.net>
-Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>= 1.0.0)
+Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>= 1.0.0),
+ texlive-latex-base, texlive-font-utils, texlive-fonts-recommended,
+ ghostscript, texlive-fonts-extra
 Standards-Version: 3.9.6
 Homepage: http://octave.sourceforge.net/optim
 Vcs-Git: git://anonscm.debian.org/pkg-octave/octave-optim.git
@@ -13,7 +15,6 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-octave/octave-optim.git
 Package: octave-optim
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${octave:Depends}
-Suggests: lyx
 Description: unconstrained non-linear optimization toolkit for Octave
  Unconstrained Non-linear Optimization toolkit for Octave, a numerical
  computation software. Included are functions to do linear least
diff --git a/debian/octave-optim.doc-base.howto b/debian/octave-optim.doc-base.howto
new file mode 100644
index 0000000..817f235
--- /dev/null
+++ b/debian/octave-optim.doc-base.howto
@@ -0,0 +1,12 @@
+Document: octave-optim-howto
+Title: Mini-HOWTO on using Octave for Unconstrained Nonlinear Optimization
+Author: Etienne Grossmann
+Abstract: Nonlinear optimization problems are very common and when a
+ solution cannot  be found analytically, one usually tries to find it
+ numerically.  This document shows how to perform unconstrained
+ nonlinear minimization  using the Octave language for numerical
+ computation.
+Section: Science/Mathematics
+
+Format: PDF
+Files: /usr/share/doc/octave-optim/optim-mini-howto-2.pdf.gz
diff --git a/debian/octave-optim.docs b/debian/octave-optim.docs
index a643844..4e8ce02 100644
--- a/debian/octave-optim.docs
+++ b/debian/octave-optim.docs
@@ -1,3 +1,2 @@
-doc/optim-mini-howto-2.lyx
-doc/figures
+doc/optim-mini-howto-2.pdf
 doc/html/
diff --git a/debian/patches/includegraphics-format.patch b/debian/patches/includegraphics-format.patch
new file mode 100644
index 0000000..744dc88
--- /dev/null
+++ b/debian/patches/includegraphics-format.patch
@@ -0,0 +1,17 @@
+Description: Include PDF instead of EPS2 figure in the Mini-HowTo
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Bug-Debian: https://bugs.debian.org/807784
+Forwarded: not-needed
+Last-Update: <2015-12-14>
+
+--- octave-optim-1.4.1.orig/doc/optim-mini-howto-2.tex
++++ octave-optim-1.4.1/doc/optim-mini-howto-2.tex
+@@ -118,7 +118,7 @@ greatly depend on the optimized function
+ 
+ \begin{figure}
+ \begin{centering}
+-\raisebox{6mm}{\includegraphics[width=0.3\textwidth]{figures/2D_slice-3.eps2}}~
++\raisebox{6mm}{\includegraphics[width=0.3\textwidth]{figures/2D_slice-3}}~
+ \par\end{centering}
+ 
+ \caption{\label{fig:function} 2D slice of the function that is minimized throughout
diff --git a/debian/patches/series b/debian/patches/series
index 1525fe1..cb33dcd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 add-info-dir.patch
 info-file-path.patch
+includegraphics-format.patch
diff --git a/debian/rules b/debian/rules
index 2789b1a..80bd78e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,19 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-DEB_COMPRESS_EXCLUDE_ALL = .lyx .eps .eps2
-
 include /usr/share/cdbs/1/class/octave-pkg.mk
 
+# Build the HowTo documentation in PDF form from the LyX source
+build/octave-optim::
+	epstopdf doc/figures/2D_slice-3.eps2
+	(cd doc ; for i in 1 2 ; do pdflatex optim-mini-howto-2.tex ; done)
+
 # Recompile the info file (it has been cleaned by the pkg install), and then
 # install it in the system-wide directory (after renaming it).
 install/octave-optim::
 	make -C src ../doc/optim.info
 	mkdir -p debian/octave-optim/usr/share/info/
 	cp doc/optim.info debian/octave-optim/usr/share/info/octave-optim.info
+
+clean::
+	rm -f doc/figures/*.pdf doc/*.aux doc/*.log doc/*.pdf

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-optim.git