[gnuplot] 02/04: Refresh patches.

Anton Gladky gladk at moszumanska.debian.org
Mon Aug 1 21:37:23 UTC 2016 

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

gladk pushed a commit to branch master
in repository gnuplot.

commit 4176d8a98f281d83f403e5f2764bea8c7bf933bc
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Aug 1 23:35:09 2016 +0200

    Refresh patches.
---
 debian/patches/04_fix_libexecdir.diff              |  6 +++---
 debian/patches/05_default_gd_font.diff             |  6 +++---
 debian/patches/07_doc.patch                        |  6 +++---
 debian/patches/08_disable_demo_plugin.patch        | 18 +++++++++---------
 debian/patches/09_remove_beos.patch                | 16 ++++++++--------
 debian/patches/10_removepicins.patch               | 12 ++++++------
 debian/patches/11_fix_linkage_wx.patch             |  6 +++---
 debian/patches/12_info.patch                       | 12 ++++++------
 debian/patches/13_honour_SOURCE_DATE_EPOCH.patch   |  6 +++---
 debian/patches/14_strip_username_from_output.patch |  6 +++---
 debian/patches/15_fix_resize_qt.patch              | 17 -----------------
 debian/patches/series                              |  1 -
 12 files changed, 47 insertions(+), 65 deletions(-)

diff --git a/debian/patches/04_fix_libexecdir.diff b/debian/patches/04_fix_libexecdir.diff
index 9f0983f..9836656 100644
--- a/debian/patches/04_fix_libexecdir.diff
+++ b/debian/patches/04_fix_libexecdir.diff
@@ -2,10 +2,10 @@ Description: fix libexecdir
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.0.3/src/Makefile.am
+Index: gnuplot-5.0.4/src/Makefile.am
 ===================================================================
---- gnuplot-5.0.3.orig/src/Makefile.am
-+++ gnuplot-5.0.3/src/Makefile.am
+--- gnuplot-5.0.4.orig/src/Makefile.am
++++ gnuplot-5.0.4/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 636e157..a1e3c03 100644
--- a/debian/patches/05_default_gd_font.diff
+++ b/debian/patches/05_default_gd_font.diff
@@ -2,10 +2,10 @@ Description: change the default font
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.0.3/term/gd.trm
+Index: gnuplot-5.0.4/term/gd.trm
 ===================================================================
---- gnuplot-5.0.3.orig/term/gd.trm
-+++ gnuplot-5.0.3/term/gd.trm
+--- gnuplot-5.0.4.orig/term/gd.trm
++++ gnuplot-5.0.4/term/gd.trm
 @@ -990,7 +990,7 @@ PNG_options()
  	if (external_default)
  		png_state.ttffont = gp_strdup(external_default);
diff --git a/debian/patches/07_doc.patch b/debian/patches/07_doc.patch
index 7edc1c9..6bab96d 100644
--- a/debian/patches/07_doc.patch
+++ b/debian/patches/07_doc.patch
@@ -2,10 +2,10 @@ Description: Fix path in documentation generation
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.0.3/docs/Makefile.am
+Index: gnuplot-5.0.4/docs/Makefile.am
 ===================================================================
---- gnuplot-5.0.3.orig/docs/Makefile.am
-+++ gnuplot-5.0.3/docs/Makefile.am
+--- gnuplot-5.0.4.orig/docs/Makefile.am
++++ gnuplot-5.0.4/docs/Makefile.am
 @@ -345,7 +345,7 @@ ${ELCS}: gnuplot-eldoc.el
  	fi
  
diff --git a/debian/patches/08_disable_demo_plugin.patch b/debian/patches/08_disable_demo_plugin.patch
index ae0d7a8..e94c4c3 100644
--- a/debian/patches/08_disable_demo_plugin.patch
+++ b/debian/patches/08_disable_demo_plugin.patch
@@ -5,10 +5,10 @@ Description: temporarly disable demo plugin
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.0.3/demo/Makefile.in
+Index: gnuplot-5.0.4/demo/Makefile.in
 ===================================================================
---- gnuplot-5.0.3.orig/demo/Makefile.in
-+++ gnuplot-5.0.3/demo/Makefile.in
+--- gnuplot-5.0.4.orig/demo/Makefile.in
++++ gnuplot-5.0.4/demo/Makefile.in
 @@ -328,7 +328,6 @@ epslatex.ps epslatex.tex random.tmp stri
  
  BINARY_FILES = binary1 binary2 binary3
@@ -25,10 +25,10 @@ Index: gnuplot-5.0.3/demo/Makefile.in
  all: all-recursive
  
  .SUFFIXES:
-Index: gnuplot-5.0.3/demo/Makefile.am
+Index: gnuplot-5.0.4/demo/Makefile.am
 ===================================================================
---- gnuplot-5.0.3.orig/demo/Makefile.am
-+++ gnuplot-5.0.3/demo/Makefile.am
+--- gnuplot-5.0.4.orig/demo/Makefile.am
++++ gnuplot-5.0.4/demo/Makefile.am
 @@ -9,7 +9,6 @@ epslatex.ps epslatex.tex random.tmp stri
  BINARY_FILES = binary1 binary2 binary3
  
