client: Fix the mangled copyright statement

In addition relax it to GPLv2 or later to make linking against
newer versions of readline library possible.

11 files changed, 38 insertions, 24 deletions

diff --git a/client/commands.c b/client/commands.c
index 4cc3b2d0..78860137 100644
--- a/client/commands.c
+++ b/client/commands.c
@@ -3,8 +3,11 @@
  *  Connection Manager
  *
  *  Copyright (C) 2012  Intel Corporation. All rights reserved.
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *
+ *  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 2 of the License, or
+ *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/data_manager.c b/client/data_manager.c
index 13994c81..78e55b93 100644
--- a/client/data_manager.c
+++ b/client/data_manager.c
@@ -3,8 +3,11 @@
  *  Connection Manager
  *
  *  Copyright (C) 2012  Intel Corporation. All rights reserved.
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *
+ *  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 2 of the License, or
+ *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/data_manager.h b/client/data_manager.h
index dead9e0a..99365439 100644
--- a/client/data_manager.h
+++ b/client/data_manager.h
@@ -5,8 +5,9 @@
  *  Copyright (C) 2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  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.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/interactive.c b/client/interactive.c
index 3a15d160..764ce35a 100644
--- a/client/interactive.c
+++ b/client/interactive.c
@@ -5,8 +5,9 @@
  *  Copyright (C) 2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  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.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/interactive.h b/client/interactive.h
index 4a972c97..49349cb7 100644
--- a/client/interactive.h
+++ b/client/interactive.h
@@ -5,8 +5,9 @@
  *  Copyright (C) 2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  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.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/monitor.c b/client/monitor.c
index d2f88467..cda77aff 100644
--- a/client/monitor.c
+++ b/client/monitor.c
@@ -4,10 +4,10 @@
  *
  *  Copyright (C) 2012  Intel Corporation. All rights reserved.
  *
- *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  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.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/monitor.h b/client/monitor.h
index 12ccb909..fc215af6 100644
--- a/client/monitor.h
+++ b/client/monitor.h
@@ -4,10 +4,10 @@
  *
  *  Copyright (C) 2012  Intel Corporation. All rights reserved.
  *
- *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  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.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/services.c b/client/services.c
index ff2c7294..556b392c 100644
--- a/client/services.c
+++ b/client/services.c
@@ -5,8 +5,9 @@
  *  Copyright (C) 2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  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.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/services.h b/client/services.h
index 15805b4b..945b4f9e 100644
--- a/client/services.h
+++ b/client/services.h
@@ -5,8 +5,9 @@
  *  Copyright (C) 2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  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.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,6 +19,7 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
 #ifndef __CLIENT_SERVICES_H
 #define __CLIENT_SERVICES_H
 
diff --git a/client/technology.c b/client/technology.c
index 9c4678ef..f8545792 100644
--- a/client/technology.c
+++ b/client/technology.c
@@ -5,8 +5,9 @@
  *  Copyright (C) 2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  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.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/technology.h b/client/technology.h
index ca32d8a0..33ea82e5 100644
--- a/client/technology.h
+++ b/client/technology.h
@@ -5,8 +5,9 @@
  *  Copyright (C) 2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  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.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of