diff options
| -rw-r--r-- | Copyright | 37 | ||||
| -rw-r--r-- | Makefile.in | 17 | ||||
| -rw-r--r-- | Python/library/Zinc.py.in | 15 | ||||
| -rw-r--r-- | debian/copyright | 39 | ||||
| -rw-r--r-- | doc/refman.tex | 62 | ||||
| -rw-r--r-- | library/zincText.tcl | 15 | ||||
| -rw-r--r-- | win/WinPort.c | 17 | ||||
| -rw-r--r-- | win/makefile.vc.in | 20 |
8 files changed, 101 insertions, 121 deletions
@@ -1,17 +1,28 @@ - Copyright (c) 1993 - 2003 CENA, Patrick Lecoanet -- +This software is copyrighted by the Centre d'études de la Navigation +Aérienne, Patrick Lecoanet, and other parties. The following terms +apply to all files associated with the software unless explicitly +disclaimed in individual files. - This code 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. +The authors hereby grant permission to use, copy, modify, distribute, +and license this software and its documentation for any purpose, provided +that existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written agreement, +license, or royalty fee is required for any of the authorized uses. +Modifications to this software may be copyrighted by their authors +and need not follow the licensing terms described here, provided that +the new terms are clearly indicated on the first page of each file where +they apply. - This code 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 License for more details. +IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY +FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY +DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. - You should have received a copy of the GNU Library General Public - License along with this code; if not, write to the Free - Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. +THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE +IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE +NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR +MODIFICATIONS. diff --git a/Makefile.in b/Makefile.in index 3b6944d..599481b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,18 +1,7 @@ -# Copyright (c) 1993 - 2003 CENA, Patrick Lecoanet -- +# Copyright (c) 1993 - 2005 CENA, Patrick Lecoanet -- # -# This code 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 code 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 License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this code; if not, write to the Free -# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# See the file "Copyright" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # $Revision$ # diff --git a/Python/library/Zinc.py.in b/Python/library/Zinc.py.in index b832fdf..3c13335 100644 --- a/Python/library/Zinc.py.in +++ b/Python/library/Zinc.py.in @@ -11,19 +11,8 @@ # # Copyright (c) 1999 CENA -- # -# This code 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 code 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 License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this code; if not, write to the Free -# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# See the file "Copyright" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # diff --git a/debian/copyright b/debian/copyright index 9c50fa6..b8177a6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,20 +3,33 @@ Wed, 25 Feb 1998 14:11:43 +0100. Copyright: - Copyright (c) 1993 - 2002 CENA, Patrick Lecoanet -- + Copyright (c) 1993 - 2005 CENA, Patrick Lecoanet -- - This code 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 software is copyrighted by the Centre d'études de la Navigation +Aérienne, Patrick Lecoanet, and other parties. The following terms +apply to all files associated with the software unless explicitly +disclaimed in individual files. - This code 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 License for more details. +The authors hereby grant permission to use, copy, modify, distribute, +and license this software and its documentation for any purpose, provided +that existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written agreement, +license, or royalty fee is required for any of the authorized uses. +Modifications to this software may be copyrighted by their authors +and need not follow the licensing terms described here, provided that +the new terms are clearly indicated on the first page of each file where +they apply. - You should have received a copy of the GNU Library General Public - License along with this code; if not, write to the Free - Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. +IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY +FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY +DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE +IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE +NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR +MODIFICATIONS. diff --git a/doc/refman.tex b/doc/refman.tex index baca8ac..34ed8b6 100644 --- a/doc/refman.tex +++ b/doc/refman.tex @@ -394,32 +394,46 @@ Finally the chapter \conceptref{Other resources provided by the widget}{otherres describes some resources provided by or with TkZinc. -\section{Copyright and Licence} +\section{Copyright and License} Zinc has been developed by the CENA (Centres d'Etudes de la Navigation Aérienne) for its own needs in advanced HMI (Human Machine Interfaces or Interactions). Because we are confident in the benefit of free software, the CENA delivered this -toolkit under the GNU Library General Public License. - -This code 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 code 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 License for more details. - -You should have received a copy of the GNU Library General Public -License along with this code; if not, write to the Free -Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -MA 02111-1307, USA. - - -While this software is distributed under the GNU Library General Public License, part -of it are derived from the Tk toolkit which is copyrighted under another open source -license by The Regents of the University of California and Sun Microsystems, Inc.. +toolkit under the same license as the Tk toolkit, the open source BSD License. + +This software is copyrighted by the Centre d'études de la Navigation +Aérienne, Patrick Lecoanet, and other parties. The following terms +apply to all files associated with the software unless explicitly +disclaimed in individual files. + +Here is the license text: + +The authors hereby grant permission to use, copy, modify, distribute, +and license this software and its documentation for any purpose, provided +that existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written agreement, +license, or royalty fee is required for any of the authorized uses. +Modifications to this software may be copyrighted by their authors +and need not follow the licensing terms described here, provided that +the new terms are clearly indicated on the first page of each file where +they apply. + +IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY +FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY +DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE +IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE +NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR +MODIFICATIONS. + + +Parts of this software are derived from the Tk toolkit which is copyrighted by +The Regents of the University of California and Sun Microsystems, Inc.. The GL font rendering is derived from Mark Kilgard code described in ``A Simple OpenGL-based API for Texture Mapped Text'' and is copyrighted by Mark Kilgard under an open source license. @@ -482,7 +496,7 @@ but demonstrative or more complex. It is up to you! They will be integrated in t next release of TkZinc if they are worth it. \item The fourth way to contribute, and may be the most difficult, is to enrich the set of items (see section \conceptref{C api for adding new items}{Capi}) in an separate -dynamic library. Then send us source code (with appropriate copyright and licence) +dynamic library. Then send us source code (with appropriate copyright and license) if you want them to be integrated in a future release of TkZinc. \end{itemize} @@ -2883,7 +2897,7 @@ applies to all tracks included in a group (by default the group 1). It can be enabled/disabled with the TkZinc attribute \optref{overlapmanager}. New labels positions are computed by the overlap manager every time a track is moved, a track is created or destroyed and every time the -TkZinc widget is resized. Due to software licence limitation, TkZinc \emph{do not include} +TkZinc widget is resized. Due to software license limitation, TkZinc \emph{do not include} the very last version of this anti-overlap manager. If you are interested in this anti-overlap manager, please contact Didier Pavet at {\tt pavet@cena.fr}. diff --git a/library/zincText.tcl b/library/zincText.tcl index 2e235c5..7bfd4c4 100644 --- a/library/zincText.tcl +++ b/library/zincText.tcl @@ -10,19 +10,8 @@ # # Copyright (c) 2002 - 2003 CENA, Patrick Lecoanet # -# This code 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 code 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 License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this code; if not, write to the Free -# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# See the file "Copyright" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # # SYNOPSIS diff --git a/win/WinPort.c b/win/WinPort.c index 8e6b8d8..812165a 100644 --- a/win/WinPort.c +++ b/win/WinPort.c @@ -8,21 +8,10 @@ */ /* - * Copyright (c) 2003 - CENA, Patrick Lecoanet -- + * Copyright (c) 2003 - 2005 CENA, Patrick Lecoanet -- * - * This code 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 code 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 License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this code; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * See the file "Copyright" for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * */ diff --git a/win/makefile.vc.in b/win/makefile.vc.in index b5e5e8a..4cd62a1 100644 --- a/win/makefile.vc.in +++ b/win/makefile.vc.in @@ -1,19 +1,8 @@ # Generated automatically from Makefile.in by configure. -# Copyright (c) 1993 - 2002 CENA, Patrick Lecoanet -- +# Copyright (c) 1993 - 2005 CENA, Patrick Lecoanet -- # -# This code 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 code 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 License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this code; if not, write to the Free -# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# See the file "Copyright" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # $Revision$ # @@ -127,9 +116,6 @@ $(tmpdir): {$(genericdir)}.c{$(tmpdir)}.obj: $(CC) $(TKCPPFLAGS) $(CFLAGS) -Fo$(tmpdir)\ $< -{$(tessdir)}.c{$(tmpdir)}.obj: - $(CC) $(TKCPPFLAGS) $(CFLAGS) -Fo$(tmpdir)\ $< - mostlyclean: $(RM) *.bak *~ $(tmpdir)\*.obj clean: |