summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2013-12-06 14:08:07 +0100
committerPetr Viktorin <pviktori@redhat.com>2013-12-09 10:18:38 +0100
commitb6540e88d88470f6566507e442f521214c5a74dc (patch)
treebfd04408e5f1d08e1b01c71a8e2c6fe08907ba55
parent5e2f7b68f0cb8e7fd6ea4f3236e84f1a8d075a13 (diff)
downloadfreeipa-b6540e88d88470f6566507e442f521214c5a74dc.tar.gz
freeipa-b6540e88d88470f6566507e442f521214c5a74dc.tar.xz
freeipa-b6540e88d88470f6566507e442f521214c5a74dc.zip
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.
-rw-r--r--install/ui/src/freeipa/aci.js10
-rw-r--r--install/ui/src/freeipa/package.json7
-rw-r--r--install/ui/test/aci_tests.js10
-rw-r--r--install/ui/test/widget_tests.js10
4 files changed, 17 insertions, 20 deletions
diff --git a/install/ui/src/freeipa/aci.js b/install/ui/src/freeipa/aci.js
index 67dc46e3e..1326f1b04 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 <http://www.gnu.org/licenses/>.
*/
define([
diff --git a/install/ui/src/freeipa/package.json b/install/ui/src/freeipa/package.json
index a7279ed3c..954b2207f 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 b0464e7fd..d400fb319 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 <http://www.gnu.org/licenses/>.
*/
define([
diff --git a/install/ui/test/widget_tests.js b/install/ui/test/widget_tests.js
index 17ee15436..5499f5529 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 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 <http://www.gnu.org/licenses/>.
*/
define(['freeipa/ipa', 'freeipa/jquery', 'freeipa/field', 'freeipa/widget',