From 3e5c60763887f0f464de7264bd3c3548d528f6ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Sat, 16 Dec 2017 04:08:13 +0100
Subject: [PATCH] generate_contributions.py: review links

- use https if possible
- update links
- remove one nonexistent link
- use link to KDE's oxygen icons because these are licensed under the LGPL
---
 lib/CREDITS                   |  5 ++---
 lib/generate_contributions.py | 16 ++++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/CREDITS b/lib/CREDITS
index 8d7ca4582d..1575ab5183 100644
--- a/lib/CREDITS
+++ b/lib/CREDITS
@@ -259,7 +259,6 @@
 @bCarmen Kauffmann
    Original name that is now two characters shorter
 @bKDE Artists
-@ihttp://artist.kde.org/
    Authors of several of the icons LyX uses
 @bAndreas Klostermann
 @iE-mail: andreas_klostermann () web ! de
@@ -319,7 +318,7 @@
 @iE-mail: ling () caltech ! edu
    Added native support for \makebox to mathed. Several bug fixes, both to the source code and to the llncs layout file
 @bLibreOffice Team
-@ihttp://www.libreoffice.org/
+@ihttps://www.libreoffice.org/
    Libreoffice Icon Theme
 @bTomasz Łuczak
 @iE-mail: tlu () technodat ! com ! pl
@@ -388,7 +387,7 @@
 @iE-mail: lyx-devel () oak-tree ! us>
    Improvements to the outliner.
 @bOxygen Team
-@ihttp://www.oxygen-icons.org/
+@ihttps://techbase.kde.org/Projects/Oxygen
    Oxygen Icon Theme
 @bCarl Ollivier-Gooch
 @iE-mail: cfog () mech ! ubc ! ca
diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index 115981c64a..2bb442cd88 100755
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -53,7 +53,7 @@ class contributor:
      def as_txt_credits(self):
           result = [ '@b%s\n' % self.name ]
           if len(self.contact) != 0:
-               if self.contact.find("http") != -1:
+               if self.contact.find("https") != -1:
                     result.append('@i%s\n' % self.contact)
                else:
                     result.append('@iE-mail: %s\n' % self.contact)
@@ -163,7 +163,7 @@ $email = str_replace(' () ', '@', $email);
 $email = str_replace(' ! ', '.', $email);
 
 if (isset($email) && $email != "") {
-        if (strncasecmp($email,"http",4) == 0)
+        if (strncasecmp($email,"https",4) == 0)
             $output =$output. "<dt><b>[[${email} | ${name}]]</b>";
          else
             $output=$output. "<dt><b>[[mailto:${email} | ${name}]]</b>";
@@ -234,7 +234,7 @@ $output=$output. "
 
 if (isset($msg_ref) && $msg_ref != "") {
         $msg_ref = htmlspecialchars("$msg_ref");
-        $output=$output. "[[http://marc.info/?l=lyx-devel&amp;" . ${msg_ref} . "|" . ${msg_title} . "]]";
+        $output=$output. "[[https://marc.info/?l=lyx-devel&amp;" . ${msg_ref} . "|" . ${msg_title} . "]]";
 } else {
         $output=$output. "${msg_title}";
 }
@@ -251,7 +251,7 @@ function blanket_output() {
 $output=$output."<p>
      The following people hereby grant permission to license their
      contributions to LyX under the
-     [[http://www.opensource.org/licenses/gpl-license.php |
+     [[https://opensource.org/licenses/gpl-license |
      Gnu General Public License]], version 2 or later.
 </p>
 
@@ -269,7 +269,7 @@ $output=$output."
 <p>
      The following people hereby grant permission to license their
      contributions to LyX under the
-     [[http://www.opensource.org/licenses/artistic-license-2.0.php |
+     [[https://opensource.org/licenses/Artistic-2.0 |
      Artistic License 2]].
 </p>
 
@@ -1024,7 +1024,7 @@ contributors = [
                  u"Original name that is now two characters shorter"),
 
      contributor(u"KDE Artists",
-                 "http://artist.kde.org/",
+                 "",
                  "",
                  "",
                  "",
@@ -1184,7 +1184,7 @@ contributors = [
                  u"Added native support for \makebox to mathed. Several bug fixes, both to the source code and to the llncs layout file"),
 
      contributor(u"LibreOffice Team",
-                 "http://www.libreoffice.org/",
+                 "https://www.libreoffice.org/",
                  "LGPL",
                  "",
                  "",
@@ -1368,7 +1368,7 @@ contributors = [
                  u"Improvements to the outliner."),
 
      contributor(u"Oxygen Team",
-                 "http://www.oxygen-icons.org/",
+                 "https://techbase.kde.org/Projects/Oxygen",
                  "LGPL",
                  "",
                  "",