[glib] LGPLv2+ -> LGPLv2.1+: update remaining files



commit eea06815749498edc07e35bbbd71c2fb57e4267d
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Jun 2 12:46:13 2017 +0200

    LGPLv2+ -> LGPLv2.1+: update remaining files
    
    For the files in gio/ (but not in gio/ sub-directories), only the *.[ch]
    files were handled in commit 3bf4a720c315b5015c8d51edf0b458348f796674.
    
    For the modified files in glib/tests/markups/, I've tested that
    `make check` still succeeds.
    
    After this commit,
    $ git grep -in "GNU Library"
    and
    $ git grep -in "Library General"
    return only results in COPYING files and in glib/libcharset/. The latter
    was not updated because it's a copy.
    
    $ git grep -in "version 2" | grep -iv "version 2\.1"
    now doesn't return any LGPL license header.
    - glib-gettextize.in: GPL
    - glib/gen-unicode-tables.pl: GPL
    - glib/gnulib/: a copy
    - glib/libcharset/: a copy
    - m4macros/attributes.m4: GPL
    - po/po2tbl.sed.in: GPL
    - tap-driver.sh: GPL
    - tests/*.pl: GPL
    
    https://bugzilla.gnome.org/show_bug.cgi?id=776504

 gio/data-to-c.pl                              |    2 +-
 gio/gnetworking.h.in                          |    6 +++---
 gio/gnetworking.h.win32                       |    6 +++---
 gio/gopenuriportal.c                          |    6 +++---
 gio/gopenuriportal.h                          |    6 +++---
 gio/org.freedesktop.portal.Documents.xml      |    2 +-
 gio/org.freedesktop.portal.NetworkMonitor.xml |    2 +-
 gio/org.freedesktop.portal.OpenURI.xml        |    2 +-
 gio/org.freedesktop.portal.ProxyResolver.xml  |    2 +-
 glib/tests/markups/valid-14.expected          |    2 +-
 glib/tests/markups/valid-14.gmarkup           |    2 +-
 11 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/gio/data-to-c.pl b/gio/data-to-c.pl
index 69f7436..28c1d71 100755
--- a/gio/data-to-c.pl
+++ b/gio/data-to-c.pl
@@ -5,7 +5,7 @@
 # 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 licence, or (at your option) any later version.
+# version 2.1 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
diff --git a/gio/gnetworking.h.in b/gio/gnetworking.h.in
index 0bb21c3..f9582b9 100644
--- a/gio/gnetworking.h.in
+++ b/gio/gnetworking.h.in
@@ -5,15 +5,15 @@
  * 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.
+ * version 2.1 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
  * Lesser General Public License for more details.
  *
- * 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/>.
+ * 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_NETWORKING_H__
diff --git a/gio/gnetworking.h.win32 b/gio/gnetworking.h.win32
index 61014be..1f45dba 100644
--- a/gio/gnetworking.h.win32
+++ b/gio/gnetworking.h.win32
@@ -5,15 +5,15 @@
  * 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.
+ * version 2.1 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
  * Lesser General Public License for more details.
  *
- * 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/>.
+ * 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_NETWORKING_H__
diff --git a/gio/gopenuriportal.c b/gio/gopenuriportal.c
index fb8289b..1a68cf9 100644
--- a/gio/gopenuriportal.c
+++ b/gio/gopenuriportal.c
@@ -5,15 +5,15 @@
  * 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.
+ * version 2.1 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
  * Lesser General Public License for more details.
  *
- * 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/>.
+ * 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/gio/gopenuriportal.h b/gio/gopenuriportal.h
index 49403b4..00863ef 100644
--- a/gio/gopenuriportal.h
+++ b/gio/gopenuriportal.h
@@ -5,15 +5,15 @@
  * 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.
+ * version 2.1 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
  * Lesser General Public License for more details.
  *
- * 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/>.
+ * 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_OPEN_URI_PORTAL_H__
diff --git a/gio/org.freedesktop.portal.Documents.xml b/gio/org.freedesktop.portal.Documents.xml
index 16da31d..d1cb739 100644
--- a/gio/org.freedesktop.portal.Documents.xml
+++ b/gio/org.freedesktop.portal.Documents.xml
@@ -8,7 +8,7 @@
  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.
+ version 2.1 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
diff --git a/gio/org.freedesktop.portal.NetworkMonitor.xml b/gio/org.freedesktop.portal.NetworkMonitor.xml
index 3022208..8d3a471 100644
--- a/gio/org.freedesktop.portal.NetworkMonitor.xml
+++ b/gio/org.freedesktop.portal.NetworkMonitor.xml
@@ -5,7 +5,7 @@
  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.
+ version 2.1 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
diff --git a/gio/org.freedesktop.portal.OpenURI.xml b/gio/org.freedesktop.portal.OpenURI.xml
index 198d3c2..0cc79d1 100644
--- a/gio/org.freedesktop.portal.OpenURI.xml
+++ b/gio/org.freedesktop.portal.OpenURI.xml
@@ -5,7 +5,7 @@
  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.
+ version 2.1 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
diff --git a/gio/org.freedesktop.portal.ProxyResolver.xml b/gio/org.freedesktop.portal.ProxyResolver.xml
index 0b98b80..c6e9ce9 100644
--- a/gio/org.freedesktop.portal.ProxyResolver.xml
+++ b/gio/org.freedesktop.portal.ProxyResolver.xml
@@ -5,7 +5,7 @@
  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.
+ version 2.1 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
diff --git a/glib/tests/markups/valid-14.expected b/glib/tests/markups/valid-14.expected
index 452595c..d4b70ec 100644
--- a/glib/tests/markups/valid-14.expected
+++ b/glib/tests/markups/valid-14.expected
@@ -10,7 +10,7 @@ ELEMENT 'foo'
  *
  * 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
+ * published by the Free Software Foundation; either version 2.1 of the
  * License, or (at your option) any later version.
  *
  * GLib is distributed in the hope that it will be useful,
diff --git a/glib/tests/markups/valid-14.gmarkup b/glib/tests/markups/valid-14.gmarkup
index 28c47a8..7aee1c5 100644
--- a/glib/tests/markups/valid-14.gmarkup
+++ b/glib/tests/markups/valid-14.gmarkup
@@ -7,7 +7,7 @@
  *
  * 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
+ * published by the Free Software Foundation; either version 2.1 of the
  * License, or (at your option) any later version.
  *
  * GLib is distributed in the hope that it will be useful,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]