[SCM] Gnuplot. Interactive plotting program branch, master, updated. debian/4.6.3-1-5-g2aba37f

[Anton Gladky]

The following commit has been merged in the master branch:
commit 39692d79197dbda09f8d5df8436b41b8e30e594a
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue Jun 4 22:19:18 2013 +0200

    Force makeinfo not to fail on warnings. Remove mkinstalldirs. (Closes: #711067).

diff --git a/debian/patches/09_force_texinfo.patch b/debian/patches/09_force_texinfo.patch
new file mode 100644
index 0000000..2062619
--- /dev/null
+++ b/debian/patches/09_force_texinfo.patch
@@ -0,0 +1,35 @@
+Description: force makeinfo not to fail on warnings. Remove mkinstalldirs.
+Bug-Debian: 711067
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2013-06-04
+
+--- a/docs/Makefile.in
++++ b/docs/Makefile.in
+@@ -390,7 +390,7 @@
+ info: gnuplot.info
+ 
+ gnuplot.info: $(srcdir)/gnuplot.texi
+-	$(MAKEINFO) -I$(srcdir) $(srcdir)/gnuplot.texi --no-split --output=$@
++	$(MAKEINFO) -I$(srcdir) $(srcdir)/gnuplot.texi --no-split --force --output=$@
+ 
+ # Thanks to Bruce Ravel for doc2texi.el!
+ gnuplot.texi $(srcdir)/gnuplot-eldoc.el $(srcdir)/gnuplot-eldoc.elc: $(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
+@@ -452,18 +452,15 @@
+ install: install-gih install-info install-pdf
+ 
+ install-gih: gnuplot.gih
+-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
+ 	$(INSTALL_DATA) gnuplot.gih $(DESTDIR)$(GIHDIR)/gnuplot.gih
+ 
+ install-pdf:
+-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
+ 	if test -f gnuplot.pdf ; then \
+ 	    $(INSTALL_DATA) gnuplot.pdf $(DESTDIR)$(GIHDIR)/gnuplot.pdf; \
+ 	fi
+ 
+ install-info: gnuplot.info gnuplot-eldoc.el gnuplot-eldoc.elc
+ 	@if test "$(EMACS)" != no; then \
+-	    $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir) $(DESTDIR)$(lispdir); \
+ 	    $(INSTALL_DATA) gnuplot.info $(DESTDIR)$(infodir)/gnuplot.info; \
+ 	    $(INSTALL_DATA) gnuplot-eldoc.el $(DESTDIR)$(lispdir)/gnuplot-eldoc.el; \
+ 	    $(INSTALL_DATA) gnuplot-eldoc.elc $(DESTDIR)$(lispdir)/gnuplot-eldoc.elc; \
diff --git a/debian/patches/series b/debian/patches/series
index 6bbc75a..ed89799 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 05_default_gd_font.diff
 #06_fix_format_not_a_string.diff
 08_do_not_set_qt_default_term.patch
+09_force_texinfo.patch
diff --git a/debian/rules b/debian/rules
index 23c0e18..35e4ef8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,7 +61,7 @@ override_dh_auto_build-indep:
 	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 --output=docs/htmldocs/ docs/gnuplot.texi
+	$(MAKEINFO) --html --force --output=docs/htmldocs/ docs/gnuplot.texi
 
 
 override_dh_auto_clean:

-- 
Gnuplot. Interactive plotting program