[gnuplot5] 02/06: Update patches.
Anton Gladky
gladk at moszumanska.debian.org
Mon Feb 8 12:36:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gnuplot5.
commit 87675841d1f2dda1dfad43af237a1010625788b7
Author: Anton Gladky <gladk at debian.org>
Date: Mon Feb 8 13:25:03 2016 +0100
Update 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 | 12 ++++++------
debian/patches/10_removepicins.patch | 12 ++++++------
debian/patches/11_fix_linkage_wx.patch | 6 +++---
debian/patches/12_info.patch | 12 ++++++------
debian/patches/13_wxt_fontsize_bug1731.patch | 22 ----------------------
debian/patches/series | 2 +-
10 files changed, 40 insertions(+), 62 deletions(-)
diff --git a/debian/patches/04_fix_libexecdir.diff b/debian/patches/04_fix_libexecdir.diff
index dc3b5ca..9f0983f 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.2/src/Makefile.am
+Index: gnuplot-5.0.3/src/Makefile.am
===================================================================
---- gnuplot-5.0.2.orig/src/Makefile.am
-+++ gnuplot-5.0.2/src/Makefile.am
+--- gnuplot-5.0.3.orig/src/Makefile.am
++++ gnuplot-5.0.3/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 beb7245..636e157 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.2/term/gd.trm
+Index: gnuplot-5.0.3/term/gd.trm
===================================================================
---- gnuplot-5.0.2.orig/term/gd.trm
-+++ gnuplot-5.0.2/term/gd.trm
+--- gnuplot-5.0.3.orig/term/gd.trm
++++ gnuplot-5.0.3/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 7c09318..7edc1c9 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.2/docs/Makefile.am
+Index: gnuplot-5.0.3/docs/Makefile.am
===================================================================
---- gnuplot-5.0.2.orig/docs/Makefile.am
-+++ gnuplot-5.0.2/docs/Makefile.am
+--- gnuplot-5.0.3.orig/docs/Makefile.am
++++ gnuplot-5.0.3/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 e26768c..ae0d7a8 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.2/demo/Makefile.in
+Index: gnuplot-5.0.3/demo/Makefile.in
===================================================================
---- gnuplot-5.0.2.orig/demo/Makefile.in
-+++ gnuplot-5.0.2/demo/Makefile.in
+--- gnuplot-5.0.3.orig/demo/Makefile.in
++++ gnuplot-5.0.3/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.2/demo/Makefile.in
all: all-recursive
.SUFFIXES:
-Index: gnuplot-5.0.2/demo/Makefile.am
+Index: gnuplot-5.0.3/demo/Makefile.am
===================================================================
---- gnuplot-5.0.2.orig/demo/Makefile.am
-+++ gnuplot-5.0.2/demo/Makefile.am
+--- gnuplot-5.0.3.orig/demo/Makefile.am
++++ gnuplot-5.0.3/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.2/demo/Makefile.am
-if BUILD_PLUGIN
-PLUGIN_DIR = plugin
-endif
-Index: gnuplot-5.0.2/demo/Makefile.am.in
+Index: gnuplot-5.0.3/demo/Makefile.am.in
===================================================================
---- gnuplot-5.0.2.orig/demo/Makefile.am.in
-+++ gnuplot-5.0.2/demo/Makefile.am.in
+--- gnuplot-5.0.3.orig/demo/Makefile.am.in
++++ gnuplot-5.0.3/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 2a33059..91ec168 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.2/configure.in
+Index: gnuplot-5.0.3/configure.in
===================================================================
---- gnuplot-5.0.2.orig/configure.in
-+++ gnuplot-5.0.2/configure.in
+--- gnuplot-5.0.3.orig/configure.in
++++ gnuplot-5.0.3/configure.in
@@ -1319,7 +1319,6 @@ AC_OUTPUT([Makefile
share/Makefile
share/LaTeX/Makefile
@@ -25,10 +25,10 @@ Index: gnuplot-5.0.2/configure.in
if test "$is_next" = yes; then
AC_MSG_RESULT([ next terminal: yes])
fi
-Index: gnuplot-5.0.2/src/Makefile.am
+Index: gnuplot-5.0.3/src/Makefile.am
===================================================================
---- gnuplot-5.0.2.orig/src/Makefile.am
-+++ gnuplot-5.0.2/src/Makefile.am
+--- gnuplot-5.0.3.orig/src/Makefile.am
++++ gnuplot-5.0.3/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 1e2acfb..bccc8cb 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.2/docs/Makefile.am
+Index: gnuplot-5.0.3/docs/Makefile.am
===================================================================
---- gnuplot-5.0.2.orig/docs/Makefile.am
-+++ gnuplot-5.0.2/docs/Makefile.am
+--- gnuplot-5.0.3.orig/docs/Makefile.am
++++ gnuplot-5.0.3/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.2/docs/Makefile.am
) ; \
TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
-Index: gnuplot-5.0.2/docs/doc2tex.c
+Index: gnuplot-5.0.3/docs/doc2tex.c
===================================================================
---- gnuplot-5.0.2.orig/docs/doc2tex.c
-+++ gnuplot-5.0.2/docs/doc2tex.c
+--- gnuplot-5.0.3.orig/docs/doc2tex.c
++++ gnuplot-5.0.3/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 514ee65..750e111 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.2/src/Makefile.am
+Index: gnuplot-5.0.3/src/Makefile.am
===================================================================
---- gnuplot-5.0.2.orig/src/Makefile.am
-+++ gnuplot-5.0.2/src/Makefile.am
+--- gnuplot-5.0.3.orig/src/Makefile.am
++++ gnuplot-5.0.3/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 0bce56a..a9c3685 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.2/docs/Makefile.am
+Index: gnuplot-5.0.3/docs/Makefile.am
===================================================================
---- gnuplot-5.0.2.orig/docs/Makefile.am
-+++ gnuplot-5.0.2/docs/Makefile.am
+--- gnuplot-5.0.3.orig/docs/Makefile.am
++++ gnuplot-5.0.3/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.2/docs/Makefile.am
else : ; fi
# this is how to make OS/2 ipfc documentation
-Index: gnuplot-5.0.2/docs/doc2texi.el
+Index: gnuplot-5.0.3/docs/doc2texi.el
===================================================================
---- gnuplot-5.0.2.orig/docs/doc2texi.el
-+++ gnuplot-5.0.2/docs/doc2texi.el
+--- gnuplot-5.0.3.orig/docs/doc2texi.el
++++ gnuplot-5.0.3/docs/doc2texi.el
@@ -79,7 +79,7 @@
;;
;; Then you can do
diff --git a/debian/patches/13_wxt_fontsize_bug1731.patch b/debian/patches/13_wxt_fontsize_bug1731.patch
deleted file mode 100644
index 0b60f62..0000000
--- a/debian/patches/13_wxt_fontsize_bug1731.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fix font size on wxt-terminal
-Author: Ethan Merritt <sfeam at users.sf.net>
-Reviewed-By: Anton Gladky <gladk at debian.org>
-Bug-Debian: https://bugs.debian.org/810943
-Applied-Upstream: https://sourceforge.net/p/gnuplot/bugs/1731/
-Last-Update: 2016-01-18
-
-Index: gnuplot5-5.0.2+dfsg1/term/wxt.trm
-===================================================================
---- gnuplot5-5.0.2+dfsg1.orig/term/wxt.trm
-+++ gnuplot5-5.0.2+dfsg1/term/wxt.trm
-@@ -179,8 +179,9 @@ TERM_PUBLIC void wxt_options()
- sep = strcspn(s,",");
- if (sep > 0) {
- s[sep] = '\0';
-- sscanf(&(s[sep+1]), "%d", &wxt_set_fontsize);
- }
-+ if (s[sep] == ',')
-+ sscanf(&(s[sep+1]), "%d", &wxt_set_fontsize);
- free(wxt_set_fontname);
- wxt_set_fontname = gp_strdup(s);
- } else {
diff --git a/debian/patches/series b/debian/patches/series
index 34ac923..14c52e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,4 @@
10_removepicins.patch
11_fix_linkage_wx.patch
12_info.patch
-13_wxt_fontsize_bug1731.patch
+15_fix_format_not_a_string.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gnuplot5.git
More information about the debian-science-commits
mailing list