2012-03-26 [mones] 3.8.0cvs34

	* src/common/plugin.c
		Support 2 and 3-clause BSD licensed plugins

diff --git a/ChangeLog b/ChangeLog
index 2b37cbd9b9b125235f6a0da4b37f8f670b8460d5..57d6c63741dd0c725fcedff6ecae1c64483df0ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-26 [mones]     3.8.0cvs34
+
+       * src/common/plugin.c
+               Support 2 and 3-clause BSD licensed plugins
+

 2012-03-15 [pawel]     3.8.0cvs33
 
        * src/messageview.c
 2012-03-15 [pawel]     3.8.0cvs33
 
        * src/messageview.c

diff --git a/PATCHSETS b/PATCHSETS
index 63e948b69e27770acc86e0ff84a23c694b4c7aa4..aa49d020c0804a8915c72e6c9669182323d9e67f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4350,3 +4350,4 @@
 ( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.76 -r 1.1.2.77 src/gtk/authors.h;  cvs diff -u -r 1.100.2.81 -r 1.100.2.82 AUTHORS;  ) > 3.8.0cvs31.patchset
 ( cvs diff -u -r 1.213.2.205 -r 1.213.2.206 src/folder.c;  cvs diff -u -r 1.94.2.228 -r 1.94.2.229 src/messageview.c;  cvs diff -u -r 1.19.2.28 -r 1.19.2.29 src/messageview.h;  cvs diff -u -r 1.60.2.59 -r 1.60.2.60 src/procmsg.h;  cvs diff -u -r 1.395.2.444 -r 1.395.2.445 src/summaryview.c;  cvs diff -u -r 1.96.2.237 -r 1.96.2.238 src/textview.c;  cvs diff -u -r 1.12.2.29 -r 1.12.2.30 src/textview.h;  ) > 3.8.0cvs32.patchset
 ( cvs diff -u -r 1.94.2.229 -r 1.94.2.230 src/messageview.c;  cvs diff -u -r 1.96.2.238 -r 1.96.2.239 src/textview.c;  ) > 3.8.0cvs33.patchset
 ( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.76 -r 1.1.2.77 src/gtk/authors.h;  cvs diff -u -r 1.100.2.81 -r 1.100.2.82 AUTHORS;  ) > 3.8.0cvs31.patchset
 ( cvs diff -u -r 1.213.2.205 -r 1.213.2.206 src/folder.c;  cvs diff -u -r 1.94.2.228 -r 1.94.2.229 src/messageview.c;  cvs diff -u -r 1.19.2.28 -r 1.19.2.29 src/messageview.h;  cvs diff -u -r 1.60.2.59 -r 1.60.2.60 src/procmsg.h;  cvs diff -u -r 1.395.2.444 -r 1.395.2.445 src/summaryview.c;  cvs diff -u -r 1.96.2.237 -r 1.96.2.238 src/textview.c;  cvs diff -u -r 1.12.2.29 -r 1.12.2.30 src/textview.h;  ) > 3.8.0cvs32.patchset
 ( cvs diff -u -r 1.94.2.229 -r 1.94.2.230 src/messageview.c;  cvs diff -u -r 1.96.2.238 -r 1.96.2.239 src/textview.c;  ) > 3.8.0cvs33.patchset

+( cvs diff -u -r 1.13.2.43 -r 1.13.2.44 src/common/plugin.c;  ) > 3.8.0cvs34.patchset

diff --git a/configure.ac b/configure.ac
index 04b56cd70b140561f59a5da403d31f2437f57f2e..84cd8b477306fc5af15a30192c45718d9b2ae014 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=33
+EXTRA_VERSION=34

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/plugin.c b/src/common/plugin.c
index 328d2dba31babb3492d45dcad129468ccc0146f0..8a650d1bebeefd9a2f2ae60ea03b9e3b935b5f05 100644 (file)
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -80,6 +80,8 @@ const gchar const *plugin_licence_tokens[] = {
   "GPL3+", "GPLv3+", "GPL3", "GPLv3",
   "GPL2+", "GPLv2+",
   "Apache2.0", "Apache 2.0", "Apache v2.0",
   "GPL3+", "GPLv3+", "GPL3", "GPLv3",
   "GPL2+", "GPLv2+",
   "Apache2.0", "Apache 2.0", "Apache v2.0",

+  "2-clause BSD", "Simplified BSD", "FreeBSD",
+  "3-clause BSD", "New BSD", "Modified BSD",

   NULL
 };
 
   NULL
 };