Back-Cover Text and --version updates

Back-Cover Text and --version updates

[Daniel Jacobowitz]

Two months ago, Karl sent out a reminder that the FSF had updated the
recommended --version output and the FDL Back-Cover Texts for GNU
manuals.  Could someone double-check these updates for me, please?

-- 
Daniel Jacobowitz
CodeSourcery

2007-09-02  Daniel Jacobowitz  <dan@codesourcery.com>

	* top.c (print_gdb_version): Update for GPL version 3.
	* doc/gdb.texinfo: Update the FSF's Back-Cover Text.

Index: top.c
===================================================================
RCS file: /cvs/src/src/gdb/top.c,v
retrieving revision 1.123
diff -u -p -r1.123 top.c
--- top.c	23 Aug 2007 18:08:46 -0000	1.123
+++ top.c	2 Sep 2007 14:04:31 -0000
@@ -1155,10 +1155,10 @@ print_gdb_version (struct ui_file *strea
      there is no warranty. */
 
   fprintf_filtered (stream, "\
-GDB is free software, covered by the GNU General Public License, and you are\n\
-welcome to change it and/or distribute copies of it under certain conditions.\n\
-Type \"show copying\" to see the conditions.\n\
-There is absolutely no warranty for GDB.  Type \"show warranty\" for details.\n");
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
+This is free software: you are free to change and redistribute it.\n\
+There is NO WARRANTY, to the extent permitted by law.  Type \"show copying\"
+and \"show warranty\" for details.\n");
 
   /* After the required info we print the configuration information. */
 
Index: doc/gdb.texinfo
===================================================================
RCS file: /cvs/src/src/gdb/doc/gdb.texinfo,v
retrieving revision 1.426
diff -u -p -r1.426 gdb.texinfo
--- doc/gdb.texinfo	1 Sep 2007 10:28:25 -0000	1.426
+++ doc/gdb.texinfo	2 Sep 2007 14:07:01 -0000
@@ -62,10 +62,9 @@ Invariant Sections being ``Free Software
 Free Documentation'', with the Front-Cover Texts being ``A GNU Manual,''
 and with the Back-Cover Texts as in (a) below.
 
-(a) The Free Software Foundation's Back-Cover Text is: ``You have
-freedom to copy and modify this GNU Manual, like GNU software.  Copies
-published by the Free Software Foundation raise funds for GNU
-development.''
+(a) The FSF's Back-Cover Text is: ``You are free to copy and modify
+this GNU Manual.  Buying copies from GNU Press supports the FSF in
+developing GNU and promoting software freedom.''
 @end ifinfo
 
 @titlepage
@@ -100,10 +99,9 @@ Invariant Sections being ``Free Software
 Free Documentation'', with the Front-Cover Texts being ``A GNU Manual,''
 and with the Back-Cover Texts as in (a) below.
 
-(a) The Free Software Foundation's Back-Cover Text is: ``You have
-freedom to copy and modify this GNU Manual, like GNU software.  Copies
-published by the Free Software Foundation raise funds for GNU
-development.''
+(a) The FSF's Back-Cover Text is: ``You are free to copy and modify
+this GNU Manual.  Buying copies from GNU Press supports the FSF in
+developing GNU and promoting software freedom.''
 @page
 This edition of the GDB manual is dedicated to the memory of Fred
 Fish.  Fred was a long-standing contributor to GDB and to Free

Re: Back-Cover Text and --version updates

[Eli Zaretskii]

> Date: Sun, 2 Sep 2007 10:08:55 -0400
> From: Daniel Jacobowitz <drow@false.org>
> 
> Two months ago, Karl sent out a reminder that the FSF had updated the
> recommended --version output and the FDL Back-Cover Texts for GNU
> manuals.  Could someone double-check these updates for me, please?

Looks okay, thanks.

Re: Back-Cover Text and --version updates

[Daniel Jacobowitz]

On Sun, Sep 02, 2007 at 10:44:11PM +0300, Eli Zaretskii wrote:
> > Date: Sun, 2 Sep 2007 10:08:55 -0400
> > From: Daniel Jacobowitz <drow@false.org>
> > 
> > Two months ago, Karl sent out a reminder that the FSF had updated the
> > recommended --version output and the FDL Back-Cover Texts for GNU
> > manuals.  Could someone double-check these updates for me, please?
> 
> Looks okay, thanks.

