Clarified alternative licensing to GPLv2+.

2 files changed, 5 insertions, 9 deletions

diff --git a/python/pwquality.c b/python/pwquality.c
index 18fd608..4d290fb 100644
--- a/python/pwquality.c
+++ b/python/pwquality.c
@@ -408,10 +408,8 @@ initpwquality(void)
  *    written permission.
  *
  * ALTERNATIVELY, this product may be distributed under the terms of
- * the GNU Public License, in which case the provisions of the GPL are
- * required INSTEAD OF the above restrictions.  (This clause is
- * necessary due to a potential bad interaction between the GPL and
- * the restrictions contained in a BSD-style copyright.)
+ * the GNU General Public License version 2 or later, in which case the
+ * provisions of the GPL are required INSTEAD OF the above restrictions.
  *
  * THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/python/setup.py b/python/setup.py
index b9a7900..8174f32 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -34,7 +34,7 @@ setup(
     author = 'Tomáš Mráz',
     author_email = 'tm@t8m.info',
     url = 'http://fedorahosted.org/libpwquality',
-    license = 'BSD or GPL+',
+    license = 'BSD or GPLv2+',
     ext_modules = [pwqmodule],
     cmdclass = {'build_ext': build_ext}
 )
@@ -56,10 +56,8 @@ setup(
 #    written permission.
 #
 # ALTERNATIVELY, this product may be distributed under the terms of
-# the GNU Public License, in which case the provisions of the GPL are
-# required INSTEAD OF the above restrictions.  (This clause is
-# necessary due to a potential bad interaction between the GPL and
-# the restrictions contained in a BSD-style copyright.)
+# the GNU General Public License version 2 or later, in which case the
+# provisions of the GPL are required INSTEAD OF the above restrictions.
 #
 # THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
 # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES