[SCM] Gnuplot. Interactive plotting program branch, master, updated. debian/4.6.0-8-14-g493ba16
Anton Gladky
gladky.anton at gmail.com
Wed May 1 18:42:46 UTC 2013
The following commit has been merged in the master branch:
commit c706f6c1824104b99a98aa96ebafe356bfe3d4c2
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Wed May 1 10:21:06 2013 +0200
Refresh patches. Removed ones, applied by upstream.
diff --git a/debian/patches/04_fix_libexecdir.diff b/debian/patches/04_fix_libexecdir.diff
index b26f06f..f769882 100644
--- a/debian/patches/04_fix_libexecdir.diff
+++ b/debian/patches/04_fix_libexecdir.diff
@@ -1,7 +1,7 @@
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
- AUTOMAKE_OPTIONS = ansi2knr foreign 1.2h
+ AUTOMAKE_OPTIONS = foreign
# in the spirit of automake ...
-pkglibexecdir = $(libexecdir)/@PACKAGE@/@VERSION_MAJOR@
diff --git a/debian/patches/05_default_gd_font.diff b/debian/patches/05_default_gd_font.diff
index 2e8f863..61af682 100644
--- a/debian/patches/05_default_gd_font.diff
+++ b/debian/patches/05_default_gd_font.diff
@@ -1,6 +1,6 @@
--- a/term/gd.trm
+++ b/term/gd.trm
-@@ -979,7 +979,7 @@
+@@ -981,7 +981,7 @@
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_fix_segm_fault.diff b/debian/patches/07_fix_segm_fault.diff
deleted file mode 100644
index 6a3b42e..0000000
--- a/debian/patches/07_fix_segm_fault.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix "Segmentation fault" after entering any command.
-Author: Anton Gladky <gladky.anton at gmail.com>
-Bug-Debian: http://bugs.debian.org/665832
-Bug-Debian: http://bugs.debian.org/665432
-Last-Update: 2012-03-30
-
---- a/src/command.c
-+++ b/src/command.c
-@@ -2688,9 +2688,14 @@
- # elif defined(HAVE_LIBEDITLINE)
- /* deleting history entries does not work, so suppress adjacent
- duplicates only */
-- while (previous_history());
-- if (strcmp(current_history()->line, line) != 0)
-- add_history(line);
-+
-+ int found;
-+ using_history();
-+
-+ found = history_search(line, -1);
-+ if (found <= 0) {
-+ add_history(line);
-+ }
- # else /* builtin readline */
- add_history(line);
- # endif
diff --git a/debian/patches/08_do_not_set_qt_default_term.patch b/debian/patches/08_do_not_set_qt_default_term.patch
index fb5b696..ca4a6be 100644
--- a/debian/patches/08_do_not_set_qt_default_term.patch
+++ b/debian/patches/08_do_not_set_qt_default_term.patch
@@ -5,7 +5,7 @@ Last-Update: 2012-04-16
--- a/src/term.c
+++ b/src/term.c
-@@ -1732,14 +1732,14 @@
+@@ -1770,14 +1770,14 @@
term_name = "sun";
#endif /* SUN */
diff --git a/debian/patches/09_fix_typo_qt_terminal.patch b/debian/patches/09_fix_typo_qt_terminal.patch
deleted file mode 100644
index 232dc32..0000000
--- a/debian/patches/09_fix_typo_qt_terminal.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix typo in qt-terminal debug output
-Author: Jacopo Nespolo <j.nespolo at gmail.com>
-Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
-Bug-Debian: http://bugs.debian.org/670173
-Last-Update: 2012-04-25
-
---- a/src/qtterminal/qt_term.cpp
-+++ b/src/qtterminal/qt_term.cpp
-@@ -201,14 +201,14 @@
- // The widget could not be reached: start a gnuplot_qt program which will create a QtGnuplotApplication
- if (connectToWidget)
- {
-- qDebug() << "Could not connect to widget" << qt_optionWidget << ". Staring a QtGnuplotApplication";
-+ qDebug() << "Could not connect to widget" << qt_optionWidget << ". Starting a QtGnuplotApplication";
- qt_optionWidget = QString();
- qt_connectToServer(qt_localServerName);
- }
- // The gnuplot_qt program could not be reached: try to start a new one
- else
- {
-- qDebug() << "Could not connect gnuplot_qt" << qt_optionWidget << ". Staring a new one";
-+ qDebug() << "Could not connect gnuplot_qt" << qt_optionWidget << ". Starting a new one";
- execGnuplotQt();
- qt_connectToServer(qt_localServerName, false);
- }
diff --git a/debian/patches/10_fix_batch_mode_stop.patch b/debian/patches/10_fix_batch_mode_stop.patch
deleted file mode 100644
index cf67333..0000000
--- a/debian/patches/10_fix_batch_mode_stop.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix stop in batch mode
-Author: sfeam
-Reviewed-By: Anton Gladky <gladky.anton at gmail.com>
-Bug-Debian: http://bugs.debian.org/598547
-Applied-Upstream: http://gnuplot.cvs.sourceforge.net/viewvc/gnuplot/gnuplot/src/plot.c?r1=1.138&r2=1.139
-Last-Update: 2012-05-07
-
---- a/src/plot.c
-+++ b/src/plot.c
-@@ -333,7 +333,11 @@
- * instead of readline) */
- rl_readline_name = "Gnuplot";
- rl_terminal_name = getenv("TERM");
-+#if defined(HAVE_LIBREADLINE)
- using_history();
-+#else
-+ history_init();
-+#endif
- #endif
- #if defined(HAVE_LIBREADLINE) && !defined(MISSING_RL_TILDE_EXPANSION)
- rl_complete_with_tilde_expansion = 1;
diff --git a/debian/patches/11_fix_cairolatex_monochrome.patch b/debian/patches/11_fix_cairolatex_monochrome.patch
deleted file mode 100644
index 7e33574..0000000
--- a/debian/patches/11_fix_cairolatex_monochrome.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Fix cairolatex driver with monochrome keyword
-Author: sfeam
-Reviewed-By: Anton Gladky <gladky.anton at gmail.com>
-Bug-Debian: http://bugs.debian.org/668339
-Applied-Upstream: http://gnuplot.cvs.sourceforge.net/viewvc/gnuplot/gnuplot/term/pslatex.trm?r1=1.80.2.1&r2=1.80.2.2&sortby=file
-Applied-Upstream: http://gnuplot.cvs.sourceforge.net/viewvc/gnuplot/gnuplot/term/cairo.trm?r1=1.51.2.2&r2=1.51.2.3&sortby=file
-Last-Update: 2012-05-08
-
---- a/term/cairo.trm
-+++ b/term/cairo.trm
-@@ -1259,7 +1259,7 @@
- 1 /* vtic */ , 1 /* htic */ ,
- cairotrm_options, cairotrm_init, cairotrm_reset, cairotrm_text, null_scale, cairotrm_graphics,
- cairotrm_move, cairotrm_vector,
-- EPSLATEX_linetype, EPSLATEX_put_text,
-+ cairotrm_linetype, EPSLATEX_put_text,
- PS_text_angle, PS_justify_text,
- cairotrm_point, do_arrow, cairotrm_set_font,
- cairotrm_pointsize,
---- a/term/pslatex.trm
-+++ b/term/pslatex.trm
-@@ -129,7 +129,6 @@
- /* support for cairolatex */
- #ifdef HAVE_CAIROPDF
- #define ISCAIROTERMINAL ((strcmp(term->name, "cairolatex") == 0))
--TERM_PUBLIC void cairotrm_linetype __PROTO ((int linetype));
- TERM_PUBLIC void cairotrm_set_color __PROTO ((t_colorspec *colorspec));
- #else
- #define ISCAIROTERMINAL (FALSE)
-@@ -886,11 +885,6 @@
- {
- t_colorspec tempcol = {TC_LT, 0, 0.0};
- tempcol.lt = linetype;
--#ifdef HAVE_CAIROPDF
-- if (ISCAIROTERMINAL)
-- cairotrm_linetype(linetype);
-- else
--#endif
- PS_linetype(linetype);
-
- /* This leads to redundant *.eps output */
diff --git a/debian/patches/series b/debian/patches/series
index 3cf25a4..6bbc75a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,4 @@
04_fix_libexecdir.diff
05_default_gd_font.diff
-06_fix_format_not_a_string.diff
-07_fix_segm_fault.diff
+#06_fix_format_not_a_string.diff
08_do_not_set_qt_default_term.patch
-09_fix_typo_qt_terminal.patch
-10_fix_batch_mode_stop.patch
-11_fix_cairolatex_monochrome.patch
--
Gnuplot. Interactive plotting program
More information about the debian-science-commits
mailing list