[gnuplot] 01/01: Remove outdated info-patch. (Closes: #844461)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository gnuplot.

commit 82388b29c7f86bd478bfdb2391588bfb9f8ac6d6
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Nov 16 20:16:45 2016 +0100

    Remove outdated info-patch. (Closes: #844461)
---
 debian/patches/12_info.patch | 87 --------------------------------------------
 debian/patches/series        |  1 -
 debian/rules                 |  1 -
 3 files changed, 89 deletions(-)

diff --git a/debian/patches/12_info.patch b/debian/patches/12_info.patch
deleted file mode 100644
index beaadaf..0000000
--- a/debian/patches/12_info.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Description: generate info-file
-Bug-Debian: https://bugs.debian.org/778757
-Author: Vincent Lefevre <vincent at vinc17.net>
-Reviewed-by: Anton Gladky <gladk at debian.org>
-Last-Update: 2015-06-29
-Index: gnuplot-5.0.5/docs/Makefile.am
-===================================================================
---- gnuplot-5.0.5.orig/docs/Makefile.am
-+++ gnuplot-5.0.5/docs/Makefile.am
-@@ -90,7 +90,7 @@ gpcard.log pdffigures.tex pdffigures.aux
- 
- CLEANFILES = allterm.h gnuplot.dvi figures.tex nofigures.tex		\
- gnuplot.tex gnuplot.idx gnuplot.ilg gnuplot.ps gpcard.dvi gpcard.ps	\
--gnuplot.gih gnuplot.hlp gnuplot.info* gnuplot.ipf gnuplot.ms		\
-+gnuplot.gih gnuplot.hlp gnuplot5.info* gnuplot.ipf gnuplot.ms		\
- gnuplot.rnh gnuplot.rtf gnuplot.nroff gnuplot.txt gnuplot-groff.dvi	\
- gnuplot-groff.ps gnuplot.tmp VERSION gnuplot.4tc gnuplot.4ct		\
- gnuplot.idv gnuplot.xref gnuplot.lg gnuplot.pdf wxhelp_figures		\
-@@ -323,7 +323,7 @@ wxhelp_figures: $(GNUPLOT_EXE) $(srcdir)
- 	$(AM_V_GEN)touch $@
- 
- ### GNU info format
--info: gnuplot.info
-+info: gnuplot5.info
- 
- # Thanks to Bruce Ravel for doc2texi.el!
- gnuplot.texi gnuplot-eldoc.el: $(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
-@@ -343,15 +343,15 @@ ${ELCS}: gnuplot-eldoc.el
- 	   echo "No emacs found - cannot create gnuplot-eldoc.elc file" ; \
- 	fi
- 
--gnuplot.info: gnuplot.texi
-+gnuplot5.info: gnuplot.texi
- 	$(AM_V_GEN) $(MAKEINFO) -I$(srcdir) $< --no-split  --force --output=$@
- 
--install-info: gnuplot.info
-+install-info: gnuplot5.info
- 	$(AM_V_at) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
--	$(AM_V_at) $(INSTALL_DATA) gnuplot.info $(DESTDIR)$(infodir)/gnuplot.info
-+	$(AM_V_at) $(INSTALL_DATA) gnuplot5.info $(DESTDIR)$(infodir)/gnuplot5.info
- 	$(AM_V_at) if (install-info --version && \
- 	     install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
--	  install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info || : ;\
-+	  install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot5.info || : ;\
- 	else : ; fi
- 
- # this is how to make OS/2 ipfc documentation
-Index: gnuplot-5.0.5/docs/doc2texi.el
-===================================================================
---- gnuplot-5.0.5.orig/docs/doc2texi.el
-+++ gnuplot-5.0.5/docs/doc2texi.el
-@@ -79,7 +79,7 @@
- ;;
- ;; Then you can do
- ;;
--;;      makeinfo gnuplot.info
-+;;      makeinfo gnuplot5.info
- ;;
- ;; You may want to use the --no-split option.
- ;;
-@@ -155,7 +155,7 @@ If PATTERN is omitted, it defaults to \"
-   "\\input texinfo   @c -*-texinfo-*-
- 
- @c %**start of header
-- at setfilename gnuplot.info
-+ at setfilename gnuplot5.info
- @settitle Gnuplot: An Interactive Plotting Program
- @setchapternewpage odd
- @c %**end of header
-@@ -167,7 +167,7 @@ If PATTERN is omitted, it defaults to \"
- 
- @dircategory Math
- @direntry
--* GNUPLOT: (gnuplot).             An Interactive Plotting Program
-+* GNUPLOT5: (gnuplot5).           An Interactive Plotting Program
- @end direntry
- 
- @ifnottex
-@@ -460,7 +460,7 @@ particular conversion chore."
-     ("sun" "sun")
-     ("vms" "vws"))
- 
--  "Additional terminals to add to the converted gnuplot.info file.
-+  "Additional terminals to add to the converted gnuplot5.info file.
- 
- The CARs of the items are strings to match against
- `system-configuration', and the CDRs are the elements to add to
diff --git a/debian/patches/series b/debian/patches/series
index 212c096..c6bc6c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,5 @@
 09_remove_beos.patch
 10_removepicins.patch
 11_fix_linkage_wx.patch
-12_info.patch
 13_honour_SOURCE_DATE_EPOCH.patch
 14_strip_username_from_output.patch
diff --git a/debian/rules b/debian/rules
index 4edff09..ad535ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,7 +84,6 @@ override_dh_auto_install:
 	rm -f $(BUILDDIR_X11)/demo/plugin/Makefil*
 
 override_dh_installinfo:
-	mv $(BUILDDIR_X11)/docs/gnuplot5.info $(BUILDDIR_X11)/docs/gnuplot.info
 	dh_installinfo -pgnuplot-doc $(BUILDDIR_X11)/docs/gnuplot.info
 
 override_installchangelogs:

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