diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 11 | ||||
| -rw-r--r-- | modules/indic/indic-ot-class-tables.c | 38 | ||||
| -rw-r--r-- | modules/indic/indic-ot.c | 39 | ||||
| -rw-r--r-- | modules/indic/indic-ot.h | 38 | ||||
| -rw-r--r-- | modules/khmer/khmer-fc.c | 29 |
6 files changed, 123 insertions, 43 deletions
@@ -1,5 +1,13 @@ 2005-07-21 Owen Taylor <otaylor@redhat.com> + * modules/indic/indic-ot-class-tables.c modules/indic/indic-ot.[ch]: + license on these ICU-derived files is X license, not LGPL. + + * modules/khmer/khmer-fc.c: Add the X license text here in addition + to the LGPL. + +2005-07-21 Owen Taylor <otaylor@redhat.com> + * pango/pangoxft-font.c (_pango_xft_font_new): Force on metrics hinting for all Xft fonts (this fixes font metrics - glyph metrics were fixed earlier). @@ -56,7 +64,8 @@ 2005-07-21 Owen Taylor <otaylor@redhat.com> Fix up places where there is missing or incomplete - Copyright and License information (Reported by William N. Ray) + Copyright and License information (Reported by William N. Ray, + #310072) * pango/opentype/fterrcompat.h: Mark as FreeType/GPL licensed. diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 5cccd6b1..6a9bc0ba 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,13 @@ 2005-07-21 Owen Taylor <otaylor@redhat.com> + * modules/indic/indic-ot-class-tables.c modules/indic/indic-ot.[ch]: + license on these ICU-derived files is X license, not LGPL. + + * modules/khmer/khmer-fc.c: Add the X license text here in addition + to the LGPL. + +2005-07-21 Owen Taylor <otaylor@redhat.com> + * pango/pangoxft-font.c (_pango_xft_font_new): Force on metrics hinting for all Xft fonts (this fixes font metrics - glyph metrics were fixed earlier). @@ -56,7 +64,8 @@ 2005-07-21 Owen Taylor <otaylor@redhat.com> Fix up places where there is missing or incomplete - Copyright and License information (Reported by William N. Ray) + Copyright and License information (Reported by William N. Ray, + #310072) * pango/opentype/fterrcompat.h: Mark as FreeType/GPL licensed. diff --git a/modules/indic/indic-ot-class-tables.c b/modules/indic/indic-ot-class-tables.c index 3ca664f6..2de743e7 100644 --- a/modules/indic/indic-ot-class-tables.c +++ b/modules/indic/indic-ot-class-tables.c @@ -1,23 +1,35 @@ /* Pango * indic-ot-class-tables.c: * - * Copyright (C) 2001, 2002 IBM Corporation + * Copyright (C) 2001, 2002 IBM Corporation. All Rights Reserved. * Author: Eric Mader <mader@jtcsv.com> * - * 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. + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, and/or sell copies of the + * Software, and to permit persons to whom the Software is furnished + * to do so, provided that the above copyright notice(s) and this + * permission notice appear in all copies of the Software and that + * both the above copyright notice(s) and this permission notice + * appear in supporting documentation. * - * 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 License for more details. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR + * ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY + * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. * - * 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. + * Except as contained in this notice, the name of a copyright holder + * shall not be used in advertising or otherwise to promote the sale, + * use or other dealings in this Software without prior written + * authorization of the copyright holder. */ #include "indic-ot.h" diff --git a/modules/indic/indic-ot.c b/modules/indic/indic-ot.c index 2016a1ab..2493db91 100644 --- a/modules/indic/indic-ot.c +++ b/modules/indic/indic-ot.c @@ -1,23 +1,32 @@ /* Pango * indic-ot.c: * - * Copyright (C) 2001, 2002 IBM Corporation. + * Copyright (C) 2001, 2002 IBM Corporation. All Rights Reserved. * Author: Eric Mader <mader@jtcsv.com> * - * 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 - * 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. + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, and/or sell copies of the + * Software, and to permit persons to whom the Software is furnished + * to do so, provided that the above copyright notice(s) and this + * permission notice appear in all copies of the Software and that + * both the above copyright notice(s) and this permission notice + * appear in supporting documentation. THE SOFTWARE IS PROVIDED "AS + * IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING + * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A + * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO + * EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE + * BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL + * DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA + * OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. Except as contained in this notice, + * the name of a copyright holder shall not be used in advertising or + * otherwise to promote the sale, use or other dealings in this + * Software without prior written authorization of the copyright + * holder. */ #include "indic-ot.h" diff --git a/modules/indic/indic-ot.h b/modules/indic/indic-ot.h index d14f9df8..7d92b0c6 100644 --- a/modules/indic/indic-ot.h +++ b/modules/indic/indic-ot.h @@ -1,23 +1,35 @@ /* Pango * indic-ot.h: * - * Copyright (C) 2001, 2002 IBM Corporation. + * Copyright (C) 2001, 2002 IBM Corporation. All Rights Reserved. * Author: Eric Mader <mader@jtcsv.com> * - * 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. + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, and/or sell copies of the + * Software, and to permit persons to whom the Software is furnished + * to do so, provided that the above copyright notice(s) and this + * permission notice appear in all copies of the Software and that + * both the above copyright notice(s) and this permission notice + * appear in supporting documentation. * - * 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 License for more details. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR + * ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY + * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. * - * 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. + * Except as contained in this notice, the name of a copyright holder + * shall not be used in advertising or otherwise to promote the sale, + * use or other dealings in this Software without prior written + * authorization of the copyright holder. */ #ifndef __INDIC_OT_H__ diff --git a/modules/khmer/khmer-fc.c b/modules/khmer/khmer-fc.c index 4e772c75..edb8de43 100644 --- a/modules/khmer/khmer-fc.c +++ b/modules/khmer/khmer-fc.c @@ -26,6 +26,35 @@ * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. + * + * The license on the original Indic shaper code is as follows: + * + * * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, and/or sell copies of the + * Software, and to permit persons to whom the Software is furnished + * to do so, provided that the above copyright notice(s) and this + * permission notice appear in all copies of the Software and that + * both the above copyright notice(s) and this permission notice + * appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR + * ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY + * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + * + * Except as contained in this notice, the name of a copyright holder + * shall not be used in advertising or otherwise to promote the sale, + * use or other dealings in this Software without prior written + * authorization of the copyright holder. */ #include <string.h> |