@@ -44,10 +44,10 @@ Index: gnuplot-5.0.3/demo/Makefile.am
 -if BUILD_PLUGIN
 -PLUGIN_DIR = plugin
 -endif
-Index: gnuplot-5.0.3/demo/Makefile.am.in
+Index: gnuplot-5.0.4/demo/Makefile.am.in
 ===================================================================
---- gnuplot-5.0.3.orig/demo/Makefile.am.in
-+++ gnuplot-5.0.3/demo/Makefile.am.in
+--- gnuplot-5.0.4.orig/demo/Makefile.am.in
++++ gnuplot-5.0.4/demo/Makefile.am.in
 @@ -9,7 +9,6 @@ epslatex.ps epslatex.tex random.tmp stri
  BINARY_FILES = binary1 binary2 binary3
  
diff --git a/debian/patches/09_remove_beos.patch b/debian/patches/09_remove_beos.patch
index 91ec168..79d09a6 100644
--- a/debian/patches/09_remove_beos.patch
+++ b/debian/patches/09_remove_beos.patch
@@ -2,11 +2,11 @@ Description: remove beos-specific code
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.0.3/configure.in
+Index: gnuplot-5.0.4/configure.in
 ===================================================================
---- gnuplot-5.0.3.orig/configure.in
-+++ gnuplot-5.0.3/configure.in
-@@ -1319,7 +1319,6 @@ AC_OUTPUT([Makefile
+--- gnuplot-5.0.4.orig/configure.in
++++ gnuplot-5.0.4/configure.in
+@@ -1326,7 +1326,6 @@ AC_OUTPUT([Makefile
             share/Makefile
             share/LaTeX/Makefile
             src/Makefile
@@ -14,7 +14,7 @@ Index: gnuplot-5.0.3/configure.in
             src/wxterminal/Makefile
             src/qtterminal/Makefile
             term/Makefile
-@@ -1427,10 +1426,6 @@ if test "$is_msdos" = yes; then
+@@ -1434,10 +1433,6 @@ if test "$is_msdos" = yes; then
    AC_MSG_RESULT([  svga terminal (MSDOS/djgpp): yes])
  fi
  
@@ -25,10 +25,10 @@ Index: gnuplot-5.0.3/configure.in
  if test "$is_next" = yes; then
    AC_MSG_RESULT([  next terminal: yes])
  fi
-Index: gnuplot-5.0.3/src/Makefile.am
+Index: gnuplot-5.0.4/src/Makefile.am
 ===================================================================
---- gnuplot-5.0.3.orig/src/Makefile.am
-+++ gnuplot-5.0.3/src/Makefile.am
+--- gnuplot-5.0.4.orig/src/Makefile.am
++++ gnuplot-5.0.4/src/Makefile.am
 @@ -73,11 +73,7 @@ endif
  bf_test_SOURCES = bf_test.c
  bf_test_LIBS = -lm
diff --git a/debian/patches/10_removepicins.patch b/debian/patches/10_removepicins.patch
index bccc8cb..0ad5364 100644
--- a/debian/patches/10_removepicins.patch
+++ b/debian/patches/10_removepicins.patch
@@ -2,10 +2,10 @@ Description: removes picins latex include
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.0.3/docs/Makefile.am
+Index: gnuplot-5.0.4/docs/Makefile.am
 ===================================================================
---- gnuplot-5.0.3.orig/docs/Makefile.am
-+++ gnuplot-5.0.3/docs/Makefile.am
+--- gnuplot-5.0.4.orig/docs/Makefile.am
++++ gnuplot-5.0.4/docs/Makefile.am
 @@ -189,7 +189,6 @@ gnuplot.pdf: figures.tex pdf_figures $(s
  	  touch figures.idx ; \
  	  rm -f pdffigures.tex ; \
@@ -14,10 +14,10 @@ Index: gnuplot-5.0.3/docs/Makefile.am
  	  ) ; \
  	  TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
  	  TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
-Index: gnuplot-5.0.3/docs/doc2tex.c
+Index: gnuplot-5.0.4/docs/doc2tex.c
 ===================================================================
---- gnuplot-5.0.3.orig/docs/doc2tex.c
-+++ gnuplot-5.0.3/docs/doc2tex.c
+--- gnuplot-5.0.4.orig/docs/doc2tex.c
++++ gnuplot-5.0.4/docs/doc2tex.c
 @@ -168,12 +168,6 @@ process_line( char *line, FILE *b)
  	    break;
  
diff --git a/debian/patches/11_fix_linkage_wx.patch b/debian/patches/11_fix_linkage_wx.patch
index 750e111..4d4f377 100644
--- a/debian/patches/11_fix_linkage_wx.patch
+++ b/debian/patches/11_fix_linkage_wx.patch
@@ -2,10 +2,10 @@ Description: Add missing linkage against X11 libs.
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.0.3/src/Makefile.am
+Index: gnuplot-5.0.4/src/Makefile.am
 ===================================================================
---- gnuplot-5.0.3.orig/src/Makefile.am
-+++ gnuplot-5.0.3/src/Makefile.am
+--- gnuplot-5.0.4.orig/src/Makefile.am
++++ gnuplot-5.0.4/src/Makefile.am
 @@ -87,6 +87,8 @@ $(EXTRA_gnuplot_SOURCES)
  
  if BUILD_WXWIDGETS
diff --git a/debian/patches/12_info.patch b/debian/patches/12_info.patch
index a9c3685..df90f02 100644
--- a/debian/patches/12_info.patch
+++ b/debian/patches/12_info.patch
@@ -4,10 +4,10 @@ Reviewed-By: Anton Gladky <gladk at debian.org>
 Bug-Debian: http://bugs.debian.org/778757
 Last-Update: 2015-06-29
 
-Index: gnuplot-5.0.3/docs/Makefile.am
+Index: gnuplot-5.0.4/docs/Makefile.am
 ===================================================================
---- gnuplot-5.0.3.orig/docs/Makefile.am
-+++ gnuplot-5.0.3/docs/Makefile.am
+--- gnuplot-5.0.4.orig/docs/Makefile.am
++++ gnuplot-5.0.4/docs/Makefile.am
 @@ -90,7 +90,7 @@ gpcard.log pdffigures.tex pdffigures.aux
  
  CLEANFILES = allterm.h gnuplot.dvi figures.tex nofigures.tex		\
@@ -46,10 +46,10 @@ Index: gnuplot-5.0.3/docs/Makefile.am
  	else : ; fi
  
  # this is how to make OS/2 ipfc documentation
-Index: gnuplot-5.0.3/docs/doc2texi.el
+Index: gnuplot-5.0.4/docs/doc2texi.el
 ===================================================================
---- gnuplot-5.0.3.orig/docs/doc2texi.el
-+++ gnuplot-5.0.3/docs/doc2texi.el
+--- gnuplot-5.0.4.orig/docs/doc2texi.el
++++ gnuplot-5.0.4/docs/doc2texi.el
 @@ -79,7 +79,7 @@
  ;;
  ;; Then you can do
diff --git a/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch b/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch
index 6a3ac88..4c0be7f 100644
--- a/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch
+++ b/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch
@@ -4,10 +4,10 @@ Description: Honour SOURCE_DATE_EPOCH
  See https://reproducible-builds.org/specs/source-date-epoch/
 Author: Alexis Bienvenüe <pado at passoire.fr>
 
-Index: gnuplot/term/post.trm
+Index: gnuplot-5.0.4/term/post.trm
 ===================================================================
---- gnuplot.orig/term/post.trm
-+++ gnuplot/term/post.trm
+--- gnuplot-5.0.4.orig/term/post.trm
++++ gnuplot-5.0.4/term/post.trm
 @@ -1657,15 +1657,45 @@ end\n\
      int i;
      time_t now;
diff --git a/debian/patches/14_strip_username_from_output.patch b/debian/patches/14_strip_username_from_output.patch
index 49e9ba1..455c9c0 100644
--- a/debian/patches/14_strip_username_from_output.patch
+++ b/debian/patches/14_strip_username_from_output.patch
@@ -2,10 +2,10 @@ Description: Strip username from output
  Strip username from output to make it reproducible.
 Author: Alexis Bienvenüe <pado at passoire.fr>
 
-Index: gnuplot/term/post.trm
+Index: gnuplot-5.0.4/term/post.trm
 ===================================================================
---- gnuplot.orig/term/post.trm
-+++ gnuplot/term/post.trm
+--- gnuplot-5.0.4.orig/term/post.trm
++++ gnuplot-5.0.4/term/post.trm
 @@ -1644,7 +1644,6 @@ SDict begin [\n\
    /Title (%s)\n\
    /Subject (gnuplot plot)\n\
diff --git a/debian/patches/15_fix_resize_qt.patch b/debian/patches/15_fix_resize_qt.patch
deleted file mode 100644
index eba2211..0000000
--- a/debian/patches/15_fix_resize_qt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix the crash during resize of qt-window
-Author: Ethan Merritt <sfeam at users.sf.net> 
-Bug-Debian: https://bugs.debian.org/827351
-Reviewed-By: Anton Gladky <gladk at debian.org>
-Last-Update: <YYYY-MM-DD>
-
---- gnuplot-5.0.3+dfsg3.orig/src/mouse.c
-+++ gnuplot-5.0.3+dfsg3/src/mouse.c
-@@ -2239,7 +2239,7 @@ do_event(struct gp_event_t *ge)
- 	    break;
- 	if (multiplot)
- 	    break;
--	do_string("replot");
-+	do_string_replot("");
- 	break;
-     case GE_reset:
- 	event_reset(ge);
diff --git a/debian/patches/series b/debian/patches/series
index 75bdac0..212c096 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@
 12_info.patch
 13_honour_SOURCE_DATE_EPOCH.patch
 14_strip_username_from_output.patch
-15_fix_resize_qt.patch

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

More information about the debian-science-commits mailing list