From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19783 invoked by alias); 19 Aug 2007 08:07:16 -0000 Received: (qmail 19313 invoked by uid 22791); 19 Aug 2007 08:07:15 -0000 X-Spam-Check-By: sourceware.org Received: from ns2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.31) with ESMTP; Sun, 19 Aug 2007 08:07:12 +0000 Received: from Relay2.suse.de (mail2.suse.de [195.135.221.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 99356220BA; Sun, 19 Aug 2007 10:07:09 +0200 (CEST) From: Andreas Schwab To: Joel Brobecker Cc: gdb-patches@sourceware.org Subject: Re: GPLv3: copying.awk needs to be adjusted References: <20070818024200.GD24165@adacore.com> <20070819045854.GA4437@adacore.com> X-Yow: Put FIVE DOZEN red GIRDLES in each CIRCULAR OPENING!! Date: Sun, 19 Aug 2007 08:07:00 -0000 In-Reply-To: <20070819045854.GA4437@adacore.com> (Joel Brobecker's message of "Sun\, 19 Aug 2007 00\:58\:54 -0400") Message-ID: User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2007-08/txt/msg00382.txt.bz2 Joel Brobecker writes: >> I have just replaced "NO WARRANTY" by "15\. Disclaimer of Warranty\." >> everywhere in the script, and the result looks perfect. > > Mama mia, no comprendo - I tried exactly the same thing, and somehow > it didn't work. Would you mind posting a patch for us? Index: Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/Makefile.in,v retrieving revision 1.928 diff -u -a -p -r1.928 Makefile.in --- Makefile.in 10 Aug 2007 17:52:09 -0000 1.928 +++ Makefile.in 19 Aug 2007 08:04:02 -0000 @@ -1386,9 +1386,9 @@ doc/gdb.info: # Make copying.c from COPYING $(srcdir)/copying.c: @MAINTAINER_MODE_TRUE@ \ - $(srcdir)/COPYING $(srcdir)/copying.awk + $(srcdir)/COPYING3 $(srcdir)/copying.awk awk -f $(srcdir)/copying.awk \ - < $(srcdir)/COPYING > $(srcdir)/copying.tmp + < $(srcdir)/COPYING3 > $(srcdir)/copying.tmp mv $(srcdir)/copying.tmp $(srcdir)/copying.c version.c: Makefile version.in Index: copying.awk =================================================================== RCS file: /cvs/src/src/gdb/copying.awk,v retrieving revision 1.2 diff -u -a -p -r1.2 copying.awk --- copying.awk 27 Jun 2000 06:45:43 -0000 1.2 +++ copying.awk 19 Aug 2007 08:04:02 -0000 @@ -21,12 +21,12 @@ BEGIN { print "{"; print " immediate_quit++;"; } -NR == 1,/^[ ]*NO WARRANTY[ ]*$/ { +NR == 1,/^[ ]*15\. Disclaimer of Warranty\.[ ]*$/ { if ($0 ~ / /) { printf " printf_filtered (\"\\n\");\n"; } - else if ($0 !~ /^[ ]*NO WARRANTY[ ]*$/) + else if ($0 !~ /^[ ]*15\. Disclaimer of Warranty\.[ ]*$/) { printf " printf_filtered (\""; for (i = 1; i < NF; i++) @@ -34,7 +34,7 @@ NR == 1,/^[ ]*NO WARRANTY[ ]*$/ { printf "%s\\n\");\n", $NF; } } -/^[ ]*NO WARRANTY[ ]*$/ { +/^[ ]*15\. Disclaimer of Warranty\.[ ]*$/ { print " immediate_quit--;"; print "}"; print ""; @@ -45,7 +45,7 @@ NR == 1,/^[ ]*NO WARRANTY[ ]*$/ { print "{"; print " immediate_quit++;"; } -/^[ ]*NO WARRANTY[ ]*$/, /^[ ]*END OF TERMS AND CONDITIONS[ ]*$/{ +/^[ ]*15\. Disclaimer of Warranty\.[ ]*$/, /^[ ]*END OF TERMS AND CONDITIONS[ ]*$/{ if (! ($0 ~ /^[ ]*END OF TERMS AND CONDITIONS[ ]*$/)) { printf " printf_filtered (\""; Andreas. -- Andreas Schwab, SuSE Labs, schwab@suse.de SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."