Thanks for the review.  I've checked it in now.

-- 
Daniel Jacobowitz
CodeSourcery

Re: Back-Cover Text and --version updates

[Jan Kratochvil]

[-- Attachment #1: Type: text/plain, Size: 1259 bytes --]

On Sun, 02 Sep 2007 22:02:16 +0200, Daniel Jacobowitz wrote:
...
> Thanks for the review.  I've checked it in now.

gcc-4.1.2-17.x86_64
gcc -c -m64 -ggdb2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4    -I. -I.././gdb -I.././gdb/config -DLOCALEDIR="\"/usr/local/share/locale\"" -DHAVE_CONFIG_H -I.././gdb/../include/opcode -I.././gdb/../readline/.. -I../bfd -I.././gdb/../bfd -I.././gdb/../include   -DMI_OUT=1 -DTUI=1  -Wall -Wdeclaration-after-statement -Wpointer-arith -Wformat-nonliteral -Wno-pointer-sign -Wno-unused -Wno-switch -Wno-char-subscripts -Werror top.c
top.c: In function ‘print_gdb_version’:
top.c:1157: error: missing terminating " character
top.c:1161: error: stray ‘\’ in program
top.c:1161: error: ‘and’ undeclared (first use in this function)
top.c:1161: error: (Each undeclared identifier is reported only once
top.c:1161: error: for each function it appears in.)
top.c:1161: error: expected ‘)’ before string constant
cc1: warnings being treated as errors
top.c:1161: warning: format not a string literal and no format arguments
make[2]: *** [top.o] Error 1


I expect I do not have to ask for such commit approval.


Regards,
Jan

