From b8c8d204b767b3d51d87b805ee79f9b585873e9b Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 10 Aug 2005 18:46:42 +0000 Subject: [PATCH 1/1] make sure all licence texts are really the same git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/gtk/licence.txt | 99 ++++++++++++++++++-------------------- docs/latex/wx/manual2e.tex | 10 ++-- docs/wine/licence.txt | 99 ++++++++++++++++++-------------------- 3 files changed, 101 insertions(+), 107 deletions(-) diff --git a/docs/gtk/licence.txt b/docs/gtk/licence.txt index 101904ef85..95f18d034c 100644 --- a/docs/gtk/licence.txt +++ b/docs/gtk/licence.txt @@ -1,56 +1,53 @@ + wxWindows Library Licence, Version 3.1 + ====================================== - -wxWidgets Library License, Version 3 -==================================== - - Copyright (C) 1998 Julian Smart, Robert Roebling et al. + Copyright (c) 1998-2005 Julian Smart, Robert Roebling et al Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - WXWINDOWS LIBRARY LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published by - the Free Software Foundation; either version 2 of the License, or (at - your option) any later version. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- - TABILITY 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 software, usually in a file named COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - Boston, MA 02111-1307 USA. - - EXCEPTION NOTICE - - 1. As a special exception, the copyright holders of this library give - permission for additional uses of the text contained in this release of - the library as licensed under the wxWidgets Library License, applying - either version 3 of the License, or (at your option) any later version of - the License as published by the copyright holders of version 3 of the - License document. - - 2. The exception is that you may create binary object code versions of any - works using this library or based on this library, and use, copy, modify, - link and distribute such binary object code files unrestricted under terms - of your choice. - - 3. If you copy code from files distributed under the terms of the GNU - General Public License or the GNU Library General Public License into a - copy of this library, as this license permits, the exception does not - apply to the code that you add in this way. To avoid misleading anyone as - to the status of such modified files, you must delete this exception - notice from such code and/or adjust the licensing conditions notice - accordingly. - - 4. If you write modifications of your own for this library, it is your - choice whether to permit this exception to apply to your modifications. - If you do not wish that, you must delete the exception notice from such - code and/or adjust the licensing conditions notice accordingly. + of this licence document, but changing it is not allowed. + WXWINDOWS LIBRARY LICENCE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public Licence as published by + the Free Software Foundation; either version 2 of the Licence, or (at + your option) any later version. + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library + General Public Licence for more details. + + You should have received a copy of the GNU Library General Public Licence + along with this software, usually in a file named COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + Boston, MA 02111-1307 USA. + + EXCEPTION NOTICE + + 1. As a special exception, the copyright holders of this library give + permission for additional uses of the text contained in this release of + the library as licenced under the wxWindows Library Licence, applying + either version 3.1 of the Licence, or (at your option) any later version of + the Licence as published by the copyright holders of version + 3.1 of the Licence document. + + 2. The exception is that you may use, copy, link, modify and distribute + under your own terms, binary object code versions of works based + on the Library. + + 3. If you copy code from files distributed under the terms of the GNU + General Public Licence or the GNU Library General Public Licence into a + copy of this library, as this licence permits, the exception does not + apply to the code that you add in this way. To avoid misleading anyone as + to the status of such modified files, you must delete this exception + notice from such code and/or adjust the licensing conditions notice + accordingly. + + 4. If you write modifications of your own for this library, it is your + choice whether to permit this exception to apply to your modifications. + If you do not wish that, you must delete the exception notice from such + code and/or adjust the licensing conditions notice accordingly. + + diff --git a/docs/latex/wx/manual2e.tex b/docs/latex/wx/manual2e.tex index 3b2c4018da..6dcfc18855 100644 --- a/docs/latex/wx/manual2e.tex +++ b/docs/latex/wx/manual2e.tex @@ -100,7 +100,7 @@ Portions (c) 1996 Artificial Intelligence Applications Institute\\ Please also see the wxWindows license files (preamble.txt, lgpl.txt, gpl.txt, licence.txt, licendoc.txt) for conditions of software and documentation use. -\section*{wxWidgets Library License, Version 3} +\section*{wxWindows Library License, Version 3.1}\label{wxlicense} % !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! % @@ -109,7 +109,7 @@ licendoc.txt) for conditions of software and documentation use. % % !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -Copyright (c) 1998 Julian Smart, Robert Roebling et al +Copyright (c) 1998-2005 Julian Smart, Robert Roebling et al Everyone is permitted to copy and distribute verbatim copies of this licence document, but changing it is not allowed. @@ -139,12 +139,12 @@ EXCEPTION NOTICE 1. As a special exception, the copyright holders of this library give permission for additional uses of the text contained in this release of the library as licenced under the wxWindows Library Licence, applying -either version 3 of the Licence, or (at your option) any later version of -the Licence as published by the copyright holders of version 3 of the +either version 3.1 of the Licence, or (at your option) any later version of +the Licence as published by the copyright holders of version 3.1 of the Licence document. 2. The exception is that you may use, copy, link, modify and distribute -under the user's own terms, binary object code versions of works based +under your own terms, binary object code versions of works based on the Library. 3. If you copy code from files distributed under the terms of the GNU diff --git a/docs/wine/licence.txt b/docs/wine/licence.txt index 101904ef85..95f18d034c 100644 --- a/docs/wine/licence.txt +++ b/docs/wine/licence.txt @@ -1,56 +1,53 @@ + wxWindows Library Licence, Version 3.1 + ====================================== - -wxWidgets Library License, Version 3 -==================================== - - Copyright (C) 1998 Julian Smart, Robert Roebling et al. + Copyright (c) 1998-2005 Julian Smart, Robert Roebling et al Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - WXWINDOWS LIBRARY LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published by - the Free Software Foundation; either version 2 of the License, or (at - your option) any later version. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- - TABILITY 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 software, usually in a file named COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - Boston, MA 02111-1307 USA. - - EXCEPTION NOTICE - - 1. As a special exception, the copyright holders of this library give - permission for additional uses of the text contained in this release of - the library as licensed under the wxWidgets Library License, applying - either version 3 of the License, or (at your option) any later version of - the License as published by the copyright holders of version 3 of the - License document. - - 2. The exception is that you may create binary object code versions of any - works using this library or based on this library, and use, copy, modify, - link and distribute such binary object code files unrestricted under terms - of your choice. - - 3. If you copy code from files distributed under the terms of the GNU - General Public License or the GNU Library General Public License into a - copy of this library, as this license permits, the exception does not - apply to the code that you add in this way. To avoid misleading anyone as - to the status of such modified files, you must delete this exception - notice from such code and/or adjust the licensing conditions notice - accordingly. - - 4. If you write modifications of your own for this library, it is your - choice whether to permit this exception to apply to your modifications. - If you do not wish that, you must delete the exception notice from such - code and/or adjust the licensing conditions notice accordingly. + of this licence document, but changing it is not allowed. + WXWINDOWS LIBRARY LICENCE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public Licence as published by + the Free Software Foundation; either version 2 of the Licence, or (at + your option) any later version. + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library + General Public Licence for more details. + + You should have received a copy of the GNU Library General Public Licence + along with this software, usually in a file named COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + Boston, MA 02111-1307 USA. + + EXCEPTION NOTICE + + 1. As a special exception, the copyright holders of this library give + permission for additional uses of the text contained in this release of + the library as licenced under the wxWindows Library Licence, applying + either version 3.1 of the Licence, or (at your option) any later version of + the Licence as published by the copyright holders of version + 3.1 of the Licence document. + + 2. The exception is that you may use, copy, link, modify and distribute + under your own terms, binary object code versions of works based + on the Library. + + 3. If you copy code from files distributed under the terms of the GNU + General Public Licence or the GNU Library General Public Licence into a + copy of this library, as this licence permits, the exception does not + apply to the code that you add in this way. To avoid misleading anyone as + to the status of such modified files, you must delete this exception + notice from such code and/or adjust the licensing conditions notice + accordingly. + + 4. If you write modifications of your own for this library, it is your + choice whether to permit this exception to apply to your modifications. + If you do not wish that, you must delete the exception notice from such + code and/or adjust the licensing conditions notice accordingly. + + -- 2.45.2