Re: [Freeipa-devel] [PATCH] 531 Fix license in some Web UI files

2013-12-09 Thread Petr Viktorin

On 12/06/2013 05:10 PM, Simo Sorce wrote:

On Fri, 2013-12-06 at 14:19 +0100, Petr Vobornik wrote:

Modified web ui files had incorrect GPLv2 headers instead of GPLv3 ones.

All of the affected code is of FreeIPA origin.


Ack.
Simo.



Pushed to
master: b6540e88d88470f6566507e442f521214c5a74dc
ipa-3-3: 2877f5d8a11ebdd32c2007b26facab2073cf48ad


--
PetrĀ³

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel


Re: [Freeipa-devel] [PATCH] 531 Fix license in some Web UI files

2013-12-06 Thread Simo Sorce
On Fri, 2013-12-06 at 14:19 +0100, Petr Vobornik wrote:
> Modified web ui files had incorrect GPLv2 headers instead of GPLv3 ones.
> 
> All of the affected code is of FreeIPA origin.

Ack.
Simo.

-- 
Simo Sorce * Red Hat, Inc * New York

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel


[Freeipa-devel] [PATCH] 531 Fix license in some Web UI files

2013-12-06 Thread Petr Vobornik

Modified web ui files had incorrect GPLv2 headers instead of GPLv3 ones.

All of the affected code is of FreeIPA origin.
--
Petr Vobornik
>From 83300169da1e7a3a107a8a3c8c4f453380b5bcb1 Mon Sep 17 00:00:00 2001
From: Petr Vobornik 
Date: Fri, 6 Dec 2013 14:08:07 +0100
Subject: [PATCH] Fix license in some Web UI files

Modified web ui files had incorrect GPLv2 headers instead of GPLv3 ones.

All of the affected code is of FreeIPA origin.
---
 install/ui/src/freeipa/aci.js   | 10 +-
 install/ui/src/freeipa/package.json |  7 ++-
 install/ui/test/aci_tests.js| 10 +-
 install/ui/test/widget_tests.js | 10 +-
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/install/ui/src/freeipa/aci.js b/install/ui/src/freeipa/aci.js
index 67dc46e3eeeb85d59bdb86a07b9b534be22874ad..1326f1b04f38c6b9df6821537b988dac570f8cda 100644
--- a/install/ui/src/freeipa/aci.js
+++ b/install/ui/src/freeipa/aci.js
@@ -5,9 +5,10 @@
  * Copyright (C) 2010 Red Hat
  * see file 'COPYING' for use and warranty information
  *
- * 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; version 2 only
+ * 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
+ * (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
@@ -15,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program.  If not, see .
  */
 
 define([
diff --git a/install/ui/src/freeipa/package.json b/install/ui/src/freeipa/package.json
index a7279ed3c03bdae4b22b4e54d51a99ad3f9bcb3e..954b2207f6a6a01341206af9615e651fec4825a0 100644
--- a/install/ui/src/freeipa/package.json
+++ b/install/ui/src/freeipa/package.json
@@ -5,8 +5,6 @@
 "keywords": ["FreeIPA","Identity management", "Red Hat", "Web UI"],
 "maintainers": [{
 "name": "Petr Vobornik"
-},{
-"name": "Endi Sukma Dewata"
 }],
 "contributors": [{
 "name": "Petr Vobornik"
@@ -16,13 +14,12 @@
 "name": "Adam Young"
 },{
 "name": "Pavel Zuna"
+},{
+"name": "Ana Krivokapic"
 }],
 "licenses": [{
 "type": "GPLv3",
 "url": "http://www.gnu.org/licenses/gpl-3.0.html";
-},{
-"type": "GPLv2",
-"url": "http://www.gnu.org/licenses/gpl-2.0.html";
 }],
 "bugs": "https://fedorahosted.org/freeipa/";,
 "repositories": [{
diff --git a/install/ui/test/aci_tests.js b/install/ui/test/aci_tests.js
index b0464e7fdb43fba0b789fad86a54e2a6efb99413..d400fb31992058a2107a9c61e83b7e6b754884e8 100644
--- a/install/ui/test/aci_tests.js
+++ b/install/ui/test/aci_tests.js
@@ -4,9 +4,10 @@
  * Copyright (C) 2010 Red Hat
  * see file 'COPYING' for use and warranty information
  *
- * 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; version 2 only
+ * 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
+ * (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
@@ -14,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program.  If not, see .
  */
 
 define([
diff --git a/install/ui/test/widget_tests.js b/install/ui/test/widget_tests.js
index 17ee1543602000a9fefb0b693697a565fcc36d35..5499f552939eaddbfc3974edfa5e2a7f30b620ea 100644
--- a/install/ui/test/widget_tests.js
+++ b/install/ui/test/widget_tests.js
@@ -4,9 +4,10 @@
  * Copyright (C) 2010 Red Hat
  * see file 'COPYING' for use and warranty information
  *
- * 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; version 2 only
+ * 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 Softwar