[gnuplot5] 03/06: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Tue Jan 12 08:15:35 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 5be40e09816b86da254e1822ce52eb0d9d745a12
Author: Anton Gladky <gladk at debian.org>
Date: Tue Jan 12 06:24:09 2016 +0100
Refresh patches.
---
debian/patches/04_fix_libexecdir.diff | 6 ++--
debian/patches/05_default_gd_font.diff | 6 ++--
debian/patches/07_doc.patch | 14 ++++----
debian/patches/08_disable_demo_plugin.patch | 22 ++++++------
debian/patches/09_remove_beos.patch | 18 +++++-----
debian/patches/10_removepicins.patch | 37 ++++++++++++++------
debian/patches/11_fix_linkage_wx.patch | 8 ++---
debian/patches/12_info.patch | 53 ++++++++++++++---------------
debian/patches/13_no_pie.patch | 28 ---------------
debian/patches/series | 1 -
10 files changed, 89 insertions(+), 104 deletions(-)
diff --git a/debian/patches/04_fix_libexecdir.diff b/debian/patches/04_fix_libexecdir.diff
index b7b9e60..dc3b5ca 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.1/src/Makefile.am
+Index: gnuplot-5.0.2/src/Makefile.am
===================================================================
---- gnuplot-5.0.1.orig/src/Makefile.am
-+++ gnuplot-5.0.1/src/Makefile.am
+--- gnuplot-5.0.2.orig/src/Makefile.am
++++ gnuplot-5.0.2/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 443a069..beb7245 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.1/term/gd.trm
+Index: gnuplot-5.0.2/term/gd.trm
===================================================================
---- gnuplot-5.0.1.orig/term/gd.trm
-+++ gnuplot-5.0.1/term/gd.trm
+--- gnuplot-5.0.2.orig/term/gd.trm
++++ gnuplot-5.0.2/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 26d08bd..7c09318 100644
--- a/debian/patches/07_doc.patch
+++ b/debian/patches/07_doc.patch
@@ -2,16 +2,16 @@ Description: Fix path in documentation generation
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-16
-Index: gnuplot-5.0.1/docs/Makefile.am
+Index: gnuplot-5.0.2/docs/Makefile.am
===================================================================
---- gnuplot-5.0.1.orig/docs/Makefile.am
-+++ gnuplot-5.0.1/docs/Makefile.am
-@@ -326,7 +326,7 @@ ${ELCS}: gnuplot-eldoc.el
+--- gnuplot-5.0.2.orig/docs/Makefile.am
++++ gnuplot-5.0.2/docs/Makefile.am
+@@ -345,7 +345,7 @@ ${ELCS}: gnuplot-eldoc.el
fi
gnuplot.info: gnuplot.texi
-- $(MAKEINFO) -I$(srcdir) $(srcdir)/gnuplot.texi --no-split --output=$@
-+ $(MAKEINFO) -I$(srcdir) $(srcdir)/gnuplot.texi --no-split --force --output=$@
+- $(AM_V_GEN) $(MAKEINFO) -I$(srcdir) $< --no-split --output=$@
++ $(AM_V_GEN) $(MAKEINFO) -I$(srcdir) $< --no-split --force --output=$@
install-info: gnuplot.info
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
+ $(AM_V_at) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
diff --git a/debian/patches/08_disable_demo_plugin.patch b/debian/patches/08_disable_demo_plugin.patch
index d9dc504..e26768c 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.1/demo/Makefile.in
+Index: gnuplot-5.0.2/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
+--- gnuplot-5.0.2.orig/demo/Makefile.in
++++ gnuplot-5.0.2/demo/Makefile.in
+@@ -328,7 +328,6 @@ epslatex.ps epslatex.tex random.tmp stri
BINARY_FILES = binary1 binary2 binary3
SUBDIRS = $(PLUGIN_DIR)
@@ -17,7 +17,7 @@ Index: gnuplot-5.0.1/demo/Makefile.in
DEMO = all.dem
GNUPLOT = gnuplot
EXTRA_DIST = Makefile.am.in lena-keypoints.bin scatter2.bin sine.bin \
-@@ -365,7 +364,6 @@ density.fnc hexa.fnc line.fnc reflect.fn
+@@ -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
@@ -25,10 +25,10 @@ Index: gnuplot-5.0.1/demo/Makefile.in
all: all-recursive
.SUFFIXES:
-Index: gnuplot-5.0.1/demo/Makefile.am
+Index: gnuplot-5.0.2/demo/Makefile.am
===================================================================
---- gnuplot-5.0.1.orig/demo/Makefile.am
-+++ gnuplot-5.0.1/demo/Makefile.am
+--- gnuplot-5.0.2.orig/demo/Makefile.am
++++ gnuplot-5.0.2/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.1/demo/Makefile.am
-if BUILD_PLUGIN
-PLUGIN_DIR = plugin
-endif
-Index: gnuplot-5.0.1/demo/Makefile.am.in
+Index: gnuplot-5.0.2/demo/Makefile.am.in
===================================================================
---- gnuplot-5.0.1.orig/demo/Makefile.am.in
-+++ gnuplot-5.0.1/demo/Makefile.am.in
+--- gnuplot-5.0.2.orig/demo/Makefile.am.in
++++ gnuplot-5.0.2/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 c3e4334..2a33059 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.1/configure.in
+Index: gnuplot-5.0.2/configure.in
===================================================================
---- gnuplot-5.0.1.orig/configure.in
-+++ gnuplot-5.0.1/configure.in
-@@ -1318,7 +1318,6 @@ AC_OUTPUT([Makefile
+--- gnuplot-5.0.2.orig/configure.in
++++ gnuplot-5.0.2/configure.in
+@@ -1319,7 +1319,6 @@ AC_OUTPUT([Makefile
share/Makefile
share/LaTeX/Makefile
src/Makefile
@@ -14,7 +14,7 @@ Index: gnuplot-5.0.1/configure.in
src/wxterminal/Makefile
src/qtterminal/Makefile
term/Makefile
-@@ -1426,10 +1425,6 @@ if test "$is_msdos" = yes; then
+@@ -1427,10 +1426,6 @@ if test "$is_msdos" = yes; then
AC_MSG_RESULT([ svga terminal (MSDOS/djgpp): yes])
fi
@@ -25,11 +25,11 @@ Index: gnuplot-5.0.1/configure.in
if test "$is_next" = yes; then
AC_MSG_RESULT([ next terminal: yes])
fi
-Index: gnuplot-5.0.1/src/Makefile.am
+Index: gnuplot-5.0.2/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
+--- gnuplot-5.0.2.orig/src/Makefile.am
++++ gnuplot-5.0.2/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 273df6a..1e2acfb 100644
--- a/debian/patches/10_removepicins.patch
+++ b/debian/patches/10_removepicins.patch
@@ -2,15 +2,32 @@ Description: removes picins latex include
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-16
-Index: gnuplot-5.0.1/docs/Makefile.am
+Index: gnuplot-5.0.2/docs/Makefile.am
===================================================================
---- 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
- @if [ -z pdffigures.tex ] ; then \
- echo "\usepackage{graphicx}" > pdffigures.tex ; \
-- echo "\usepackage{picins}" >> pdffigures.tex ; \
- fi
+--- gnuplot-5.0.2.orig/docs/Makefile.am
++++ gnuplot-5.0.2/docs/Makefile.am
+@@ -189,7 +189,6 @@ gnuplot.pdf: figures.tex pdf_figures $(s
+ touch figures.idx ; \
+ rm -f pdffigures.tex ; \
+ ( echo "\usepackage{graphicx}" > pdffigures.tex ; \
+- echo "\usepackage{picins}" >> pdffigures.tex ; \
+ ) ; \
+ TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
+ TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
+Index: gnuplot-5.0.2/docs/doc2tex.c
+===================================================================
+--- gnuplot-5.0.2.orig/docs/doc2tex.c
++++ gnuplot-5.0.2/docs/doc2tex.c
+@@ -168,12 +168,6 @@ process_line( char *line, FILE *b)
+ break;
+
+ case 'F': /* embedded figure */
+- if (figures) {
+- line[strlen(line)-1]=NUL;
+- (void) fputs("\\parpic[r][rt]{\\includegraphics[width=3in,keepaspectratio]{",b);
+- fputs(line+1, b);
+- (void) fputs("}}\n",b);
+- }
+ break;
- figures: allterm.h doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc
+ case '@':{ /* start/end table */
diff --git a/debian/patches/11_fix_linkage_wx.patch b/debian/patches/11_fix_linkage_wx.patch
index c39bc82..514ee65 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.1/src/Makefile.am
+Index: gnuplot-5.0.2/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)
+--- gnuplot-5.0.2.orig/src/Makefile.am
++++ gnuplot-5.0.2/src/Makefile.am
+@@ -87,6 +87,8 @@ $(EXTRA_gnuplot_SOURCES)
if BUILD_WXWIDGETS
gnuplot_SOURCES += wxterminal/wxt_gui.cpp
diff --git a/debian/patches/12_info.patch b/debian/patches/12_info.patch
index 20bb293..0bce56a 100644
--- a/debian/patches/12_info.patch
+++ b/debian/patches/12_info.patch
@@ -4,21 +4,21 @@ Reviewed-By: Anton Gladky <gladk at debian.org>
Bug-Debian: http://bugs.debian.org/778757
Last-Update: 2015-06-29
-Index: gnuplot5-5.0.1+dfsg1/docs/Makefile.am
+Index: gnuplot-5.0.2/docs/Makefile.am
===================================================================
---- gnuplot5-5.0.1+dfsg1.orig/docs/Makefile.am
-+++ gnuplot5-5.0.1+dfsg1/docs/Makefile.am
-@@ -81,7 +81,7 @@ ELCS = gnuplot-eldoc.elc
- CLEANFILES = allterm.h gnuplot.tex gnuplot.dvi gnuplot.aux gnuplot.log \
- gnuplot.toc gnuplot.ps gpcard.dvi gpcard.log gpcard.ps alldoc2gih \
- doc2gih gnuplot.gih doc2hlp gnuplot.hlp gnuplot.idx gnuplot.ilg \
--gnuplot.ind gnuplot.info* gnuplot.out doc2ipf gnuplot.ipf doc2ms \
-+gnuplot.ind gnuplot5.info* gnuplot.out doc2ipf gnuplot.ipf doc2ms \
- gnuplot.ms doc2rnh gnuplot.rnh doc2rtf gnuplot.rtf gnuplot.nroff \
- checkdoc gnuplot.txt gnuplot.tmp VERSION gnuplot.4tc gnuplot.4ct \
- gnuplot.idv gnuplot.xref gnuplot.lg figures pdffigures.aux \
-@@ -301,7 +301,7 @@ wxhelp/doc2html: wxhelp/doc2html.o termd
- $(LINK) $^
+--- gnuplot-5.0.2.orig/docs/Makefile.am
++++ gnuplot-5.0.2/docs/Makefile.am
+@@ -90,7 +90,7 @@ gpcard.log pdffigures.tex pdffigures.aux
+
+ CLEANFILES = allterm.h gnuplot.dvi figures.tex nofigures.tex \
+ gnuplot.tex gnuplot.idx gnuplot.ilg gnuplot.ps gpcard.dvi gpcard.ps \
+-gnuplot.gih gnuplot.hlp gnuplot.info* gnuplot.ipf gnuplot.ms \
++gnuplot.gih gnuplot.hlp gnuplot5.info* gnuplot.ipf gnuplot.ms \
+ gnuplot.rnh gnuplot.rtf gnuplot.nroff gnuplot.txt gnuplot-groff.dvi \
+ gnuplot-groff.ps gnuplot.tmp VERSION gnuplot.4tc gnuplot.4ct \
+ gnuplot.idv gnuplot.xref gnuplot.lg gnuplot.pdf wxhelp_figures \
+@@ -323,7 +323,7 @@ wxhelp_figures: $(GNUPLOT_EXE) $(srcdir)
+ $(AM_V_GEN)touch $@
### GNU info format
-info: gnuplot.info
@@ -26,33 +26,30 @@ Index: gnuplot5-5.0.1+dfsg1/docs/Makefile.am
# Thanks to Bruce Ravel for doc2texi.el!
gnuplot.texi gnuplot-eldoc.el: $(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
-@@ -324,16 +324,16 @@ ${ELCS}: gnuplot-eldoc.el
+@@ -343,15 +343,15 @@ ${ELCS}: gnuplot-eldoc.el
echo "No emacs found - cannot create gnuplot-eldoc.elc file" ; \
fi
-gnuplot.info: gnuplot.texi
-- $(MAKEINFO) -I$(srcdir) $(srcdir)/gnuplot.texi --no-split --force --output=$@
+gnuplot5.info: gnuplot.texi
-+ $(MAKEINFO) -I$(srcdir) gnuplot.texi --no-split --force --output=$@
+ $(AM_V_GEN) $(MAKEINFO) -I$(srcdir) $< --no-split --force --output=$@
-install-info: gnuplot.info
+install-info: gnuplot5.info
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
-- $(INSTALL_DATA) gnuplot.info $(DESTDIR)$(infodir)/gnuplot.info
-+ $(INSTALL_DATA) gnuplot5.info $(DESTDIR)$(infodir)/gnuplot5.info
- @if (install-info --version && \
+ $(AM_V_at) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
+- $(AM_V_at) $(INSTALL_DATA) gnuplot.info $(DESTDIR)$(infodir)/gnuplot.info
++ $(AM_V_at) $(INSTALL_DATA) gnuplot5.info $(DESTDIR)$(infodir)/gnuplot5.info
+ $(AM_V_at) if (install-info --version && \
install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
-- echo "install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info";\
-- install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info || :;\
-+ echo "install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot5.info";\
-+ install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot5.info || :;\
+- install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info || : ;\
++ install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot5.info || : ;\
else : ; fi
# this is how to make OS/2 ipfc documentation
-Index: gnuplot5-5.0.1+dfsg1/docs/doc2texi.el
+Index: gnuplot-5.0.2/docs/doc2texi.el
===================================================================
---- gnuplot5-5.0.1+dfsg1.orig/docs/doc2texi.el
-+++ gnuplot5-5.0.1+dfsg1/docs/doc2texi.el
+--- gnuplot-5.0.2.orig/docs/doc2texi.el
++++ gnuplot-5.0.2/docs/doc2texi.el
@@ -79,7 +79,7 @@
;;
;; Then you can do
diff --git a/debian/patches/13_no_pie.patch b/debian/patches/13_no_pie.patch
deleted file mode 100644
index b5148ba..0000000
--- a/debian/patches/13_no_pie.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Don't build with -fPIE, Qt barfs on that with gcc >= 5. (http://code.qt.io/cgit/qt/qtbase.git/commit/?id=3eca75d)
-Author: Martin Pitt <martin.pitt at ubuntu.com>
-Bug-Debian: https://bugs.debian.org/795076
-
-Index: gnuplot5-5.0.1+dfsg1/configure
-===================================================================
---- gnuplot5-5.0.1+dfsg1.orig/configure
-+++ gnuplot5-5.0.1+dfsg1/configure
-@@ -14238,7 +14238,6 @@ fi
- RCC=${QT5LOC}/rcc
- LRELEASE=${QT5LOC}/lrelease
- fi
-- CXXFLAGS="$CXXFLAGS -fPIE"
- fi
- fi
-
-Index: gnuplot5-5.0.1+dfsg1/configure.in
-===================================================================
---- gnuplot5-5.0.1+dfsg1.orig/configure.in
-+++ gnuplot5-5.0.1+dfsg1/configure.in
-@@ -1208,7 +1208,6 @@ if test "${enable_qt}" = yes ; then
- RCC=${QT5LOC}/rcc
- LRELEASE=${QT5LOC}/lrelease
- fi
-- CXXFLAGS="$CXXFLAGS -fPIE"
- fi
- fi
-
diff --git a/debian/patches/series b/debian/patches/series
index 5820487..519eb43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@
10_removepicins.patch
11_fix_linkage_wx.patch
12_info.patch
-13_no_pie.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