[-- Attachment #2: gdb-eol.patch --]
[-- Type: text/plain, Size: 734 bytes --]

2007-09-02  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* top.c (print_gdb_version): Fixed an end-of-line compiler error.

--- gdb/top.c	2 Sep 2007 20:02:12 -0000	1.124
+++ gdb/top.c	2 Sep 2007 20:55:35 -0000
@@ -1157,7 +1157,7 @@ print_gdb_version (struct ui_file *strea
   fprintf_filtered (stream, "\
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
-There is NO WARRANTY, to the extent permitted by law.  Type \"show copying\"
+There is NO WARRANTY, to the extent permitted by law.  Type \"show copying\"\n\
 and \"show warranty\" for details.\n");
 
   /* After the required info we print the configuration information. */

Re: Back-Cover Text and --version updates

[Daniel Jacobowitz]

On Sun, Sep 02, 2007 at 10:58:55PM +0200, Jan Kratochvil wrote:
> 2007-09-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
> 
> 	* top.c (print_gdb_version): Fixed an end-of-line compiler error.

Sigh.  Thank you for fixing this.

-- 
Daniel Jacobowitz
CodeSourcery

[testsuite patch approval?] Re: Back-Cover Text and --version updates

[Jan Kratochvil]

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

On Sun, 02 Sep 2007 22:02:16 +0200, Daniel Jacobowitz wrote:
...
> Thanks for the review.  I've checked it in now.

Testsuite also needs an update.

Patch approval requested; some more inexact patterns may be the better way.


Regards,
Jan

[-- Attachment #2: gdb-version-testsuite-update.patch --]
[-- Type: text/plain, Size: 3716 bytes --]

2007-09-03  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* gdb.base/default.exp (show version): Update the version text.
	* gdb.gdb/selftest.exp (xgdb is at prompt): Likewise.

--- gdb/testsuite/gdb.base/default.exp	23 Aug 2007 20:36:15 -0000	1.24
+++ gdb/testsuite/gdb.base/default.exp	3 Sep 2007 09:23:20 -0000
@@ -665,7 +665,7 @@ gdb_test "show values" "" "show values"
 #test show verbose
 gdb_test "show verbose" "Verbose printing of informational messages is o.*|Verbosity is off.*" "show verbose"
 #test show version
-gdb_test "show version" "GNU gdb \[0-9\.\]*(\[^\r\n\]*\[\r\n\])+Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc(\[^\r\n\]*\[\r\n\])+GDB is free software, covered by the GNU General Public License, and you are(\[^\r\n\]*\[\r\n\])+welcome to change it and/or distribute copies of it under certain conditions(\[^\r\n\]*\[\r\n\])+Type \"show copying\" to see the conditions(\[^\r\n\]*\[\r\n\])+There is absolutely no warranty for GDB.  Type \"show warranty\" for details(\[^\r\n\]*\[\r\n\])+This GDB was configured as .*|GDB is free software and you are welcome to distribute copies of it(\[^\r\n\]*\[\r\n\])+ under certain conditions; type \"show copying\" to see the conditions.(\[^\r\n\]*\[\r\n\])+There is absolutely no warranty for GDB; type \"show warranty\" for details.(\[^\r\n\]*\[\r\n\])+GDB.*Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc.*" "show version"
+gdb_test "show version" "GNU gdb \[0-9\.\]*(\[^\r\n\]*\[\r\n\])+Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc(\[^\r\n\]*\[\r\n\])+License GPLv3\\+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>(\[^\r\n\]*\[\r\n\])+This is free software: you are free to change and redistribute it.(\[^\r\n\]*\[\r\n\])+There is NO WARRANTY, to the extent permitted by law.  Type \"show copying\"(\[^\r\n\]*\[\r\n\])+and \"show warranty\" for details..*" "show version" 
 #test show width
 gdb_test "show width" "Number of characters gdb thinks are in a line is.*" "show width"
 #test show write
--- gdb/testsuite/gdb.gdb/selftest.exp	23 Aug 2007 18:14:18 -0000	1.13
+++ gdb/testsuite/gdb.gdb/selftest.exp	3 Sep 2007 09:23:20 -0000
@@ -411,17 +411,25 @@ proc test_with_self { executable } {
     gdb_expect {
 	-re "GNU gdb \[0-9\.\]*.*
 Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc.*
+License GPLv3\\+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.*
+This is free software: you are free to change and redistribute it.*
+There is NO WARRANTY, to the extent permitted by law.  Type \"show copying\".*
+and \"show warranty\" for details.*
+This GDB was configured as .*$gdb_prompt $"\
+	    { pass "xgdb is at prompt" }
+	-re "GNU gdb \[0-9\.\]*.*
+Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc.*
 GDB is free software, covered by the GNU General Public License, and you are.*
 welcome to change it and/or distribute copies of it under certain conditions.*
 Type \"show copying\" to see the conditions.*
 There is absolutely no warranty for GDB.  Type \"show warranty\" for details.*
 This GDB was configured as .*$gdb_prompt $"\
-	    { pass "xgdb is at prompt" }
+	    { pass "xgdb is at prompt (obsolescent gdb 2)" }
 	-re "GDB is free software and you are welcome to distribute copies of it.*
  under certain conditions; type \"show copying\" to see the conditions..*
 There is absolutely no warranty for GDB; type \"show warranty\" for details..*
 GDB.*Copyright \[0-9\]+ Free Software Foundation, Inc..*$gdb_prompt $"\
-	    { pass "xgdb is at prompt (obsolescent gdb)" }
+	    { pass "xgdb is at prompt (obsolescent gdb 1)" }
 	-re ".*$gdb_prompt $"       { fail "xgdb is at prompt" }
 	timeout	            { fail "(timeout) xgdb is at prompt" }
     }

Re: [testsuite patch approval?] Re: Back-Cover Text and --version updates

[Daniel Jacobowitz]

On Mon, Sep 03, 2007 at 11:28:46AM +0200, Jan Kratochvil wrote:
> On Sun, 02 Sep 2007 22:02:16 +0200, Daniel Jacobowitz wrote:
> ...
> > Thanks for the review.  I've checked it in now.
> 
> Testsuite also needs an update.

Yeah, sorry.  I really messed this up.  I realized on my way to bed
last night that there was probably a test for this.

> 2007-09-03  Jan Kratochvil  <jan.kratochvil@redhat.com>
> 
> 	* gdb.base/default.exp (show version): Update the version text.
> 	* gdb.gdb/selftest.exp (xgdb is at prompt): Likewise.

OK.

-- 
Daniel Jacobowitz
CodeSourcery