Re: 312-gary-add-license-url.diff
Hallo Ralf,
On 27 Feb 2007, at 23:48, Ralf Wildenhues wrote:
/^# '$PROGRAM' (GNU /,/# warranty; / {
s/^# //
s/^# *//
What's the first of these two lines good for?
# clcommit (GNU cvs-utils) version 1.0
# Written by Gary V. Vaughan <[EMAIL PROTECTED]>
# and Alexandre Oliva <[EMAIL PROTECTED]>
#
# Copyright (C) 1999, 2000, 2004, 2005, 2006 Free Software
Foundation, Inc.
With the first line in place, the relative indentation of 'and
Alexandre Oliva'
is left intact. I'll add something like this to the test case I'm
writing.
Cheers,
Gary
--
())_. Email me: [EMAIL PROTECTED]
( '/ Read my blog: http://blog.azazil.net
/ )= ...and my book: http://sources.redhat.com/autobook
`(_~)_ Join my AGLOCO Network: http://www.agloco.com/r/BBBS7912
PGP.sig
Description: This is a digitally signed message part
Re: 312-gary-add-license-url.diff
On 27 Feb 2007, at 23:48, Ralf Wildenhues wrote:
* Gary V. Vaughan wrote on Wed, Feb 28, 2007 at 12:01:47AM CET:
Note: adjust libltdl/config/getopt.m4sh:func_version() to compensate
# func_version
# Echo version message to standard output and exit.
func_version ()
{[
For getopt.m4sh, you could extend the M4 double-quoting to the range
starting right after `m4_include([general.m4sh])' and ending at the
end
of the file, so that it really is maximally quoted. Like so:
m4_include([general.m4sh])[
func_version ()
{
...
}
...
exit_cmd=:]
Oh I see what you mean now. Okay, I'll do that.
$SED -n ': a
There must be no space between ":" and the label name.
Thanks. I manually merged func_version in cvs_utils with libtool's
copy... badly :-/
/[1-9][0-9]*[,-]$/N; s/[1-9][0-9]*[,-]\n# *//; t a
[[snip]]]
In order to ensure future that versions of func_version cooperate with
future variants of copyright headers, you may want to write a test.
Okay, I'll submit a func_version patch with test before applying all
the license text changes.
Cheers,
Gary
--
())_. Email me: [EMAIL PROTECTED]
( '/ Read my blog: http://blog.azazil.net
/ )= ...and my book: http://sources.redhat.com/autobook
`(_~)_ Join my AGLOCO Network: http://www.agloco.com/r/BBBS7912
PGP.sig
Description: This is a digitally signed message part
Re: 312-gary-add-license-url.diff
* Ralf Wildenhues wrote on Wed, Feb 28, 2007 at 08:48:00AM CET: > > > /^# This file is part of/,/./d > > the I suggest you make a patch to only do that. Consider the one-line > patch approved. Erm, no. The end of the range is wrong if the following otherwise empty line starts with a hash mark.
Re: 312-gary-add-license-url.diff
* Gary V. Vaughan wrote on Wed, Feb 28, 2007 at 12:01:47AM CET:
> Note: adjust libltdl/config/getopt.m4sh:func_version() to compensate
>
>
> # func_version
> # Echo version message to standard output and exit.
> func_version ()
> {[
For getopt.m4sh, you could extend the M4 double-quoting to the range
starting right after `m4_include([general.m4sh])' and ending at the end
of the file, so that it really is maximally quoted. Like so:
m4_include([general.m4sh])[
func_version ()
{
...
}
...
exit_cmd=:]
> $SED -n ': a
There must be no space between ":" and the label name.
> /[1-9][0-9]*[,-]$/N; s/[1-9][0-9]*[,-]\n# *//; t a
Where did the leniency towards trailing spaces from
go? I already approved the patch in that message. If the only
suggested change now is to add this line:
> /^# This file is part of/,/./d
the I suggest you make a patch to only do that. Consider the one-line
patch approved.
> /^# '$PROGRAM' (GNU /,/# warranty; / {
> s/^# //
> s/^# *//
What's the first of these two lines good for?
> s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
> p
> }' < "$progpath"
> exit $?
> ]}
In order to ensure future that versions of func_version cooperate with
future variants of copyright headers, you may want to write a test.
Cheers,
Ralf
Re: 312-gary-add-license-url.diff
On 26 Feb 2007, at 06:30, Eric Blake wrote: Any reason you didn't touch the copyright in all files? Worse, some of the files I touched were LGPL and needed a different url. Carefully auditing all of libtools files, we actually use seven different licenses. Before I dig in and edit all 200-odd files, here's a list of proposed text for all variants along with the files I think belong to each. Please speak up if you think I've miscategorised any of them. Appropriate commenting (shell, C etc) and decoration (m4sh etc) assumed throughout. 1. Notice preservation == + libltdl/m4/*.m4 Copyright (C) Free Software Foundation, Inc. Written by , This file is part of GNU Libtool. This file is free software; the Free Software Foundation gives unlimited permission to copy and/or distribute it, with or without modifications, as long as this notice is preserved. 2. GPL == + HACKING + Makefile.am + Makefile.maint + README + README.alpha + THANKS + TODO + bootstrap + configure.ac + libltdl/config/mkstamp + tests/*demo/**/Makefile.am + tests/*demo/configure.ac + tests/*.at + tests/defs.m4sh + tests/*.test + tests/*demo/**/*.[ch] + tests/*demo/**/*.cpp Copyright (C) Free Software Foundation, Inc. Written by , This file is part of GNU Libtool. GNU Libtool is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. GNU Libtool is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Libtool; see the file COPYING. If not, a copy can be downloaded from http://www.gnu.org/copyleft/gpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 3. GPL with Libtool exception clause + libltdl/README Copyright (C) Free Software Foundation, Inc. Written by , This file is part of GNU Libtool. GNU Libtool is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. As a special exception to the GNU General Public License, if you distribute this file as part of a program or library that is built using GNU Libtool, you may include this file under the same distribution terms that you use for the rest of that program. GNU Libtool is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Libtool; see the file COPYING. If not, a copy can be downloaded from http://www.gnu.org/copyleft/gpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 4. GPL with Cvs-utils exception clause == + libltdl/config/general.m4sh + libltdl/config/getopt.m4sh Copyright (C) Free Software Foundation, Inc. Written by , This file is part of GNU Cvs-utils. GNU Cvs-utils is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at you option) any later version. As a special exception to the GNU General Public License, if you distribute this file as part of a program or library that contains a configuration script generated by Autoconf, you may include this file under the same distribution terms that you use for the rest of that program. GNU Cvs-utils is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Libtool; see the file COPYING. If not, a copy can be downloaded from http://www.gnu.org/copyleft/gpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 5. GPL with self extracting version === + clcommit.m4sh + libtoolize.m4sh + libltdl/config/mailnotify.m4sh (GNU @PACKAGE@) Written by . This file is part of . Copyright (C) Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO w
Re: 312-gary-add-license-url.diff
Hi Eric, On 26 Feb 2007, at 06:30, Eric Blake wrote: According to Gary V. Vaughan on 2/25/2007 11:26 PM: Okay to apply? Thunderbird refused to display your patch inline, since it had MIME type application/octet-stream instead of a text type. But I think you got this fixed in your later patch configurations, so I won't worry about it unless I see further patch posting issues. Sorry, I hadn't moved my commit scripts over to my MacBook yet. Any reason you didn't touch the copyright in all files? For example, configure.ac still states: # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301 USA Only because I suck :-p I was concentrating more on getting my commit scripts in place than the actual patches (which is probably how I managed to screw up even those simple changes!). On the other hand, looking carefully through the copyright text on each of our files shows that there are some discrepancies that need addressing too. Some files refer to the GPL and LGPL inconsistently for instance. I'll address them in a new patch shortly. Cheers, Gary -- ())_. Email me: [EMAIL PROTECTED] ( '/ Read my blog: http://blog.azazil.net / )= ...and my book: http://sources.redhat.com/autobook `(_~)_ Join my AGLOCO Network: http://www.agloco.com/r/BBBS7912 PGP.sig Description: This is a digitally signed message part
Re: 312-gary-add-license-url.diff
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 According to Gary V. Vaughan on 2/25/2007 11:26 PM: > Okay to apply? Thunderbird refused to display your patch inline, since it had MIME type application/octet-stream instead of a text type. But I think you got this fixed in your later patch configurations, so I won't worry about it unless I see further patch posting issues. Any reason you didn't touch the copyright in all files? For example, configure.ac still states: # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301 USA - -- Don't work too hard, make some time for fun as well! Eric Blake [EMAIL PROTECTED] -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (Cygwin) Comment: Public key at home.comcast.net/~ericblake/eblake.gpg Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFF4u7+84KuGfSFAYARAqY2AJwOp25GznzG356rDuQUt9bJAhqU7gCfRcKE bXeLsmlmKbIy6uVX0pfP8ts= =HJ6m -END PGP SIGNATURE-
Re: 312-gary-add-license-url.diff
Hallo Ralf, On 25 Feb 2007, at 23:55, Ralf Wildenhues wrote: * Gary V. Vaughan wrote on Mon, Feb 26, 2007 at 08:34:32AM CET: On 25 Feb 2007, at 23:29, Ralf Wildenhues wrote: * Gary V. Vaughan wrote on Mon, Feb 26, 2007 at 07:26:28AM CET: Okay to apply? Yes. Can you get your patch posting program to not show the ChangeLog entry as diff? Thanks. Sure. First I have to get my patch posting program to work again :-) Could you also note next time when you post a patch that you haven't tested? This patch broke bootstrap. Search for "Boston" in toplevel Makefile.am for how to fix it. D'oh, sorry. There was me thinking tidying comments would be harmless. :-( Cheers, Gary -- ())_. Email me: [EMAIL PROTECTED] ( '/ Read my blog: http://blog.azazil.net / )= ...and my book: http://sources.redhat.com/autobook `(_~)_ Join my AGLOCO Network: http://www.agloco.com/r/BBBS7912 PGP.sig Description: This is a digitally signed message part
Re: 312-gary-add-license-url.diff
* Gary V. Vaughan wrote on Mon, Feb 26, 2007 at 08:34:32AM CET: > On 25 Feb 2007, at 23:29, Ralf Wildenhues wrote: > >* Gary V. Vaughan wrote on Mon, Feb 26, 2007 at 07:26:28AM CET: > >>Okay to apply? > > > >Yes. Can you get your patch posting program to not show > >the ChangeLog entry as diff? Thanks. > > Sure. First I have to get my patch posting program to work again :-) Could you also note next time when you post a patch that you haven't tested? This patch broke bootstrap. Search for "Boston" in toplevel Makefile.am for how to fix it. Thanks, Ralf
Re: 312-gary-add-license-url.diff
Hallo Ralf, On 25 Feb 2007, at 23:29, Ralf Wildenhues wrote: * Gary V. Vaughan wrote on Mon, Feb 26, 2007 at 07:26:28AM CET: Okay to apply? Yes. Can you get your patch posting program to not show the ChangeLog entry as diff? Thanks. Sure. First I have to get my patch posting program to work again :-) Cheers, Gary -- ())_. Email me: [EMAIL PROTECTED] ( '/ Read my blog: http://blog.azazil.net / )= ...and my book: http://sources.redhat.com/autobook `(_~)_ Join my AGLOCO Network: http://www.agloco.com/r/BBBS7912 PGP.sig Description: This is a digitally signed message part
Re: 312-gary-add-license-url.diff
* Gary V. Vaughan wrote on Mon, Feb 26, 2007 at 07:26:28AM CET: > Okay to apply? Yes. Can you get your patch posting program to not show the ChangeLog entry as diff? Thanks. Cheers, Ralf
