diff options
author | Sébastien Wilmet <swilmet@gnome.org> | 2016-12-27 19:14:03 +0100 |
---|---|---|
committer | Sébastien Wilmet <swilmet@gnome.org> | 2017-01-04 19:12:56 +0100 |
commit | 8edcf67b0221efa3c2ada67c44eff29939b1704d (patch) | |
tree | d1fd3e6029b39d8e0e5f36b91e76fb09adce499b | |
parent | e603035d133b608eb1d208b5d14be6e05abc753d (diff) | |
download | glib-8edcf67b0221efa3c2ada67c44eff29939b1704d.tar.gz |
License headers: "GLib" -> "This library"
Harmonize a little the license headers. In most of the license headers
in GLib, it is "This library".
It is also what is explained at:
https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html#SEC4
"How to Apply These Terms to Your New Libraries"
https://bugzilla.gnome.org/show_bug.cgi?id=776586
-rw-r--r-- | glib/gfileutils.c | 15 | ||||
-rw-r--r-- | glib/gfileutils.h | 15 | ||||
-rw-r--r-- | glib/gkeyfile.c | 15 | ||||
-rw-r--r-- | glib/gkeyfile.h | 15 | ||||
-rw-r--r-- | glib/gmarkup.c | 15 | ||||
-rw-r--r-- | glib/gmarkup.h | 15 | ||||
-rw-r--r-- | glib/gshell.c | 16 | ||||
-rw-r--r-- | glib/gshell.h | 16 | ||||
-rw-r--r-- | glib/gspawn-win32-helper.c | 16 | ||||
-rw-r--r-- | glib/gspawn-win32.c | 16 | ||||
-rw-r--r-- | glib/gspawn.c | 16 | ||||
-rw-r--r-- | glib/gspawn.h | 16 | ||||
-rw-r--r-- | glib/gstdio.c | 15 | ||||
-rw-r--r-- | glib/gstdio.h | 15 |
14 files changed, 98 insertions, 118 deletions
diff --git a/glib/gfileutils.c b/glib/gfileutils.c index b36d984b5..2e9655f0f 100644 --- a/glib/gfileutils.c +++ b/glib/gfileutils.c @@ -2,19 +2,18 @@ * * Copyright 2000 Red Hat, Inc. * - * GLib is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * 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 * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" diff --git a/glib/gfileutils.h b/glib/gfileutils.h index c08ba0989..fce5c50a6 100644 --- a/glib/gfileutils.h +++ b/glib/gfileutils.h @@ -2,19 +2,18 @@ * * Copyright 2000 Red Hat, Inc. * - * GLib is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * 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 * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_FILEUTILS_H__ diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c index a5375f723..87f2b9109 100644 --- a/glib/gkeyfile.c +++ b/glib/gkeyfile.c @@ -7,19 +7,18 @@ * Written by Ray Strode <rstrode@redhat.com> * Matthias Clasen <mclasen@redhat.com> * - * GLib is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * 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 * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" diff --git a/glib/gkeyfile.h b/glib/gkeyfile.h index 2e1efa4f2..8e7bfb9dd 100644 --- a/glib/gkeyfile.h +++ b/glib/gkeyfile.h @@ -4,19 +4,18 @@ * * Ray Strode <halfline@hawaii.rr.com> * - * GLib is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * 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 * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_KEY_FILE_H__ diff --git a/glib/gmarkup.c b/glib/gmarkup.c index 9bdd2920f..3c7fd49d9 100644 --- a/glib/gmarkup.c +++ b/glib/gmarkup.c @@ -3,19 +3,18 @@ * Copyright 2000, 2003 Red Hat, Inc. * Copyright 2007, 2008 Ryan Lortie <desrt@desrt.ca> * - * GLib is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * 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 * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" diff --git a/glib/gmarkup.h b/glib/gmarkup.h index 13b2343a7..05c3cc9fa 100644 --- a/glib/gmarkup.h +++ b/glib/gmarkup.h @@ -2,19 +2,18 @@ * * Copyright 2000 Red Hat, Inc. * - * GLib is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * 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 * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_MARKUP_H__ diff --git a/glib/gshell.c b/glib/gshell.c index 5fb6a809a..1248ae533 100644 --- a/glib/gshell.c +++ b/glib/gshell.c @@ -4,20 +4,18 @@ * g_execvpe implementation based on GNU libc execvp: * Copyright 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc. * - * GLib is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * 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 * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. 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 Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" diff --git a/glib/gshell.h b/glib/gshell.h index cff6c5cbf..d3d85c90b 100644 --- a/glib/gshell.h +++ b/glib/gshell.h @@ -2,20 +2,18 @@ * * Copyright 2000 Red Hat, Inc. * - * GLib is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * 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 * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. 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 Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_SHELL_H__ diff --git a/glib/gspawn-win32-helper.c b/glib/gspawn-win32-helper.c index 93b73e7a0..6614b0a39 100644 --- a/glib/gspawn-win32-helper.c +++ b/glib/gspawn-win32-helper.c @@ -3,20 +3,18 @@ * Copyright 2000 Red Hat, Inc. * Copyright 2000 Tor Lillqvist * - * GLib is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * 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 * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. 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 Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c index da2a63725..e1048d2c3 100644 --- a/glib/gspawn-win32.c +++ b/glib/gspawn-win32.c @@ -3,20 +3,18 @@ * Copyright 2000 Red Hat, Inc. * Copyright 2003 Tor Lillqvist * - * GLib is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * 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 * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. 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 Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ /* diff --git a/glib/gspawn.c b/glib/gspawn.c index 929db491d..6f78f5cd1 100644 --- a/glib/gspawn.c +++ b/glib/gspawn.c @@ -4,20 +4,18 @@ * g_execvpe implementation based on GNU libc execvp: * Copyright 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc. * - * GLib is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * 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 * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. 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 Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" diff --git a/glib/gspawn.h b/glib/gspawn.h index bae522af3..1409e2f44 100644 --- a/glib/gspawn.h +++ b/glib/gspawn.h @@ -2,20 +2,18 @@ * * Copyright 2000 Red Hat, Inc. * - * GLib is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * 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 * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. 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 Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_SPAWN_H__ diff --git a/glib/gstdio.c b/glib/gstdio.c index 611944c5a..831ae98e0 100644 --- a/glib/gstdio.c +++ b/glib/gstdio.c @@ -2,19 +2,18 @@ * * Copyright 2004 Tor Lillqvist * - * GLib is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * 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 * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" diff --git a/glib/gstdio.h b/glib/gstdio.h index a0caf735b..3a0ee37bd 100644 --- a/glib/gstdio.h +++ b/glib/gstdio.h @@ -2,19 +2,18 @@ * * Copyright 2004 Tor Lillqvist * - * GLib is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * GLib is distributed in the hope that it will be useful, + * 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 * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with GLib; see the file COPYING.LIB. If not, - * see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_STDIO_H__ |