From 24b761ae8222fc32eb8de03f256c76c10692c873 Mon Sep 17 00:00:00 2001
From: Amin Bandali <amin.bandali@savoirfairelinux.com>
Date: Mon, 6 Feb 2023 01:52:34 -0500
Subject: [PATCH] misc: Use 'Savoir-faire Linux Inc.' more consistently
Change-Id: Idc99880fedf8bb9f7a89b5b30c3f316dede89759
---
extras/packaging/gnu-linux/rules/debian/copyright | 4 ++--
extras/packaging/gnu-linux/rules/rpm/jami-daemon.spec | 2 +-
extras/packaging/gnu-linux/rules/rpm/jami-libclient.spec | 2 +-
extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec | 2 +-
extras/packaging/gnu-linux/rules/rpm/jami-qt.spec | 2 +-
extras/packaging/gnu-linux/rules/rpm/jami.spec | 2 +-
src/app/mainview/components/ParticipantOverlay.qml | 2 +-
src/app/settingsview/components/PluginPreferencesView.qml | 2 +-
src/app/utils.cpp | 2 +-
src/libclient/containerview.h | 2 +-
src/libclient/qtwrapper/conversions_wrap.hpp | 2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/extras/packaging/gnu-linux/rules/debian/copyright b/extras/packaging/gnu-linux/rules/debian/copyright
index e8ea8bb9d..ee3b0a705 100644
--- a/extras/packaging/gnu-linux/rules/debian/copyright
+++ b/extras/packaging/gnu-linux/rules/debian/copyright
@@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: jami
-Upstream-Contact: Alexandre Viau <alexandre.viau@savoirfairelinux.net>
+Upstream-Contact: Amin Bandali <bandali@gnu.org>
Source: https://dl.jami.net/release/tarballs/
Files: *
Copyright: 2004-2023 Savoir-faire Linux Inc.
@@ -91,7 +91,7 @@ License: BSD-3-Clause
##################
Files: lrc/*
-Copyright: 2009-2023 by Savoir-faire Linux
+Copyright: 2009-2023 by Savoir-faire Linux Inc.
License: LGPL-2.1+
################
diff --git a/extras/packaging/gnu-linux/rules/rpm/jami-daemon.spec b/extras/packaging/gnu-linux/rules/rpm/jami-daemon.spec
index de587dd48..3a9e16793 100644
--- a/extras/packaging/gnu-linux/rules/rpm/jami-daemon.spec
+++ b/extras/packaging/gnu-linux/rules/rpm/jami-daemon.spec
@@ -8,7 +8,7 @@ Release: %{release}%{?dist}
Summary: Daemon component of Jami
Group: Applications/Internet
License: GPLv3+
-Vendor: Savoir-faire Linux
+Vendor: Savoir-faire Linux Inc.
URL: https://jami.net/
Source: jami-%{version}.tar.gz
Requires: jami-daemon = %{version}
diff --git a/extras/packaging/gnu-linux/rules/rpm/jami-libclient.spec b/extras/packaging/gnu-linux/rules/rpm/jami-libclient.spec
index e64cf1220..202fbe1bc 100644
--- a/extras/packaging/gnu-linux/rules/rpm/jami-libclient.spec
+++ b/extras/packaging/gnu-linux/rules/rpm/jami-libclient.spec
@@ -13,7 +13,7 @@ Release: %{release}%{?dist}
Summary: Transitional package for Jami; can be safely removed
Group: Applications/Internet
License: GPLv3+
-Vendor: Savoir-faire Linux
+Vendor: Savoir-faire Linux Inc.
URL: https://jami.net/
Source: jami-%{version}.tar.gz
diff --git a/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec b/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec
index 72e4472d0..0486ebf26 100644
--- a/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec
+++ b/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec
@@ -23,7 +23,7 @@ Release: %{release}%{?dist}
Summary: Library for Jami-qt
Group: Applications/Internet
License: GPLv3+
-Vendor: Savoir-faire Linux
+Vendor: Savoir-faire Linux Inc.
URL: https://jami.net/
Source: jami-libqt-%{version}.tar.xz
Patch0: 0001-qtbug-101201-fatal-error-getcurrenkeyboard.patch
diff --git a/extras/packaging/gnu-linux/rules/rpm/jami-qt.spec b/extras/packaging/gnu-linux/rules/rpm/jami-qt.spec
index 7e7cb955c..eac1dcf9c 100644
--- a/extras/packaging/gnu-linux/rules/rpm/jami-qt.spec
+++ b/extras/packaging/gnu-linux/rules/rpm/jami-qt.spec
@@ -13,7 +13,7 @@ Release: %{release}%{?dist}
Summary: Transitional package for Jami; can be safely removed
Group: Applications/Internet
License: GPLv3+
-Vendor: Savoir-faire Linux
+Vendor: Savoir-faire Linux Inc.
URL: https://jami.net/
Source: jami-%{version}.tar.gz
Requires: jami
diff --git a/extras/packaging/gnu-linux/rules/rpm/jami.spec b/extras/packaging/gnu-linux/rules/rpm/jami.spec
index 41792814b..9e4e755af 100644
--- a/extras/packaging/gnu-linux/rules/rpm/jami.spec
+++ b/extras/packaging/gnu-linux/rules/rpm/jami.spec
@@ -8,7 +8,7 @@ Release: %{release}%{?dist}
Summary: Qt client for Jami
Group: Applications/Internet
License: GPLv3+
-Vendor: Savoir-faire Linux
+Vendor: Savoir-faire Linux Inc.
URL: https://jami.net/
Source: jami-%{version}.tar.gz
Requires: jami-daemon = %{version}
diff --git a/src/app/mainview/components/ParticipantOverlay.qml b/src/app/mainview/components/ParticipantOverlay.qml
index b068ac91a..d83f59a91 100644
--- a/src/app/mainview/components/ParticipantOverlay.qml
+++ b/src/app/mainview/components/ParticipantOverlay.qml
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2020-2023 Savoir-faire Linux
+ * Copyright (C) 2020-2023 Savoir-faire Linux Inc.
* Authors: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
* Albert Babà <albert.babi@savoirfairelinux.com>
* Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
diff --git a/src/app/settingsview/components/PluginPreferencesView.qml b/src/app/settingsview/components/PluginPreferencesView.qml
index 28b5a0e7c..78021d267 100644
--- a/src/app/settingsview/components/PluginPreferencesView.qml
+++ b/src/app/settingsview/components/PluginPreferencesView.qml
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2022-2023 Savoir-faire Linux
+ * Copyright (C) 2022-2023 Savoir-faire Linux Inc.
* Author: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/app/utils.cpp b/src/app/utils.cpp
index 142bebe14..6d2e869db 100644
--- a/src/app/utils.cpp
+++ b/src/app/utils.cpp
@@ -275,7 +275,7 @@ Utils::removeOldVersions()
QString node64 = "HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node";
QString hkcuSoftwareKey = "HKEY_CURRENT_USER\\Software\\";
QString uninstKey = "\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\";
- QString company = "Savoir-Faire Linux";
+ QString company = "Savoir-faire Linux Inc.";
/*
* 1. Configuration reg keys for Ring-x64.
diff --git a/src/libclient/containerview.h b/src/libclient/containerview.h
index 6603d48db..0595b5e27 100644
--- a/src/libclient/containerview.h
+++ b/src/libclient/containerview.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2020-2023 Savoir-faire Linux
+ * Copyright (C) 2020-2023 Savoir-faire Linux Inc.
* Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/libclient/qtwrapper/conversions_wrap.hpp b/src/libclient/qtwrapper/conversions_wrap.hpp
index 963b2bba1..dc125c4a8 100644
--- a/src/libclient/qtwrapper/conversions_wrap.hpp
+++ b/src/libclient/qtwrapper/conversions_wrap.hpp
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright (C) 2014-2023 by Savoir-faire Linux *
+ * Copyright (C) 2014-2023 by Savoir-faire Linux Inc. *
* Author : Philippe Groarke <philippe.groarke@savoirfairelinux.com> *
* *
* This library is free software; you can redistribute it and/or *
--
GitLab