[gnuplot5] 03/04: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Wed Jun 17 16:12:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gnuplot5.
commit 47f23a2d699856373d72baf417c587ac098925a4
Author: Anton Gladky <gladk at debian.org>
Date: Tue Jun 16 22:36:16 2015 +0200
Refresh patches.
---
debian/patches/04_fix_libexecdir.diff | 8 ++--
debian/patches/05_default_gd_font.diff | 10 +++--
debian/patches/07_doc.patch | 10 ++---
debian/patches/08_disable_demo_plugin.patch | 58 +++++++++++++++++++----------
debian/patches/09_remove_beos.patch | 18 ++++-----
debian/patches/10_removepicins.patch | 32 +++++-----------
debian/patches/11_fix_linkage_wx.patch | 8 ++--
7 files changed, 77 insertions(+), 67 deletions(-)
diff --git a/debian/patches/04_fix_libexecdir.diff b/debian/patches/04_fix_libexecdir.diff
index dd3d70e..b7b9e60 100644
--- a/debian/patches/04_fix_libexecdir.diff
+++ b/debian/patches/04_fix_libexecdir.diff
@@ -1,9 +1,11 @@
Description: fix libexecdir
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-06-16
-Index: gnuplot-5.0.rc2/src/Makefile.am
+Index: gnuplot-5.0.1/src/Makefile.am
===================================================================
---- gnuplot-5.0.rc2.orig/src/Makefile.am
-+++ gnuplot-5.0.rc2/src/Makefile.am
+--- gnuplot-5.0.1.orig/src/Makefile.am
++++ gnuplot-5.0.1/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 150b447..443a069 100644
--- a/debian/patches/05_default_gd_font.diff
+++ b/debian/patches/05_default_gd_font.diff
@@ -1,10 +1,12 @@
Description: change the default font
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-06-16
-Index: gnuplot-5.0.rc2/term/gd.trm
+Index: gnuplot-5.0.1/term/gd.trm
===================================================================
---- gnuplot-5.0.rc2.orig/term/gd.trm
-+++ gnuplot-5.0.rc2/term/gd.trm
-@@ -989,7 +989,7 @@ PNG_options()
+--- gnuplot-5.0.1.orig/term/gd.trm
++++ gnuplot-5.0.1/term/gd.trm
+@@ -990,7 +990,7 @@ PNG_options()
if (external_default)
png_state.ttffont = gp_strdup(external_default);
else /* Might as well try some plausible font; it's no worse than failing immediately */
diff --git a/debian/patches/07_doc.patch b/debian/patches/07_doc.patch
index 55f9b26..26d08bd 100644
--- a/debian/patches/07_doc.patch
+++ b/debian/patches/07_doc.patch
@@ -1,12 +1,12 @@
Description: Fix path in documentation generation
Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-11-18
+Last-Update: 2015-06-16
-Index: gnuplot-5.0.rc2/docs/Makefile.am
+Index: gnuplot-5.0.1/docs/Makefile.am
===================================================================
---- gnuplot-5.0.rc2.orig/docs/Makefile.am
-+++ gnuplot-5.0.rc2/docs/Makefile.am
-@@ -324,7 +324,7 @@ ${ELCS}: gnuplot-eldoc.el
+--- gnuplot-5.0.1.orig/docs/Makefile.am
++++ gnuplot-5.0.1/docs/Makefile.am
+@@ -326,7 +326,7 @@ ${ELCS}: gnuplot-eldoc.el
fi
gnuplot.info: gnuplot.texi
diff --git a/debian/patches/08_disable_demo_plugin.patch b/debian/patches/08_disable_demo_plugin.patch
index a968640..d9dc504 100644
--- a/debian/patches/08_disable_demo_plugin.patch
+++ b/debian/patches/08_disable_demo_plugin.patch
@@ -3,12 +3,12 @@ Description: temporarly disable demo plugin
version appears, where already no binaries
in demo/plugin folder.
Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-07-11
+Last-Update: 2015-06-16
-Index: gnuplot-5.0.rc2/demo/Makefile.in
+Index: gnuplot-5.0.1/demo/Makefile.in
===================================================================
---- gnuplot-5.0.rc2.orig/demo/Makefile.in
-+++ gnuplot-5.0.rc2/demo/Makefile.in
+--- gnuplot-5.0.1.orig/demo/Makefile.in
++++ gnuplot-5.0.1/demo/Makefile.in
@@ -327,7 +327,6 @@ epslatex.ps epslatex.tex random.tmp stri
BINARY_FILES = binary1 binary2 binary3
@@ -16,25 +16,43 @@ Index: gnuplot-5.0.rc2/demo/Makefile.in
-DIST_SUBDIRS = plugin
DEMO = all.dem
GNUPLOT = gnuplot
- EXTRA_DIST = Makefile.am.in lena-keypoints.bin scatter2.bin \
-@@ -366,7 +365,6 @@ GM1_sugar.pdb bldg.png GM1_bonds.r3d blu
- sound2.par start.par gnuplot.rot gnu-valley random-points gpdemos.tcl \
- html plugin
+ EXTRA_DIST = Makefile.am.in lena-keypoints.bin scatter2.bin sine.bin \
+@@ -365,7 +364,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
- at BUILD_PLUGIN_TRUE@PLUGIN_DIR = plugin
all: all-recursive
.SUFFIXES:
-Index: gnuplot-5.0.rc2/demo/plugin/Makefile.am
+Index: gnuplot-5.0.1/demo/Makefile.am
===================================================================
---- gnuplot-5.0.rc2.orig/demo/plugin/Makefile.am
-+++ gnuplot-5.0.rc2/demo/plugin/Makefile.am
-@@ -1,8 +1,2 @@
- ## Process this file with automake to produce Makefile.in -*-Makefile-*-
- AUTOMAKE_OPTIONS = foreign
--
--noinst_PROGRAMS = demo_plugin.so
--
--demo_plugin_so_SOURCES = demo_plugin.c
--demo_plugin_so_CFLAGS = -rdynamic -fPIC -I$(top_srcdir)/src
--demo_plugin_so_LDFLAGS = -shared
+--- gnuplot-5.0.1.orig/demo/Makefile.am
++++ gnuplot-5.0.1/demo/Makefile.am
+@@ -9,7 +9,6 @@ epslatex.ps epslatex.tex random.tmp stri
+ BINARY_FILES = binary1 binary2 binary3
+
+ SUBDIRS = $(PLUGIN_DIR)
+-DIST_SUBDIRS = plugin
+
+ DEMO = all.dem
+
+@@ -115,6 +114,3 @@ Makefile.am: Makefile.am.in
+ chmod og-w $@t
+ mv $@t $@
+
+-if BUILD_PLUGIN
+-PLUGIN_DIR = plugin
+-endif
+Index: gnuplot-5.0.1/demo/Makefile.am.in
+===================================================================
+--- gnuplot-5.0.1.orig/demo/Makefile.am.in
++++ gnuplot-5.0.1/demo/Makefile.am.in
+@@ -9,7 +9,6 @@ epslatex.ps epslatex.tex random.tmp stri
+ BINARY_FILES = binary1 binary2 binary3
+
+ SUBDIRS = $(PLUGIN_DIR)
+-DIST_SUBDIRS = plugin
+
+ DEMO = all.dem
+
diff --git a/debian/patches/09_remove_beos.patch b/debian/patches/09_remove_beos.patch
index 4b7e227..c3e4334 100644
--- a/debian/patches/09_remove_beos.patch
+++ b/debian/patches/09_remove_beos.patch
@@ -1,12 +1,12 @@
Description: remove beos-specific code
Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-09-29
+Last-Update: 2015-06-16
-Index: gnuplot-5.0.rc2/configure.in
+Index: gnuplot-5.0.1/configure.in
===================================================================
---- gnuplot-5.0.rc2.orig/configure.in
-+++ gnuplot-5.0.rc2/configure.in
-@@ -1310,7 +1310,6 @@ AC_OUTPUT([Makefile
+--- gnuplot-5.0.1.orig/configure.in
++++ gnuplot-5.0.1/configure.in
+@@ -1318,7 +1318,6 @@ AC_OUTPUT([Makefile
share/Makefile
share/LaTeX/Makefile
src/Makefile
@@ -14,7 +14,7 @@ Index: gnuplot-5.0.rc2/configure.in
src/wxterminal/Makefile
src/qtterminal/Makefile
term/Makefile
-@@ -1418,10 +1417,6 @@ if test "$is_msdos" = yes; then
+@@ -1426,10 +1425,6 @@ if test "$is_msdos" = yes; then
AC_MSG_RESULT([ svga terminal (MSDOS/djgpp): yes])
fi
@@ -25,10 +25,10 @@ Index: gnuplot-5.0.rc2/configure.in
if test "$is_next" = yes; then
AC_MSG_RESULT([ next terminal: yes])
fi
-Index: gnuplot-5.0.rc2/src/Makefile.am
+Index: gnuplot-5.0.1/src/Makefile.am
===================================================================
---- gnuplot-5.0.rc2.orig/src/Makefile.am
-+++ gnuplot-5.0.rc2/src/Makefile.am
+--- gnuplot-5.0.1.orig/src/Makefile.am
++++ gnuplot-5.0.1/src/Makefile.am
@@ -75,11 +75,7 @@ getcolor_x11.o: getcolor.c
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 4618572..273df6a 100644
--- a/debian/patches/10_removepicins.patch
+++ b/debian/patches/10_removepicins.patch
@@ -1,30 +1,16 @@
Description: removes picins latex include
Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2015-01-22
+Last-Update: 2015-06-16
-Index: gnuplot5-5.0.0+dfsg1/docs/Makefile.am
+Index: gnuplot-5.0.1/docs/Makefile.am
===================================================================
---- gnuplot5-5.0.0+dfsg1.orig/docs/Makefile.am
-+++ gnuplot5-5.0.0+dfsg1/docs/Makefile.am
-@@ -172,8 +172,7 @@ pdffigures: pdffigures.tex $(top_srcdir)
- rm -f figures
-
- pdffigures.tex: figures
-- echo "\usepackage{graphicx}" > pdffigures.tex ; \
-- echo "\usepackage{picins}" >> pdffigures.tex
-+ echo "\usepackage{graphicx}" > pdffigures.tex
-
- figures: allterm.h doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc
- @if [ -a $(top_srcdir)/src/gnuplot ] ; then \
-Index: gnuplot5-5.0.0+dfsg1/docs/Makefile.in
-===================================================================
---- gnuplot5-5.0.0+dfsg1.orig/docs/Makefile.in
-+++ gnuplot5-5.0.0+dfsg1/docs/Makefile.in
-@@ -953,7 +953,6 @@ pdffigures: pdffigures.tex $(top_srcdir)
-
+--- gnuplot-5.0.1.orig/docs/Makefile.am
++++ gnuplot-5.0.1/docs/Makefile.am
+@@ -174,7 +174,6 @@ pdffigures: pdffigures.tex $(top_srcdir)
pdffigures.tex: figures
- echo "\usepackage{graphicx}" > pdffigures.tex ; \
-- echo "\usepackage{picins}" >> pdffigures.tex
+ @if [ -z pdffigures.tex ] ; then \
+ echo "\usepackage{graphicx}" > pdffigures.tex ; \
+- echo "\usepackage{picins}" >> pdffigures.tex ; \
+ fi
figures: allterm.h doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc
- @if [ -a $(top_srcdir)/src/gnuplot ] ; then \
diff --git a/debian/patches/11_fix_linkage_wx.patch b/debian/patches/11_fix_linkage_wx.patch
index 112ed58..c39bc82 100644
--- a/debian/patches/11_fix_linkage_wx.patch
+++ b/debian/patches/11_fix_linkage_wx.patch
@@ -1,9 +1,11 @@
Description: Add missing linkage against X11 libs.
Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2015-01-22
+Last-Update: 2015-06-16
---- gnuplot5-5.0.0+dfsg1.orig/src/Makefile.am
-+++ gnuplot5-5.0.0+dfsg1/src/Makefile.am
+Index: gnuplot-5.0.1/src/Makefile.am
+===================================================================
+--- gnuplot-5.0.1.orig/src/Makefile.am
++++ gnuplot-5.0.1/src/Makefile.am
@@ -89,6 +89,8 @@ $(EXTRA_gnuplot_SOURCES)
if BUILD_WXWIDGETS
--
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