[gnuplot] 03/07: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Sat May 20 18:28:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch experimental
in repository gnuplot.
commit f870928baabfe0a24d5a9f8fa109755d9169a12c
Author: Anton Gladky <gladk at debian.org>
Date: Sat May 20 16:55:24 2017 +0200
Refresh patches.
---
debian/patches/04_fix_libexecdir.diff | 6 +++---
debian/patches/07_doc.patch | 6 +++---
debian/patches/08_disable_demo_plugin.patch | 20 ++++++++++----------
debian/patches/09_remove_beos.patch | 16 ++++++++--------
debian/patches/10_removepicins.patch | 12 ++++++------
debian/patches/11_fix_linkage_wx.patch | 6 +++---
debian/patches/13_honour_SOURCE_DATE_EPOCH.patch | 6 +++---
debian/patches/14_strip_username_from_output.patch | 6 +++---
8 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/debian/patches/04_fix_libexecdir.diff b/debian/patches/04_fix_libexecdir.diff
index bb54c4f..5192b30 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.5/src/Makefile.am
+Index: gnuplot-5.0.6/src/Makefile.am
===================================================================
---- gnuplot-5.0.5.orig/src/Makefile.am
-+++ gnuplot-5.0.5/src/Makefile.am
+--- gnuplot-5.0.6.orig/src/Makefile.am
++++ gnuplot-5.0.6/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 6bab96d..a4603f6 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.4/docs/Makefile.am
+Index: gnuplot-5.0.6/docs/Makefile.am
===================================================================
---- gnuplot-5.0.4.orig/docs/Makefile.am
-+++ gnuplot-5.0.4/docs/Makefile.am
+--- gnuplot-5.0.6.orig/docs/Makefile.am
++++ gnuplot-5.0.6/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 f112450..cd6f9a9 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.5/demo/Makefile.in
+Index: gnuplot-5.0.6/demo/Makefile.in
===================================================================
---- gnuplot-5.0.5.orig/demo/Makefile.in
-+++ gnuplot-5.0.5/demo/Makefile.in
+--- gnuplot-5.0.6.orig/demo/Makefile.in
++++ gnuplot-5.0.6/demo/Makefile.in
@@ -328,7 +328,6 @@ epslatex.ps epslatex.tex random.tmp stri
BINARY_FILES = binary1 binary2 binary3
@@ -16,7 +16,7 @@ Index: gnuplot-5.0.5/demo/Makefile.in
-DIST_SUBDIRS = plugin
DEMO = all.dem
GNUPLOT = gnuplot
- EXTRA_DIST = Makefile.am.in lena-keypoints.bin scatter2.bin \
+ EXTRA_DIST = Makefile.am.in lena-keypoints.bin scatter2.bin sine.bin \
@@ -367,7 +366,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
@@ -25,10 +25,10 @@ Index: gnuplot-5.0.5/demo/Makefile.in
all: all-recursive
.SUFFIXES:
-Index: gnuplot-5.0.5/demo/Makefile.am
+Index: gnuplot-5.0.6/demo/Makefile.am
===================================================================
---- gnuplot-5.0.5.orig/demo/Makefile.am
-+++ gnuplot-5.0.5/demo/Makefile.am
+--- gnuplot-5.0.6.orig/demo/Makefile.am
++++ gnuplot-5.0.6/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.5/demo/Makefile.am
-if BUILD_PLUGIN
-PLUGIN_DIR = plugin
-endif
-Index: gnuplot-5.0.5/demo/Makefile.am.in
+Index: gnuplot-5.0.6/demo/Makefile.am.in
===================================================================
---- gnuplot-5.0.5.orig/demo/Makefile.am.in
-+++ gnuplot-5.0.5/demo/Makefile.am.in
+--- gnuplot-5.0.6.orig/demo/Makefile.am.in
++++ gnuplot-5.0.6/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 35c5365..04fce01 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.5/configure.in
+Index: gnuplot-5.0.6/configure.in
===================================================================
---- gnuplot-5.0.5.orig/configure.in
-+++ gnuplot-5.0.5/configure.in
-@@ -1326,7 +1326,6 @@ AC_OUTPUT([Makefile
+--- gnuplot-5.0.6.orig/configure.in
++++ gnuplot-5.0.6/configure.in
+@@ -1327,7 +1327,6 @@ AC_OUTPUT([Makefile
share/Makefile
share/LaTeX/Makefile
src/Makefile
@@ -14,7 +14,7 @@ Index: gnuplot-5.0.5/configure.in
src/wxterminal/Makefile
src/qtterminal/Makefile
term/Makefile
-@@ -1434,10 +1433,6 @@ if test "$is_msdos" = yes; then
+@@ -1435,10 +1434,6 @@ if test "$is_msdos" = yes; then
AC_MSG_RESULT([ svga terminal (MSDOS/djgpp): yes])
fi
@@ -25,10 +25,10 @@ Index: gnuplot-5.0.5/configure.in
if test "$is_next" = yes; then
AC_MSG_RESULT([ next terminal: yes])
fi
-Index: gnuplot-5.0.5/src/Makefile.am
+Index: gnuplot-5.0.6/src/Makefile.am
===================================================================
---- gnuplot-5.0.5.orig/src/Makefile.am
-+++ gnuplot-5.0.5/src/Makefile.am
+--- gnuplot-5.0.6.orig/src/Makefile.am
++++ gnuplot-5.0.6/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 3ce47a8..fa31207 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.5/docs/Makefile.am
+Index: gnuplot-5.0.6/docs/Makefile.am
===================================================================
---- gnuplot-5.0.5.orig/docs/Makefile.am
-+++ gnuplot-5.0.5/docs/Makefile.am
+--- gnuplot-5.0.6.orig/docs/Makefile.am
++++ gnuplot-5.0.6/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.5/docs/Makefile.am
) ; \
TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
-Index: gnuplot-5.0.5/docs/doc2tex.c
+Index: gnuplot-5.0.6/docs/doc2tex.c
===================================================================
---- gnuplot-5.0.5.orig/docs/doc2tex.c
-+++ gnuplot-5.0.5/docs/doc2tex.c
+--- gnuplot-5.0.6.orig/docs/doc2tex.c
++++ gnuplot-5.0.6/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 8765eb9..7cf4c06 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.5/src/Makefile.am
+Index: gnuplot-5.0.6/src/Makefile.am
===================================================================
---- gnuplot-5.0.5.orig/src/Makefile.am
-+++ gnuplot-5.0.5/src/Makefile.am
+--- gnuplot-5.0.6.orig/src/Makefile.am
++++ gnuplot-5.0.6/src/Makefile.am
@@ -87,6 +87,8 @@ $(EXTRA_gnuplot_SOURCES)
if BUILD_WXWIDGETS
diff --git a/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch b/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch
index 551b7a9..6fb4f1e 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-5.0.5/term/post.trm
+Index: gnuplot-5.0.6/term/post.trm
===================================================================
---- gnuplot-5.0.5.orig/term/post.trm
-+++ gnuplot-5.0.5/term/post.trm
+--- gnuplot-5.0.6.orig/term/post.trm
++++ gnuplot-5.0.6/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 13b2a16..efd04be 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-5.0.5/term/post.trm
+Index: gnuplot-5.0.6/term/post.trm
===================================================================
---- gnuplot-5.0.5.orig/term/post.trm
-+++ gnuplot-5.0.5/term/post.trm
+--- gnuplot-5.0.6.orig/term/post.trm
++++ gnuplot-5.0.6/term/post.trm
@@ -1644,7 +1644,6 @@ SDict begin [\n\
/Title (%s)\n\
/Subject (gnuplot plot)\n\
--
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