diff options
author | Evan Huus <eapache@gmail.com> | 2013-10-18 18:10:46 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2013-10-18 18:10:46 +0000 |
commit | 2322bd31228d667607ef819b499ce8d7dddb364a (patch) | |
tree | 520bd9342aba1cc460314824cebceced4aa449a7 /tools | |
parent | 2ac63d7a449e6ca09bf5b4e15fa6bd2ef10a72ca (diff) |
Fix lemon FSF address and add license exception for the generated mate grammar
files. One of them has no license (it is just defines) and the other gets picked
up as LGPL for no reason I can discern.
svn path=/trunk/; revision=52675
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/checklicenses.py | 6 | ||||
-rw-r--r-- | tools/lemon/lemon.c | 7 | ||||
-rw-r--r-- | tools/lemon/lempar.c | 7 |
3 files changed, 12 insertions, 8 deletions
diff --git a/tools/checklicenses.py b/tools/checklicenses.py index cfdff07616..d932c08307 100755 --- a/tools/checklicenses.py +++ b/tools/checklicenses.py @@ -156,6 +156,12 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = { 'epan/except.h': [ 'UNKNOWN', ], + 'plugins/mate/mate_grammar.c': [ + 'GPL (v2 or later) LGPL (v2 or later)', # licensecheck bug? + ], + 'plugins/mate/mate_grammar.h': [ + 'UNKNOWN', + ], 'cmake/TestFileOffsetBits.c': [ 'UNKNOWN', ], diff --git a/tools/lemon/lemon.c b/tools/lemon/lemon.c index cae0889a08..16e1387d95 100644 --- a/tools/lemon/lemon.c +++ b/tools/lemon/lemon.c @@ -16,10 +16,9 @@ ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ** General Public License for more details. ** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ** ** Author contact information: ** drh@acm.org diff --git a/tools/lemon/lempar.c b/tools/lemon/lempar.c index 53642e6650..848c43b3d2 100644 --- a/tools/lemon/lempar.c +++ b/tools/lemon/lempar.c @@ -13,10 +13,9 @@ ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ** Library General Public License for more details. ** -** You should have received a copy of the GNU Library General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ** ** Modified 1997 to make it suitable for use with makeheaders. * Updated to sqlite lemon version 1.36 |