[gnuplot] 02/10: Refresh patches

Anton Gladky gladk at moszumanska.debian.org
Tue Oct 24 20:08:10 UTC 2017 

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

gladk pushed a commit to branch master
in repository gnuplot.

commit aa8da089cac9987eb58d1cb8be6ae2cabdd80641
Author: Anton Gladky <gladk at debian.org>
Date:   Tue Oct 24 21:29:51 2017 +0200

    Refresh patches
---
 debian/patches/04_fix_libexecdir.diff            |  6 +--
 debian/patches/07_doc.patch                      | 10 ++--
 debian/patches/08_disable_demo_plugin.patch      | 28 ++++++------
 debian/patches/09_remove_beos.patch              | 58 ++++++++++++++----------
 debian/patches/10_removepicins.patch             | 14 +++---
 debian/patches/11_fix_linkage_wx.patch           |  8 ++--
 debian/patches/13_honour_SOURCE_DATE_EPOCH.patch |  8 ++--
 debian/patches/series                            |  2 +-
 8 files changed, 71 insertions(+), 63 deletions(-)

diff --git a/debian/patches/04_fix_libexecdir.diff b/debian/patches/04_fix_libexecdir.diff
index 8b26e03..c458186 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.7/src/Makefile.am
+Index: gnuplot-5.2.0/src/Makefile.am
 ===================================================================
---- gnuplot-5.0.7.orig/src/Makefile.am
-+++ gnuplot-5.0.7/src/Makefile.am
+--- gnuplot-5.2.0.orig/src/Makefile.am
++++ gnuplot-5.2.0/src/Makefile.am
 @@ -2,7 +2,7 @@
  AUTOMAKE_OPTIONS = foreign subdir-objects
  
diff --git a/debian/patches/07_doc.patch b/debian/patches/07_doc.patch
index dbf9eb9..93feb7f 100644
--- a/debian/patches/07_doc.patch
+++ b/debian/patches/07_doc.patch
@@ -2,12 +2,12 @@ Description: Fix path in documentation generation
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.0.7/docs/Makefile.am
+Index: gnuplot-5.2.0/docs/Makefile.am
 ===================================================================
---- gnuplot-5.0.7.orig/docs/Makefile.am
-+++ gnuplot-5.0.7/docs/Makefile.am
-@@ -345,7 +345,7 @@ ${ELCS}: gnuplot-eldoc.el
- 	fi
+--- gnuplot-5.2.0.orig/docs/Makefile.am
++++ gnuplot-5.2.0/docs/Makefile.am
+@@ -322,7 +322,7 @@ ${ELCS}: gnuplot-eldoc.el
+ # that only appears to work with a non-generated texi file for input.
  
  gnuplot.info: gnuplot.texi
 -	$(AM_V_GEN) $(MAKEINFO) -I$(srcdir) $< --no-split --output=$@
diff --git a/debian/patches/08_disable_demo_plugin.patch b/debian/patches/08_disable_demo_plugin.patch
index cf1d77d..4c6889c 100644
--- a/debian/patches/08_disable_demo_plugin.patch
+++ b/debian/patches/08_disable_demo_plugin.patch
@@ -5,11 +5,11 @@ Description: temporarly disable demo plugin
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.0.7/demo/Makefile.in
+Index: gnuplot-5.2.0/demo/Makefile.in
 ===================================================================
---- gnuplot-5.0.7.orig/demo/Makefile.in
-+++ gnuplot-5.0.7/demo/Makefile.in
-@@ -329,7 +329,6 @@ epslatex.ps epslatex.tex random.tmp stri
+--- gnuplot-5.2.0.orig/demo/Makefile.in
++++ gnuplot-5.2.0/demo/Makefile.in
+@@ -327,7 +327,6 @@ epslatex.ps epslatex.tex random.tmp stri
  
  BINARY_FILES = binary1 binary2 binary3
  SUBDIRS = $(PLUGIN_DIR)
@@ -17,18 +17,18 @@ Index: gnuplot-5.0.7/demo/Makefile.in
  DEMO = all.dem
  GNUPLOT = gnuplot
  EXTRA_DIST = Makefile.am.in lena-keypoints.bin scatter2.bin sine.bin \
