[gnuplot5] 05/07: Update doc-generation.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository gnuplot5.

commit 7907a7addd2bf579e48c7aa86f2bb640da3400e4
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Jan 22 23:14:46 2015 +0100

    Update doc-generation.
---
 debian/control                       |  3 +++
 debian/gnuplot5-doc.docs             |  9 +++++----
 debian/patches/10_removepicins.patch | 30 ++++++++++++++++++++++++++++++
 debian/patches/series                |  2 ++
 debian/rules                         | 23 ++++++++++-------------
 5 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index 6620d20..7d6cae4 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends:
  qtbase5-dev,
  qtbase5-dev-tools,
  qttools5-dev-tools,
+ latex2html,
  libqt5webkit5-dev,
  libqt5opengl5-dev,
  libqt5svg5-dev,
@@ -27,9 +28,11 @@ Build-Depends:
  pkg-config,
  texinfo,
  texlive-fonts-recommended,
+ texlive-font-utils,
  texlive-latex-base,
  texlive-latex-extra,
  texlive-latex-recommended,
+ libwxgtk3.0-dev,
  zlib1g-dev
 Homepage: http://gnuplot.sourceforge.net/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/gnuplot5.git
diff --git a/debian/gnuplot5-doc.docs b/debian/gnuplot5-doc.docs
index 75cfbae..a3dcd92 100644
--- a/debian/gnuplot5-doc.docs
+++ b/debian/gnuplot5-doc.docs
@@ -1,11 +1,12 @@
+debian/build-x11/docs/gnuplot.dvi
+debian/build-x11/docs/gnuplot.pdf
 debian/build-x11/docs/gnuplot.ps
+debian/build-x11/docs/gnuplot.gih
 debian/build-x11/docs/gpcard.ps
+debian/build-x11/docs/htmldocs
 debian/build-x11/tutorial/tutorial.dvi
+debian/build-x11/tutorial/tutorial.pdf
 debian/build-x11/tutorial/tutorial.ps
-docs/psdoc/ps_guide.ps
-docs/psdoc/ps_symbols.gpi
-docs/psdoc/ps_file.doc
-docs/psdoc/ps_fontfile_doc.ps
 BUGS
 NEWS
 README
diff --git a/debian/patches/10_removepicins.patch b/debian/patches/10_removepicins.patch
new file mode 100644
index 0000000..4618572
--- /dev/null
+++ b/debian/patches/10_removepicins.patch
@@ -0,0 +1,30 @@
+Description: removes picins latex include
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-01-22
+
+Index: gnuplot5-5.0.0+dfsg1/docs/Makefile.am
+===================================================================
+--- gnuplot5-5.0.0+dfsg1.orig/docs/Makefile.am
++++ gnuplot5-5.0.0+dfsg1/docs/Makefile.am
+@@ -172,8 +172,7 @@ pdffigures: pdffigures.tex $(top_srcdir)
+ 	rm -f figures
+ 
+ pdffigures.tex:	figures
+-	echo "\usepackage{graphicx}" > pdffigures.tex ; \
+-	echo "\usepackage{picins}" >> pdffigures.tex
++	echo "\usepackage{graphicx}" > pdffigures.tex
+ 
+ figures: allterm.h doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc
+ 	@if [ -a $(top_srcdir)/src/gnuplot ] ; then \
+Index: gnuplot5-5.0.0+dfsg1/docs/Makefile.in
+===================================================================
+--- gnuplot5-5.0.0+dfsg1.orig/docs/Makefile.in
++++ gnuplot5-5.0.0+dfsg1/docs/Makefile.in
+@@ -953,7 +953,6 @@ pdffigures: pdffigures.tex $(top_srcdir)
+ 
+ pdffigures.tex:	figures
+ 	echo "\usepackage{graphicx}" > pdffigures.tex ; \
+-	echo "\usepackage{picins}" >> pdffigures.tex
+ 
+ figures: allterm.h doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc
+ 	@if [ -a $(top_srcdir)/src/gnuplot ] ; then \
diff --git a/debian/patches/series b/debian/patches/series
index 04b1a35..2ec82d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@
 05_default_gd_font.diff
 08_disable_demo_plugin.patch
 09_remove_beos.patch
