1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
Add special version identification and Gentoo contact information,
in order to fulfil provisions 2 through 4 of the gnuplot licence.
diff -Naur gnuplot-4.4.0-rc1.orig/docs/gnuplot.doc gnuplot-4.4.0-rc1/docs/gnuplot.doc
--- gnuplot-4.4.0-rc1.orig/docs/gnuplot.doc 2009-12-13 14:16:41.000000000 +0100
+++ gnuplot-4.4.0-rc1/docs/gnuplot.doc 2009-12-13 14:31:57.000000000 +0100
@@ -204,6 +204,8 @@
Bug reports and code contributions should be uploaded to the trackers at
http://sourceforge.net/projects/gnuplot/support
+ and
+ http://bugs.gentoo.org/
Please check previous bug reports if the bug you want to report has not been
already fixed in a newer version of gnuplot.
diff -Naur gnuplot-4.4.0-rc1.orig/docs/gnuplot.texi gnuplot-4.4.0-rc1/docs/gnuplot.texi
--- gnuplot-4.4.0-rc1.orig/docs/gnuplot.texi 2009-12-13 14:16:41.000000000 +0100
+++ gnuplot-4.4.0-rc1/docs/gnuplot.texi 2009-12-13 14:31:57.000000000 +0100
@@ -319,6 +319,11 @@
@example
gnuplot --help
@end example
+and
+@example
+ http://bugs.gentoo.org/
+
+@end example
See `command line options` for more details.
diff -Naur gnuplot-4.4.0-rc1.orig/src/plot.c gnuplot-4.4.0-rc1/src/plot.c
--- gnuplot-4.4.0-rc1.orig/src/plot.c 2009-12-13 14:16:41.000000000 +0100
+++ gnuplot-4.4.0-rc1/src/plot.c 2009-12-13 14:34:38.000000000 +0100
@@ -374,9 +374,11 @@
" -h, --help\n"
" -p --persist\n"
" -e \"command1; command2; ...\"\n"
- "gnuplot %s patchlevel %s\n"
- "Report bugs to %s\n",
- gnuplot_version, gnuplot_patchlevel, bug_report);
+ "gnuplot %s patchlevel %s (Gentoo revision %s)\n"
+ "Report bugs to <%s>\n"
+ "or to <%s>\n",
+ gnuplot_version, gnuplot_patchlevel, gentoo_revision,
+ gentoo_bugtracker, bug_email);
return 0;
} else if (!strncmp(argv[i], "-persist", 2) || !strcmp(argv[i], "--persist")) {
diff -Naur gnuplot-4.4.0-rc1.orig/src/show.c gnuplot-4.4.0-rc1/src/show.c
--- gnuplot-4.4.0-rc1.orig/src/show.c 2009-12-13 14:16:41.000000000 +0100
+++ gnuplot-4.4.0-rc1/src/show.c 2009-12-13 14:31:57.000000000 +0100
@@ -1017,7 +1017,7 @@
strcpy(fmt, "\
%s\n\
%s\t%s\n\
-%s\tVersion %s patchlevel %s\n\
+%s\tVersion %s patchlevel %s (Gentoo revision %s)\n\
%s\tlast modified %s\n\
%s\tSystem: %s %s\n\
%s\n\
@@ -1038,7 +1038,7 @@
fprintf(fp, fmt,
p, /* empty line */
p, PROGRAM,
- p, gnuplot_version, gnuplot_patchlevel,
+ p, gnuplot_version, gnuplot_patchlevel, gentoo_revision,
p, gnuplot_date,
p, os_name, os_rel,
p, /* empty line */
diff -Naur gnuplot-4.4.0-rc1.orig/src/version.c gnuplot-4.4.0-rc1/src/version.c
--- gnuplot-4.4.0-rc1.orig/src/version.c 2009-12-13 14:16:41.000000000 +0100
+++ gnuplot-4.4.0-rc1/src/version.c 2009-12-13 14:31:57.000000000 +0100
@@ -44,6 +44,9 @@
const char gnuplot_date[] = "Sat Nov 28 14:34:01 PST 2009";
const char gnuplot_copyright[] = "Copyright (C) 1986-1993, 1998, 2004, 2007-2009";
+const char gentoo_revision[] = GENTOO_REVISION;
+const char gentoo_bugtracker[] = "http://bugs.gentoo.org/";
+
char *compile_options = (void *)0; /* Will be loaded at runtime */
# ifndef FAQ_LOCATION
diff -Naur gnuplot-4.4.0-rc1.orig/src/version.h gnuplot-4.4.0-rc1/src/version.h
--- gnuplot-4.4.0-rc1.orig/src/version.h 2009-12-13 14:16:41.000000000 +0100
+++ gnuplot-4.4.0-rc1/src/version.h 2009-12-13 14:31:57.000000000 +0100
@@ -48,6 +48,9 @@
extern const char bug_email[];
extern const char help_email[];
+extern const char gentoo_revision[];
+extern const char gentoo_bugtracker[];
+
extern char os_name[];
extern char os_rel[];
|