-@@ -368,7 +367,6 @@ hexa.fnc line.fnc reflect.fnc gen-random
- bldg.png GM1_bonds.r3d blutux.rgb lena.rgb sound.par sound2.par start.par \
- gnuplot.rot gnu-valley random-points gpdemos.tcl html 
+@@ -372,7 +371,6 @@ reflect.fnc gen-random.inc stat.inc GM1_
+ blutux.rgb lena.rgb sound.par sound2.par start.par gnuplot.rot gnu-valley \
+ random-points gpdemos.tcl html 
  
 - at BUILD_PLUGIN_TRUE@PLUGIN_DIR = plugin
  all: all-recursive
  
  .SUFFIXES:
-Index: gnuplot-5.0.7/demo/Makefile.am
+Index: gnuplot-5.2.0/demo/Makefile.am
 ===================================================================
---- gnuplot-5.0.7.orig/demo/Makefile.am
-+++ gnuplot-5.0.7/demo/Makefile.am
+--- gnuplot-5.2.0.orig/demo/Makefile.am
++++ gnuplot-5.2.0/demo/Makefile.am
 @@ -9,7 +9,6 @@ epslatex.ps epslatex.tex random.tmp stri
  BINARY_FILES = binary1 binary2 binary3
  
@@ -37,17 +37,17 @@ Index: gnuplot-5.0.7/demo/Makefile.am
  
  DEMO = all.dem
  
-@@ -116,6 +115,3 @@ Makefile.am: Makefile.am.in
+@@ -124,6 +123,3 @@ Makefile.am: Makefile.am.in
  	chmod og-w $@t
  	mv $@t $@
  
 -if BUILD_PLUGIN
 -PLUGIN_DIR = plugin
 -endif
-Index: gnuplot-5.0.7/demo/Makefile.am.in
+Index: gnuplot-5.2.0/demo/Makefile.am.in
 ===================================================================
---- gnuplot-5.0.7.orig/demo/Makefile.am.in
-+++ gnuplot-5.0.7/demo/Makefile.am.in
+--- gnuplot-5.2.0.orig/demo/Makefile.am.in
++++ gnuplot-5.2.0/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 df34f49..1043ea8 100644
--- a/debian/patches/09_remove_beos.patch
+++ b/debian/patches/09_remove_beos.patch
@@ -2,11 +2,36 @@ Description: remove beos-specific code
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.0.7/configure.in
+Index: gnuplot-5.2.0/src/Makefile.am
 ===================================================================