+10_removepicins.patch
+11_fix_linkage_wx.patch
diff --git a/debian/rules b/debian/rules
index c1eb84f..3c8ee89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,23 +34,16 @@ override_dh_auto_configure:
 	mkdir -p $(BUILDDIR_NOX)
 	cd $(BUILDDIR_NOX);  ./../../configure $(conf_opts) --with-qt=no --without-x --disable-wxwidgets --disable-wxt
 	mkdir -p $(BUILDDIR_X11)
-	cd $(BUILDDIR_X11); ../../configure $(conf_opts) --with-qt=no --disable-wxt
+	cd $(BUILDDIR_X11); ../../configure $(conf_opts) --with-qt=no --with-tutorial --disable-wxt
 	mkdir -p $(BUILDDIR_QT)
 	cd $(BUILDDIR_QT); ../../configure $(conf_opts)  --enable-qt --disable-wxt
 
-override_dh_auto_build-arch:
+override_dh_auto_build:
 	dh_auto_build -a -- -C $(BUILDDIR_NOX)/src
 	dh_auto_build -a -- -C $(BUILDDIR_X11) pkglibexecdir='$$(libexecdir)'
 	dh_auto_build -a -- -C $(BUILDDIR_QT) pkglibexecdir='$$(libexecdir)'
-
-override_dh_auto_build-indep:
-	cp -f term/PostScript/prologue.ps docs/psdoc/
-	dh_auto_build -i -- -C $(BUILDDIR_X11)/docs ps info gpcard.ps
-	dh_auto_build -i -- -C $(BUILDDIR_X11)/tutorial tutorial.dvi tutorial.ps
-	dh_auto_build -i -- -C $(BUILDDIR_X11)/demo
-	dh_auto_build -i -- -C docs/psdoc ps_fontfile_doc.ps
-	mkdir -p docs/htmldocs
-	$(MAKEINFO) --html --force --output=docs/htmldocs/ docs/gnuplot.texi
+	cd $(BUILDDIR_X11)/docs; $(MAKE) pdf; $(MAKE) ps; $(MAKE) html; ls
+	cd $(BUILDDIR_X11)/tutorial; $(MAKE) pdf; $(MAKE) ps; ls
 
 override_dh_auto_install:
 	$(MAKE) -C $(BUILDDIR_NOX) install DESTDIR=$(CURDIR)/debian/tmp/NOX/ \
@@ -69,8 +62,6 @@ override_dh_auto_install:
 	mv $(CURDIR)/debian/tmp/QT/usr/share/man/man1/gnuplot.1 $(CURDIR)/debian/tmp/QT/usr/share/man/man1/gnuplot5-qt.1
 	mv $(CURDIR)/debian/tmp/QT/usr/share/gnuplot5/gnuplot.gih $(CURDIR)/debian/tmp/QT/usr/share/gnuplot5/gnuplot5-qt.gih
 
-override_dh_auto_test:
-
 override_installchangelogs:
 	dh_installchangelogs -pgnuplot5-doc ChangeLog
 
@@ -80,3 +71,9 @@ override_dh_installman:
 	sed -i 's/\[X11 options\] //g' $(MANPNOX)
 	sed -i 's/plotting program/plotting program (no-X version)/g' $(MANPNOX)
 	sed -i '/SH\ X11\ OPTIONS/,/command line\./ d' $(MANPNOX)
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf $(BUILDDIR_NOX)
+	rm -rf $(BUILDDIR_X11)
+	rm -rf $(BUILDDIR_QT)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gnuplot5.git