From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bruno Haible Newsgroups: gmane.comp.lib.gnulib.bugs,gmane.emacs.devel Subject: Re: Confusing license statements in some Gnulib imports Date: Wed, 9 Feb 2011 12:22:48 +0100 Message-ID: <201102091222.49662.bruno@clisp.org> References: <4D522B7E.9000607@cs.ucla.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1297250614 1292 80.91.229.12 (9 Feb 2011 11:23:34 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 9 Feb 2011 11:23:34 +0000 (UTC) Cc: Glenn Morris , Paul Eggert , emacs-devel@gnu.org To: bug-gnulib@gnu.org Original-X-From: bug-gnulib-bounces+gnu-bug-gnulib=m.gmane.org@gnu.org Wed Feb 09 12:23:29 2011 Return-path: Envelope-to: gnu-bug-gnulib@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Pn88q-0004JA-Hx for gnu-bug-gnulib@m.gmane.org; Wed, 09 Feb 2011 12:23:24 +0100 Original-Received: from localhost ([127.0.0.1]:50093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pn88p-0004dG-DJ for gnu-bug-gnulib@m.gmane.org; Wed, 09 Feb 2011 06:23:23 -0500 Original-Received: from [140.186.70.92] (port=37049 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pn88T-0004bJ-2R for bug-gnulib@gnu.org; Wed, 09 Feb 2011 06:23:02 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pn88R-00086A-GO for bug-gnulib@gnu.org; Wed, 09 Feb 2011 06:23:00 -0500 Original-Received: from mo-p00-ob.rzone.de ([81.169.146.162]:12124) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pn88Q-00085w-S9; Wed, 09 Feb 2011 06:22:59 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; t=1297250576; l=3453; s=domk; d=haible.de; h=Content-Transfer-Encoding:Content-Type:MIME-Version:In-Reply-To: References:Cc:Date:Subject:To:From:X-RZG-CLASS-ID:X-RZG-AUTH; bh=yl68SD+xYLXjGIvQA7Lq81F+vqo=; b=Y/RB3TNQSu8vKMlX2N2KrEYu8N56sLaDCAHjPH8me5tYgO4JuZhE3XKrcuHF7CCU1J8 SpGQNhN6XqU8hAiXh55zjzFIncrmiWf/AaSP7O8WBxWS7Cvzlb6eiufWG7aeAzo9xOln2 K94RyTRD2N7fVNXepYPc66Og8nV80KfdxHQ= X-RZG-AUTH: :Ln4Re0+Ic/6oZXR1YgKryK8brksyK8dozXDwHXjf9hj/zDNRbfA44+iwyQ== X-RZG-CLASS-ID: mo00 Original-Received: from linuix.haible.de (dslb-088-068-046-137.pools.arcor-ip.net [88.68.46.137]) by post.strato.de (klopstock mo51) (RZmta 25.2) with ESMTPA id a002c2n19A4pvI ; Wed, 9 Feb 2011 12:22:50 +0100 (MET) User-Agent: KMail/1.9.9 In-Reply-To: <4D522B7E.9000607@cs.ucla.edu> Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 81.169.146.162 X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnulib-bounces+gnu-bug-gnulib=m.gmane.org@gnu.org Errors-To: bug-gnulib-bounces+gnu-bug-gnulib=m.gmane.org@gnu.org Xref: news.gmane.org gmane.comp.lib.gnulib.bugs:25271 gmane.emacs.devel:135791 Archived-At: Hi Paul, > gnulib-tool isn't smart enough (and arguably should > not be smart enough) to rewrite license names that cross line boundaries. > For example, arg-nonnull.h's original source says this: > > MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > Lesser General Public License for more details. > > and the newline between the "GNU" and the "Lesser" causes gnulib-tool > to miss that instance of "GNU Lesser General Public License". Thanks for the diagnose. But I disagree about the cure: It's better to teach gnulib-tool to work regardless of where in the sentence the line break occurs. - The words "GNU Lesser General Public License" appear inside a longer sentence, and this sentence has to be broken into lines. People will always disagree whether line breaking has to happen at column 72, 74, 79, or 80. And there's an indentation of 3 columns in some files but only 2 columns in others. So, it is pretty hopeless to attempt to standardize where people will put line breaks in the copyright notice. - As a general rule, when one attempts to modify 640 files, one should think twice about it. Here's a proposed fix in gnulib-tool instead. Just as effective. 2011-02-09 Bruno Haible gnulib-tool: Make copyright notice adjustment more robust. * gnulib-tool (func_import): In sed_transform_main_lib_file, sed_transform_build_aux_file, sed_transform_testsrelated_lib_file, allow a line break to occur after "GNU" in "GNU [Lesser] General Public License". Reported by Glenn Morris via Paul Eggert. --- gnulib-tool.orig Wed Feb 9 12:00:22 2011 +++ gnulib-tool Wed Feb 9 11:58:30 2011 @@ -3855,11 +3855,16 @@ yes | 3) sed_transform_main_lib_file=$sed_transform_main_lib_file' s/GNU General/GNU Lesser General/g + s/General Public License/Lesser General Public License/g + s/Lesser Lesser General Public License/Lesser General Public License/g ' ;; 2) sed_transform_main_lib_file=$sed_transform_main_lib_file' s/GNU General/GNU Lesser General/g + s/General Public License/Lesser General Public License/g + s/Lesser Lesser General Public License/Lesser General Public License/g + s/version [23]\([ ,]\)/version 2.1\1/g ' ;; @@ -3869,7 +3874,11 @@ # Update license. sed_transform_main_lib_file=$sed_transform_main_lib_file' s/GNU Lesser General/GNU General/g + s/Lesser General Public License/General Public License/g + s/GNU Library General/GNU General/g + s/Library General Public License/General Public License/g + s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g ' fi @@ -3881,7 +3890,11 @@ # Update license. sed_transform_build_aux_file=$sed_transform_build_aux_file' s/GNU Lesser General/GNU General/g + s/Lesser General Public License/General Public License/g + s/GNU Library General/GNU General/g + s/Library General Public License/General Public License/g + s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g ' fi @@ -3892,7 +3905,11 @@ # Update license. sed_transform_testsrelated_lib_file=$sed_transform_testsrelated_lib_file' s/GNU Lesser General/GNU General/g + s/Lesser General Public License/General Public License/g + s/GNU Library General/GNU General/g + s/Library General Public License/General Public License/g + s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g ' fi -- In memoriam Rowland Taylor