[gnuplot] 02/04: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Sat Oct 22 14:16:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to annotated tag debian/5.0.5+dfsg1-1
in repository gnuplot.
commit b36e4d595cf999133c1ef6d4f05118b9c4a1c2e9
Author: Anton Gladky <gladk at debian.org>
Date: Sat Oct 22 10:41:00 2016 +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 | 28 +++++++++++-----------
debian/patches/09_remove_beos.patch | 12 +++++-----
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 | 8 +++----
9 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/debian/patches/04_fix_libexecdir.diff b/debian/patches/04_fix_libexecdir.diff
index 9836656..bb54c4f 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.4/src/Makefile.am
+Index: gnuplot-5.0.5/src/Makefile.am
===================================================================
---- gnuplot-5.0.4.orig/src/Makefile.am
-+++ gnuplot-5.0.4/src/Makefile.am
+--- gnuplot-5.0.5.orig/src/Makefile.am
++++ gnuplot-5.0.5/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 a1e3c03..4602c58 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.4/term/gd.trm
+Index: gnuplot-5.0.5/term/gd.trm
===================================================================
---- gnuplot-5.0.4.orig/term/gd.trm
-+++ gnuplot-5.0.4/term/gd.trm
+--- gnuplot-5.0.5.orig/term/gd.trm
++++ gnuplot-5.0.5/term/gd.trm
@@ -990,7 +990,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 e94c4c3..f112450 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.4/demo/Makefile.in
+Index: gnuplot-5.0.5/demo/Makefile.in
===================================================================
---- gnuplot-5.0.4.orig/demo/Makefile.in
-+++ gnuplot-5.0.4/demo/Makefile.in
+--- gnuplot-5.0.5.orig/demo/Makefile.in
++++ gnuplot-5.0.5/demo/Makefile.in
@@ -328,7 +328,6 @@ epslatex.ps epslatex.tex random.tmp stri
BINARY_FILES = binary1 binary2 binary3
@@ -16,19 +16,19 @@ Index: gnuplot-5.0.4/demo/Makefile.in
-DIST_SUBDIRS = plugin
DEMO = all.dem
GNUPLOT = gnuplot
- EXTRA_DIST = Makefile.am.in lena-keypoints.bin scatter2.bin sine.bin \
-@@ -366,7 +365,6 @@ density.fnc hexa.fnc line.fnc reflect.fn
- GM1_sugar.pdb bldg.png GM1_bonds.r3d blutux.rgb lena.rgb sound.par \
- sound2.par start.par gnuplot.rot gnu-valley random-points gpdemos.tcl html
+ EXTRA_DIST = Makefile.am.in lena-keypoints.bin scatter2.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
- at BUILD_PLUGIN_TRUE@PLUGIN_DIR = plugin
all: all-recursive
.SUFFIXES:
-Index: gnuplot-5.0.4/demo/Makefile.am
+Index: gnuplot-5.0.5/demo/Makefile.am
===================================================================
---- gnuplot-5.0.4.orig/demo/Makefile.am
-+++ gnuplot-5.0.4/demo/Makefile.am
+--- gnuplot-5.0.5.orig/demo/Makefile.am
++++ gnuplot-5.0.5/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.4/demo/Makefile.am
DEMO = all.dem
-@@ -115,6 +114,3 @@ Makefile.am: Makefile.am.in
+@@ -116,6 +115,3 @@ Makefile.am: Makefile.am.in
chmod og-w $@t
mv $@t $@
-if BUILD_PLUGIN
-PLUGIN_DIR = plugin
-endif
-Index: gnuplot-5.0.4/demo/Makefile.am.in
+Index: gnuplot-5.0.5/demo/Makefile.am.in
===================================================================
---- gnuplot-5.0.4.orig/demo/Makefile.am.in
-+++ gnuplot-5.0.4/demo/Makefile.am.in
+--- gnuplot-5.0.5.orig/demo/Makefile.am.in
++++ gnuplot-5.0.5/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 79d09a6..35c5365 100644
--- a/debian/patches/09_remove_beos.patch
+++ b/debian/patches/09_remove_beos.patch
@@ -2,10 +2,10 @@ Description: remove beos-specific code
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-16
-Index: gnuplot-5.0.4/configure.in
+Index: gnuplot-5.0.5/configure.in
===================================================================
---- gnuplot-5.0.4.orig/configure.in
-+++ gnuplot-5.0.4/configure.in
+--- gnuplot-5.0.5.orig/configure.in
++++ gnuplot-5.0.5/configure.in
@@ -1326,7 +1326,6 @@ AC_OUTPUT([Makefile
share/Makefile
share/LaTeX/Makefile
@@ -25,10 +25,10 @@ Index: gnuplot-5.0.4/configure.in
if test "$is_next" = yes; then
AC_MSG_RESULT([ next terminal: yes])
fi
-Index: gnuplot-5.0.4/src/Makefile.am
+Index: gnuplot-5.0.5/src/Makefile.am
===================================================================
---- gnuplot-5.0.4.orig/src/Makefile.am
-+++ gnuplot-5.0.4/src/Makefile.am
+--- gnuplot-5.0.5.orig/src/Makefile.am
++++ gnuplot-5.0.5/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 0ad5364..3ce47a8 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.4/docs/Makefile.am
+Index: gnuplot-5.0.5/docs/Makefile.am
===================================================================
---- gnuplot-5.0.4.orig/docs/Makefile.am
-+++ gnuplot-5.0.4/docs/Makefile.am
+--- gnuplot-5.0.5.orig/docs/Makefile.am
++++ gnuplot-5.0.5/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.4/docs/Makefile.am
) ; \
TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
-Index: gnuplot-5.0.4/docs/doc2tex.c
+Index: gnuplot-5.0.5/docs/doc2tex.c
===================================================================
---- gnuplot-5.0.4.orig/docs/doc2tex.c
-+++ gnuplot-5.0.4/docs/doc2tex.c
+--- gnuplot-5.0.5.orig/docs/doc2tex.c
++++ gnuplot-5.0.5/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 4d4f377..8765eb9 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.4/src/Makefile.am
+Index: gnuplot-5.0.5/src/Makefile.am
===================================================================
---- gnuplot-5.0.4.orig/src/Makefile.am
-+++ gnuplot-5.0.4/src/Makefile.am
+--- gnuplot-5.0.5.orig/src/Makefile.am
++++ gnuplot-5.0.5/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 b1ecb70..beaadaf 100644
--- a/debian/patches/12_info.patch
+++ b/debian/patches/12_info.patch
@@ -3,10 +3,10 @@ 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.4/docs/Makefile.am
+Index: gnuplot-5.0.5/docs/Makefile.am
===================================================================
---- gnuplot-5.0.4.orig/docs/Makefile.am
-+++ gnuplot-5.0.4/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 \
@@ -45,10 +45,10 @@ Index: gnuplot-5.0.4/docs/Makefile.am
else : ; fi
# this is how to make OS/2 ipfc documentation
-Index: gnuplot-5.0.4/docs/doc2texi.el
+Index: gnuplot-5.0.5/docs/doc2texi.el
===================================================================
---- gnuplot-5.0.4.orig/docs/doc2texi.el
-+++ gnuplot-5.0.4/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
diff --git a/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch b/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch
index 4c0be7f..551b7a9 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.4/term/post.trm
+Index: gnuplot-5.0.5/term/post.trm
===================================================================
---- gnuplot-5.0.4.orig/term/post.trm
-+++ gnuplot-5.0.4/term/post.trm
+--- gnuplot-5.0.5.orig/term/post.trm
++++ gnuplot-5.0.5/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 455c9c0..13b2a16 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.4/term/post.trm
+Index: gnuplot-5.0.5/term/post.trm
===================================================================
---- gnuplot-5.0.4.orig/term/post.trm
-+++ gnuplot-5.0.4/term/post.trm
+--- gnuplot-5.0.5.orig/term/post.trm
++++ gnuplot-5.0.5/term/post.trm
@@ -1644,7 +1644,6 @@ SDict begin [\n\
/Title (%s)\n\
/Subject (gnuplot plot)\n\
@@ -14,7 +14,7 @@ Index: gnuplot-5.0.4/term/post.trm
%% /Producer (gnuplot)\n\
%% /Keywords ()\n\
/CreationDate (%s)\n\
-@@ -1821,18 +1820,11 @@ end\n\
+@@ -1837,18 +1836,11 @@ end\n\
/* HH: print pdf information interpreted by ghostscript/acrobat */
{
--
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