Re: Update some sim copyright headers to GPLv3-or-later

Joel Brobecker
2012-12-20T05:03:47Z

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

> what i mean is worrying about the flow of code. if they aren't both
> GPLv2 based, i now have to worry about people being able to make the
> claim that i'm committing GPLv3 sim code to the GPLv2 kernel and
> tainting it. considering the code in question, doing GPLv3 on it will
> gain nothing.

I have relayed the above to the FSF.

> > I don't understand exactly the status of this file. Can I just
> > regenerate the "reverted" version and the project will still work?
>
> next time someone runs `aclocal` (like me), it'll blow away your
> changes as it copies m4 macros from files in /usr/share/ and into the
> aclocal.m4.

I ran aclocal myself, and it blew away more than just my change,
but the entire block of code. Does it mean that only you are able
to regenerate this file properly?

Attached is what I applied to revert this part of patch.

--
Joel

[-- Attachment #2: 0001-Revert-GPL-version-change-in-sim-bfin-aclocal.m4.patch --]
[-- Type: text/x-diff, Size: 1596 bytes --]

From f17797f9f4115cef8c2c4142a209a777e9962175 Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@adacore.com>
Date: Thu, 20 Dec 2012 09:00:36 +0400
Subject: [PATCH] Revert GPL version change in sim/bfin/aclocal.m4

sim/bfin/ChangeLog:

* aclocal.m4: Revert the previous change changing
the license from GPL v2 or later to GPL v3 or later
(this file was generated).
---
sim/bfin/ChangeLog | 6 ++++++
sim/bfin/aclocal.m4 | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 4c37829..5026a60 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,5 +1,11 @@
2012-12-20 Joel Brobecker <brobecker@adacore.com>

+ * aclocal.m4: Revert the previous change changing
+ the license from GPL v2 or later to GPL v3 or later
+ (this file was generated).
+
+2012-12-20 Joel Brobecker <brobecker@adacore.com>
+
* linux-fixed-code.s: Revert the previous change changing
the license from GPL v2 or later to GPL v3 or later.

diff --git a/sim/bfin/aclocal.m4 b/sim/bfin/aclocal.m4
index 1e0db3b..1b2d293 100644
--- a/sim/bfin/aclocal.m4
+++ b/sim/bfin/aclocal.m4
@@ -19,7 +19,7 @@
#
# This program 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 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
--
1.7.10.4