---- gnuplot-5.0.7.orig/configure.in
-+++ gnuplot-5.0.7/configure.in
-@@ -1334,7 +1334,6 @@ AC_OUTPUT([Makefile
+--- gnuplot-5.2.0.orig/src/Makefile.am
++++ gnuplot-5.2.0/src/Makefile.am
+@@ -75,11 +75,7 @@ getcolor_x11.o: getcolor.c
+ bf_test_SOURCES = bf_test.c
+ bf_test_LIBS = -lm
+ 
+-if BUILD_SRC_BEOS_SUBDIR
+-d_beos = beos
+-endif
+-
+-SUBDIRS = $(d_beos) wxterminal qtterminal
++SUBDIRS = wxterminal qtterminal
+ 
+ EXTRA_gnuplot_SOURCES = strftime.c vms.c
+ 
+Index: gnuplot-5.2.0/configure.ac
+===================================================================
+--- gnuplot-5.2.0.orig/configure.ac
++++ gnuplot-5.2.0/configure.ac
+@@ -194,7 +194,6 @@ GP_MSDOS
+ GP_APPLE
+ GP_BEOS
+ GP_ALPHA
+-AM_CONDITIONAL(BUILD_SRC_BEOS_SUBDIR, test x$build_beos_subdir = xyes)
+ 
+ dnl _instead_ of -lm ...
+ AC_CHECK_FUNC(sin,,[AC_CHECK_LIB(m,sin)])
+@@ -1251,7 +1250,6 @@ AC_CONFIG_FILES([Makefile
             share/Makefile
             share/LaTeX/Makefile
             src/Makefile
@@ -14,7 +39,7 @@ Index: gnuplot-5.0.7/configure.in
             src/wxterminal/Makefile
             src/qtterminal/Makefile
             term/Makefile
-@@ -1442,10 +1441,6 @@ if test "$is_msdos" = yes; then
+@@ -1352,10 +1350,6 @@ if test "$is_msdos" = yes; then
    AC_MSG_RESULT([  svga terminal (MSDOS/djgpp): yes])
  fi
  
@@ -22,23 +47,6 @@ Index: gnuplot-5.0.7/configure.in
 -  AC_MSG_RESULT([  be terminal (BeOS): yes])
 -fi
 -
- if test "$is_next" = yes; then
-   AC_MSG_RESULT([  next terminal: yes])
- fi
-Index: gnuplot-5.0.7/src/Makefile.am
-===================================================================
---- gnuplot-5.0.7.orig/src/Makefile.am
-+++ gnuplot-5.0.7/src/Makefile.am
-@@ -73,11 +73,7 @@ endif
- bf_test_SOURCES = bf_test.c
- bf_test_LIBS = -lm
- 
--if BUILD_SRC_BEOS_SUBDIR
--d_beos = beos
--endif
--
--SUBDIRS = $(d_beos) wxterminal qtterminal
-+SUBDIRS = wxterminal qtterminal
- 
- EXTRA_gnuplot_SOURCES = strftime.c vms.c
- 
+ if test "$with_caca" = yes; then
+   AC_MSG_RESULT([  caca terminal: yes (EXPERIMENTAL)])
+ else
diff --git a/debian/patches/10_removepicins.patch b/debian/patches/10_removepicins.patch
index 6446fcd..3113c85 100644
--- a/debian/patches/10_removepicins.patch
+++ b/debian/patches/10_removepicins.patch
@@ -2,11 +2,11 @@ Description: removes picins latex include
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.0.7/docs/Makefile.am
+Index: gnuplot-5.2.0/docs/Makefile.am
 ===================================================================
---- gnuplot-5.0.7.orig/docs/Makefile.am
-+++ gnuplot-5.0.7/docs/Makefile.am
-@@ -189,7 +189,6 @@ gnuplot.pdf: figures.tex pdf_figures $(s
+--- gnuplot-5.2.0.orig/docs/Makefile.am
++++ gnuplot-5.2.0/docs/Makefile.am
+@@ -187,7 +187,6 @@ gnuplot.pdf: figures.tex pdf_figures $(s
  	  touch figures.idx ; \
  	  rm -f pdffigures.tex ; \
  	  ( echo "\usepackage{graphicx}" > pdffigures.tex ; \
@@ -14,10 +14,10 @@ Index: gnuplot-5.0.7/docs/Makefile.am
  	  ) ; \
  	  TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
  	  TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
-Index: gnuplot-5.0.7/docs/doc2tex.c
+Index: gnuplot-5.2.0/docs/doc2tex.c
 ===================================================================
---- gnuplot-5.0.7.orig/docs/doc2tex.c
-+++ gnuplot-5.0.7/docs/doc2tex.c
+--- gnuplot-5.2.0.orig/docs/doc2tex.c
++++ gnuplot-5.2.0/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 bbbff6a..9013dd2 100644
--- a/debian/patches/11_fix_linkage_wx.patch
+++ b/debian/patches/11_fix_linkage_wx.patch
@@ -2,11 +2,11 @@ Description: Add missing linkage against X11 libs.
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.0.7/src/Makefile.am
+Index: gnuplot-5.2.0/src/Makefile.am
 ===================================================================
---- gnuplot-5.0.7.orig/src/Makefile.am
-+++ gnuplot-5.0.7/src/Makefile.am
-@@ -87,6 +87,8 @@ $(EXTRA_gnuplot_SOURCES)
+--- gnuplot-5.2.0.orig/src/Makefile.am
++++ gnuplot-5.2.0/src/Makefile.am
+@@ -93,6 +93,8 @@ $(EXTRA_gnuplot_SOURCES)
  
  if BUILD_WXWIDGETS
  gnuplot_SOURCES += wxterminal/wxt_gui.cpp
diff --git a/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch b/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch
index e06ab13..1d48873 100644
--- a/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch
+++ b/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch
@@ -4,11 +4,11 @@ Description: Honour SOURCE_DATE_EPOCH
  See https://reproducible-builds.org/specs/source-date-epoch/
 Author: Alexis Bienvenüe <pado at passoire.fr>
 
-Index: gnuplot-5.0.7/term/post.trm
+Index: gnuplot-5.2.0/term/post.trm
 ===================================================================
---- gnuplot-5.0.7.orig/term/post.trm
-+++ gnuplot-5.0.7/term/post.trm
-@@ -1656,15 +1656,45 @@ end\n\
+--- gnuplot-5.2.0.orig/term/post.trm
++++ gnuplot-5.2.0/term/post.trm
+@@ -1651,15 +1651,45 @@ end\n\
      int i;
      time_t now;
      char *timedate;
diff --git a/debian/patches/series b/debian/patches/series
index 1341cd8..455280a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@
 10_removepicins.patch
 11_fix_linkage_wx.patch
 13_honour_SOURCE_DATE_EPOCH.patch
-20_CVE-2017-9670.patch
+#20_CVE-2017-9670.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