Re: [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1949-gacde270

[Stefano Lattarini]

On 02/16/2012 03:56 PM, Peter Rosin wrote:
>
> *snip*
> 
>> commit 641a5a4bf09cdc07acf1539caa86f6197feb032e
>> Author: Stefano Lattarini <address@hidden>
>> Date:   Thu Feb 16 10:46:23 2012 +0100
>>
>>     maint: run "make update-copyright"
>>
> 
> *snip*
> 
>> diff --git a/COPYING b/COPYING
>> index d511905..a9a3ea0 100644
>> --- a/COPYING
>> +++ b/COPYING
>> @@ -1,7 +1,7 @@
>>                  GNU GENERAL PUBLIC LICENSE
>>                     Version 2, June 1991
>>  
>> - Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
>> + Copyright (C) 1989-2012 Free Software Foundation, Inc.,
>>   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>>   Everyone is permitted to copy and distribute verbatim copies
>>   of this license document, but changing it is not allowed.
> 
> Was this intentional?
>
Nope, shall revert.

> 
>> diff --git a/ChangeLog.00 b/ChangeLog.00
>> index 756107d..c50c4eb 100644
>> --- a/ChangeLog.00
>> +++ b/ChangeLog.00
>> @@ -2205,7 +2205,7 @@
>>  
>>  -----
>>  
>> -Copyright 1999, 2000 Free Software Foundation, Inc.
>> +Copyright 1999-2012 Free Software Foundation, Inc.
>>  
>>  Copying and distribution of this file, with or without modification, are
>>  permitted provided the copyright notice and this notice are preserved.
> 
> This?  The other old ChangeLogs?
>
Yes.

> *snip*
> 
>> diff --git a/lib/ar-lib b/lib/ar-lib
>> index c0286a4..c698ac5 100755
>> --- a/lib/ar-lib
>> +++ b/lib/ar-lib
>> @@ -4,7 +4,7 @@
>>  me=ar-lib
>>  scriptversion=2012-01-30.22; # UTC
>>  
>> -# Copyright (C) 2010, 2012 Free Software Foundation, Inc.
>> +# Copyright (C) 2010-2012 Free Software Foundation, Inc.
>>  # Written by Peter Rosin <address@hidden>.
>>  #
>>  # This program is free software; you can redistribute it and/or modify
> 
> NOOOOOOOO!
> 
> You have forked the scripts again!
>
Not really: this is just a cosmetic change in the comments, which should't
cause any merge conflict (unless you plan to modify the copyright line of
the 'msvc' version of this script in an incompatible way).

An anyway: I've started the cleanup and testing to finally release 1.12;
we might be there in a month or so.  At which point, the merging mess
between msvc, maint and branch-1.11 will go away.

Similar considerations hold for the 'depcomp' and 'compile' scripts.

> *snip*
> 
> These three scripts are the one I care the most about, and they should be
> modified on the msvc branch.  Other scripts should be modified on maint.
> That is, if we want them to be strictly better across all branches which
> I thought we agreed to...
>
Or better again, as you implicitly suggested in a past mail of yours:
let's speed up towards 1.12 and leave all this branching mess behind
us.

Regards,
  Stefano