Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-visualization/gnuplot/files: gnuplot-gentoo-version.patch
Date: Tue, 31 Mar 2009 22:28:24
Message-Id: E1LomRS-0007Yn-4U@stork.gentoo.org
1 ulm 09/03/31 22:28:22
2
3 Added: gnuplot-gentoo-version.patch
4 Log:
5 Version bump. Add support for PGF/TikZ terminal with USE=lua, bug 233475. Other minor changes.
6 (Portage version: 2.2_rc27/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 sci-visualization/gnuplot/files/gnuplot-gentoo-version.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/files/gnuplot-gentoo-version.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/files/gnuplot-gentoo-version.patch?rev=1.1&content-type=text/plain
13
14 Index: gnuplot-gentoo-version.patch
15 ===================================================================
16 Add special version identification and Gentoo contact information,
17 in order to fulfil provisions 2 through 4 of the gnuplot licence.
18
19 --- gnuplot-orig/src/plot.c
20 +++ gnuplot/src/plot.c
21 @@ -383,9 +383,11 @@
22 " -V, --version\n"
23 " -h, --help\n"
24 " -e \"command1; command2; ...\"\n"
25 - "gnuplot %s patchlevel %s\n"
26 - "Report bugs to %s\n",
27 - gnuplot_version, gnuplot_patchlevel, bug_email);
28 + "gnuplot %s patchlevel %s (Gentoo revision %s)\n"
29 + "Report bugs to <%s>\n"
30 + "or to <%s>\n",
31 + gnuplot_version, gnuplot_patchlevel, gentoo_revision,
32 + gentoo_bugtracker, bug_email);
33 return 0;
34 }
35 }
36 --- gnuplot-orig/src/show.c
37 +++ gnuplot/src/show.c
38 @@ -1052,7 +1052,7 @@
39
40 fprintf(fp, "%s\n\
41 %s\t%s\n\
42 -%s\tVersion %s patchlevel %s\n\
43 +%s\tVersion %s patchlevel %s (Gentoo revision %s)\n\
44 %s\tlast modified %s\n\
45 %s\tSystem: %s %s\n\
46 %s\n\
47 @@ -1063,10 +1063,11 @@
48 %s\tThe gnuplot FAQ is available from %s\n\
49 %s\n\
50 %s\tSend bug reports and suggestions to <%s>\n\
51 +%s\tor to <%s>\n\
52 %s\n",
53 p, /* empty line */
54 p, PROGRAM,
55 - p, gnuplot_version, gnuplot_patchlevel,
56 + p, gnuplot_version, gnuplot_patchlevel, gentoo_revision,
57 p, gnuplot_date,
58 p, os_name, os_rel,
59 p, /* empty line */
60 @@ -1076,6 +1077,7 @@
61 p, /* Type `help` */
62 p, faq_location,
63 p, /* empty line */
64 + p, gentoo_bugtracker,
65 p, bug_email,
66 p); /* empty line */
67
68 --- gnuplot-orig/src/version.c
69 +++ gnuplot/src/version.c
70 @@ -46,6 +46,9 @@
71
72 const char faq_location[] = FAQ_LOCATION;
73
74 +const char gentoo_revision[] = GENTOO_REVISION;
75 +const char gentoo_bugtracker[] = "http://bugs.gentoo.org/";
76 +
77 char *compile_options = (void *)0; /* Will be loaded at runtime */
78
79 #define RELEASE_VERSION 1
80 --- gnuplot-orig/src/version.h
81 +++ gnuplot/src/version.h
82 @@ -47,6 +47,9 @@
83 extern const char bug_email[];
84 extern const char help_email[];
85
86 +extern const char gentoo_revision[];
87 +extern const char gentoo_bugtracker[];
88 +
89 extern char os_name[];
90 extern char os_rel[];