[gnuplot5] 11/15: Refresh patches.

[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 0bc7e4176b57d2bffb05a01be8f6039e129e651f
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Sep 29 22:36:34 2014 +0200

    Refresh patches.
---
 debian/patches/04_fix_libexecdir.diff       |  6 +++---
 debian/patches/05_default_gd_font.diff      |  6 +++---
 debian/patches/08_disable_demo_plugin.patch | 18 +++++++++---------
 debian/patches/doc.patch                    |  6 ++++--
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/debian/patches/04_fix_libexecdir.diff b/debian/patches/04_fix_libexecdir.diff
index 8b3551c..dd3d70e 100644
--- a/debian/patches/04_fix_libexecdir.diff
+++ b/debian/patches/04_fix_libexecdir.diff
@@ -1,9 +1,9 @@
 Description: fix libexecdir
 
-Index: gnuplot-5.0.rc1/src/Makefile.am
+Index: gnuplot-5.0.rc2/src/Makefile.am
 ===================================================================
---- gnuplot-5.0.rc1.orig/src/Makefile.am
-+++ gnuplot-5.0.rc1/src/Makefile.am
+--- gnuplot-5.0.rc2.orig/src/Makefile.am
++++ gnuplot-5.0.rc2/src/Makefile.am
 @@ -2,7 +2,7 @@
  AUTOMAKE_OPTIONS = foreign subdir-objects
  
diff --git a/debian/patches/05_default_gd_font.diff b/debian/patches/05_default_gd_font.diff
index 030fcb6..150b447 100644
--- a/debian/patches/05_default_gd_font.diff
+++ b/debian/patches/05_default_gd_font.diff
@@ -1,9 +1,9 @@
 Description: change the default font
 
-Index: gnuplot-5.0.rc1/term/gd.trm
+Index: gnuplot-5.0.rc2/term/gd.trm
 ===================================================================
---- gnuplot-5.0.rc1.orig/term/gd.trm
-+++ gnuplot-5.0.rc1/term/gd.trm
+--- gnuplot-5.0.rc2.orig/term/gd.trm
++++ gnuplot-5.0.rc2/term/gd.trm
 @@ -989,7 +989,7 @@ PNG_options()
  	if (external_default)
  		png_state.ttffont = gp_strdup(external_default);
diff --git a/debian/patches/08_disable_demo_plugin.patch b/debian/patches/08_disable_demo_plugin.patch
index 67276a0..a968640 100644
--- a/debian/patches/08_disable_demo_plugin.patch
+++ b/debian/patches/08_disable_demo_plugin.patch
@@ -5,19 +5,19 @@ Description: temporarly disable demo plugin
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2014-07-11
 
-Index: gnuplot-5.0.rc1/demo/Makefile.in
+Index: gnuplot-5.0.rc2/demo/Makefile.in
 ===================================================================
---- gnuplot-5.0.rc1.orig/demo/Makefile.in
-+++ gnuplot-5.0.rc1/demo/Makefile.in
-@@ -301,7 +301,6 @@ epslatex.ps epslatex.tex random.tmp stri
+--- gnuplot-5.0.rc2.orig/demo/Makefile.in
++++ gnuplot-5.0.rc2/demo/Makefile.in
+@@ -327,7 +327,6 @@ epslatex.ps epslatex.tex random.tmp stri
  
  BINARY_FILES = binary1 binary2 binary3
  SUBDIRS = $(PLUGIN_DIR)
 -DIST_SUBDIRS = plugin
  DEMO = all.dem
  GNUPLOT = gnuplot
- GNUPLOT_X11 = `echo gnuplot_x11 | sed '$(transform)'`$(EXEEXT)
-@@ -341,7 +340,6 @@ GM1_sugar.pdb bldg.png GM1_bonds.r3d blu
+ EXTRA_DIST = Makefile.am.in lena-keypoints.bin scatter2.bin \
+@@ -366,7 +365,6 @@ GM1_sugar.pdb bldg.png GM1_bonds.r3d blu
  sound2.par start.par gnuplot.rot gnu-valley random-points gpdemos.tcl \
  html plugin 
  
@@ -25,10 +25,10 @@ Index: gnuplot-5.0.rc1/demo/Makefile.in
  all: all-recursive
  
  .SUFFIXES:
-Index: gnuplot-5.0.rc1/demo/plugin/Makefile.am
+Index: gnuplot-5.0.rc2/demo/plugin/Makefile.am
 ===================================================================
---- gnuplot-5.0.rc1.orig/demo/plugin/Makefile.am
-+++ gnuplot-5.0.rc1/demo/plugin/Makefile.am
+--- gnuplot-5.0.rc2.orig/demo/plugin/Makefile.am
++++ gnuplot-5.0.rc2/demo/plugin/Makefile.am
 @@ -1,8 +1,2 @@
  ## Process this file with automake to produce Makefile.in -*-Makefile-*-
  AUTOMAKE_OPTIONS = foreign
diff --git a/debian/patches/doc.patch b/debian/patches/doc.patch
index 2516d58..86df265 100644
--- a/debian/patches/doc.patch
+++ b/debian/patches/doc.patch
@@ -25,8 +25,10 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
---- gnuplot-5.0~rc1.orig/docs/Makefile.am
-+++ gnuplot-5.0~rc1/docs/Makefile.am
+Index: gnuplot-5.0.rc2/docs/Makefile.am
+===================================================================
+--- gnuplot-5.0.rc2.orig/docs/Makefile.am
++++ gnuplot-5.0.rc2/docs/Makefile.am
 @@ -324,7 +324,7 @@ ${ELCS}: gnuplot-eldoc.el
  	fi
  

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