summaryrefslogtreecommitdiffstats
path: root/install
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:19:01 +0100
commit2877f5d8a11ebdd32c2007b26facab2073cf48ad (patch)
tree03b29212b804efcdcbc45f94be843ef84d9cd65e /install
parent0d8cf9f848e536f0c122b37ae26cf9a5d238c23b (diff)
downloadfreeipa.git-2877f5d8a11ebdd32c2007b26facab2073cf48ad.tar.gz
freeipa.git-2877f5d8a11ebdd32c2007b26facab2073cf48ad.tar.xz
freeipa.git-2877f5d8a11ebdd32c2007b26facab2073cf48ad.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.
Diffstat (limited to 'install')
-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 3ca10dbf..d9d46cb7 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 a7279ed3..954b2207 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 b0464e7f..d400fb31 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 17ee1543..5499f552 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',