[Kde-pim] [kdepim-addons/Applications/16.04] plugins/messageviewerwebengineurlinterceptor/adblock/lib: Relicense adblock code as GPLv2+ to remove license conflict
Luca Beltrame
lbeltrame at kde.org
Wed May 25 10:38:39 BST 2016
Git commit e4bcb6ce1a430842dbfe139f7548c073fdccc39c by Luca Beltrame.
Committed on 25/05/2016 at 09:35.
Pushed by lbeltrame into branch 'Applications/16.04'.
Relicense adblock code as GPLv2+ to remove license conflict
David Rosca (author of the adblock library) agreed to the relicensing.
Laurent Montel agreed to the relicensing.
CCMAIL: montel at kde.org
CCMAIL: kde-pim at kde.org
CCMAIL: nowrep at gmail.com
M +1 -1 plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockmatcher.cpp
M +1 -1 plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockmatcher.h
M +2 -2 plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockregexp.cpp
M +2 -2 plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockregexp.h
M +2 -2 plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockrule.cpp
M +2 -2 plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockrule.h
M +2 -2 plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksearchtree.cpp
M +2 -2 plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksearchtree.h
M +2 -2 plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksubscription.cpp
M +2 -2 plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksubscription.h
M +2 -2 plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockutil.cpp
M +2 -2 plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockutil.h
http://commits.kde.org/kdepim-addons/e4bcb6ce1a430842dbfe139f7548c073fdccc39c
diff --git a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockmatcher.cpp b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockmatcher.cpp
index ca97cff..2b48eb6 100644
--- a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockmatcher.cpp
+++ b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockmatcher.cpp
@@ -20,7 +20,7 @@
*
* 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
+* 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,
diff --git a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockmatcher.h b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockmatcher.h
index c47aa1b..00dc4fb 100644
--- a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockmatcher.h
+++ b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockmatcher.h
@@ -21,7 +21,7 @@
*
* 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
+* 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,
diff --git a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockregexp.cpp b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockregexp.cpp
index 0287404..567cc58 100644
--- a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockregexp.cpp
+++ b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockregexp.cpp
@@ -2,7 +2,7 @@
Copyright (c) 2016 Montel Laurent <montel at kde.org>
* 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
+* 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,
@@ -20,7 +20,7 @@
*
* 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
+* 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,
diff --git a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockregexp.h b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockregexp.h
index d5e0359..524f61f 100644
--- a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockregexp.h
+++ b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockregexp.h
@@ -2,7 +2,7 @@
Copyright (c) 2016 Montel Laurent <montel at kde.org>
* 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
+* 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,
@@ -19,7 +19,7 @@
*
* 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
+* 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,
diff --git a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockrule.cpp b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockrule.cpp
index f694c1b..465fb99 100644
--- a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockrule.cpp
+++ b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockrule.cpp
@@ -2,7 +2,7 @@
Copyright (c) 2016 Montel Laurent <montel at kde.org>
* 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
+* 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,
@@ -19,7 +19,7 @@
*
* 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
+* 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,
diff --git a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockrule.h b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockrule.h
index 895e36a..ab046b4 100644
--- a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockrule.h
+++ b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockrule.h
@@ -2,7 +2,7 @@
Copyright (c) 2016 Montel Laurent <montel at kde.org>
* 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
+* 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,
@@ -19,7 +19,7 @@
*
* 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
+* 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,
diff --git a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksearchtree.cpp b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksearchtree.cpp
index ffa6dcc..9b282c9 100644
--- a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksearchtree.cpp
+++ b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksearchtree.cpp
@@ -2,7 +2,7 @@
Copyright (c) 2016 Montel Laurent <montel at kde.org>
* 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
+* 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,
@@ -19,7 +19,7 @@
*
* 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
+* 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,
diff --git a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksearchtree.h b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksearchtree.h
index 10923e9..8342734 100644
--- a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksearchtree.h
+++ b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksearchtree.h
@@ -2,7 +2,7 @@
Copyright (c) 2016 Montel Laurent <montel at kde.org>
* 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
+* 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,
@@ -19,7 +19,7 @@
*
* 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
+* 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,
diff --git a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksubscription.cpp b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksubscription.cpp
index 5e4d0fc..bfdd51f 100644
--- a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksubscription.cpp
+++ b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksubscription.cpp
@@ -2,7 +2,7 @@
Copyright (c) 2016 Montel Laurent <montel at kde.org>
* 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
+* 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,
@@ -19,7 +19,7 @@
*
* 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
+* 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,
diff --git a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksubscription.h b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksubscription.h
index c4c64a6..e56d4ea 100644
--- a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksubscription.h
+++ b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblocksubscription.h
@@ -2,7 +2,7 @@
Copyright (c) 2016 Montel Laurent <montel at kde.org>
* 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
+* 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,
@@ -19,7 +19,7 @@
*
* 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
+* 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,
diff --git a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockutil.cpp b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockutil.cpp
index 574cdfe..461b070 100644
--- a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockutil.cpp
+++ b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockutil.cpp
@@ -2,7 +2,7 @@
Copyright (c) 2016 Montel Laurent <montel at kde.org>
* 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
+* 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,
@@ -19,7 +19,7 @@
*
* 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
+* 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,
diff --git a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockutil.h b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockutil.h
index 9d05ed0..9bd34a8 100644
--- a/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockutil.h
+++ b/plugins/messageviewerwebengineurlinterceptor/adblock/lib/adblockutil.h
@@ -2,7 +2,7 @@
Copyright (c) 2016 Montel Laurent <montel at kde.org>
* 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
+* 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,
@@ -19,7 +19,7 @@
*
* 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
+* 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,
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/
More information about the kde-pim
mailing list