From b8222915f8bee06abc0db279dfc01c319e931d3d Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Thu, 3 Feb 2022 11:48:21 +0100 Subject: [PATCH] Raspberry Pi (Trading) Limited -> Raspberry Pi Ltd Same legal entity, just a company name change. https://find-and-update.company-information.service.gov.uk/company/08207441/filing-history --- CMakeLists.txt | 2 +- MsgPopup.qml | 2 +- OptionsPopup.qml | 2 +- UseSavedSettingsPopup.qml | 2 +- acceleratedcryptographichash.cpp | 2 +- acceleratedcryptographichash.h | 2 +- cli.cpp | 2 +- config.h | 2 +- debian/copyright | 2 +- downloadextractthread.cpp | 2 +- downloadextractthread.h | 2 +- downloadstatstelemetry.cpp | 2 +- downloadstatstelemetry.h | 2 +- downloadthread.cpp | 2 +- downloadthread.h | 2 +- driveformatthread.cpp | 2 +- driveformatthread.h | 2 +- drivelistitem.cpp | 2 +- drivelistitem.h | 2 +- drivelistmodel.cpp | 2 +- drivelistmodel.h | 2 +- drivelistmodelpollthread.cpp | 2 +- drivelistmodelpollthread.h | 2 +- imagewriter.cpp | 2 +- imagewriter.h | 2 +- license.txt | 2 +- linux/linuxdrivelist.cpp | 2 +- linux/udisks2api.cpp | 2 +- linux/udisks2api.h | 2 +- localfileextractthread.cpp | 2 +- localfileextractthread.h | 2 +- mac/macfile.cpp | 2 +- mac/macfile.h | 2 +- main.cpp | 2 +- main.qml | 2 +- nan.h | 2 +- networkaccessmanagerfactory.cpp | 2 +- networkaccessmanagerfactory.h | 2 +- powersaveblocker.cpp | 2 +- powersaveblocker.h | 2 +- windows/rpi-imager.nsi.in | 5 ++--- windows/rpi-imager.rc | 2 +- windows/winfile.cpp | 2 +- windows/winfile.h | 2 +- 44 files changed, 45 insertions(+), 46 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 04499dc..ac932a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -# Copyright (C) 2020 Raspberry Pi (Trading) Limited +# Copyright (C) 2020 Raspberry Pi Ltd cmake_minimum_required(VERSION 3.9.4) if (APPLE) diff --git a/MsgPopup.qml b/MsgPopup.qml index a044b19..1d5ace9 100644 --- a/MsgPopup.qml +++ b/MsgPopup.qml @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ import QtQuick 2.9 diff --git a/OptionsPopup.qml b/OptionsPopup.qml index f54d51e..7be07f4 100644 --- a/OptionsPopup.qml +++ b/OptionsPopup.qml @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2021 Raspberry Pi (Trading) Limited + * Copyright (C) 2021 Raspberry Pi Ltd */ import QtQuick 2.9 diff --git a/UseSavedSettingsPopup.qml b/UseSavedSettingsPopup.qml index 3119176..d1e31c1 100644 --- a/UseSavedSettingsPopup.qml +++ b/UseSavedSettingsPopup.qml @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2021 Raspberry Pi (Trading) Limited + * Copyright (C) 2021 Raspberry Pi Ltd */ import QtQuick 2.9 diff --git a/acceleratedcryptographichash.cpp b/acceleratedcryptographichash.cpp index cade939..d03053f 100644 --- a/acceleratedcryptographichash.cpp +++ b/acceleratedcryptographichash.cpp @@ -2,7 +2,7 @@ * Use OpenSSL for hashing as their code is more optimized than Qt's * * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "acceleratedcryptographichash.h" diff --git a/acceleratedcryptographichash.h b/acceleratedcryptographichash.h index fa917e2..d1c1159 100644 --- a/acceleratedcryptographichash.h +++ b/acceleratedcryptographichash.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include diff --git a/cli.cpp b/cli.cpp index 6b91b8d..7a26f83 100644 --- a/cli.cpp +++ b/cli.cpp @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "cli.h" diff --git a/config.h b/config.h index 8154508..75a4110 100644 --- a/config.h +++ b/config.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ diff --git a/debian/copyright b/debian/copyright index b28e62f..128bdbd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: rpi-imager Source: Files: * -Copyright: 2020 Raspberry Pi (Trading) Limited +Copyright: 2020 Raspberry Pi Ltd License: Apache-2.0 Files: dependencies/mountutils/* dependencies/drivelist/* diff --git a/downloadextractthread.cpp b/downloadextractthread.cpp index 19a5a0e..cd6544b 100644 --- a/downloadextractthread.cpp +++ b/downloadextractthread.cpp @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "downloadextractthread.h" diff --git a/downloadextractthread.h b/downloadextractthread.h index 14fc03b..002b9bf 100644 --- a/downloadextractthread.h +++ b/downloadextractthread.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "downloadthread.h" diff --git a/downloadstatstelemetry.cpp b/downloadstatstelemetry.cpp index 85a1c16..e28971b 100644 --- a/downloadstatstelemetry.cpp +++ b/downloadstatstelemetry.cpp @@ -10,7 +10,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ DownloadStatsTelemetry::DownloadStatsTelemetry(const QByteArray &url, const QByteArray &parentcategory, const QByteArray &osname, bool embedded, const QString &imagerLang, QObject *parent) diff --git a/downloadstatstelemetry.h b/downloadstatstelemetry.h index d5e1c5a..726672d 100644 --- a/downloadstatstelemetry.h +++ b/downloadstatstelemetry.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include diff --git a/downloadthread.cpp b/downloadthread.cpp index 1ce4a06..599e13b 100644 --- a/downloadthread.cpp +++ b/downloadthread.cpp @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "downloadthread.h" diff --git a/downloadthread.h b/downloadthread.h index 479841e..b7275af 100644 --- a/downloadthread.h +++ b/downloadthread.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include diff --git a/driveformatthread.cpp b/driveformatthread.cpp index 67ca49b..5482162 100644 --- a/driveformatthread.cpp +++ b/driveformatthread.cpp @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "driveformatthread.h" diff --git a/driveformatthread.h b/driveformatthread.h index 7dd483b..daa122a 100644 --- a/driveformatthread.h +++ b/driveformatthread.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include diff --git a/drivelistitem.cpp b/drivelistitem.cpp index 31211fe..af3129f 100644 --- a/drivelistitem.cpp +++ b/drivelistitem.cpp @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "drivelistitem.h" diff --git a/drivelistitem.h b/drivelistitem.h index 8e7e889..843f6bb 100644 --- a/drivelistitem.h +++ b/drivelistitem.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include diff --git a/drivelistmodel.cpp b/drivelistmodel.cpp index 1b50515..fa10feb 100644 --- a/drivelistmodel.cpp +++ b/drivelistmodel.cpp @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "drivelistmodel.h" diff --git a/drivelistmodel.h b/drivelistmodel.h index 8216503..e9f2e10 100644 --- a/drivelistmodel.h +++ b/drivelistmodel.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include diff --git a/drivelistmodelpollthread.cpp b/drivelistmodelpollthread.cpp index be2853d..3671586 100644 --- a/drivelistmodelpollthread.cpp +++ b/drivelistmodelpollthread.cpp @@ -4,7 +4,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ DriveListModelPollThread::DriveListModelPollThread(QObject *parent) diff --git a/drivelistmodelpollthread.h b/drivelistmodelpollthread.h index 84823b3..126be7f 100644 --- a/drivelistmodelpollthread.h +++ b/drivelistmodelpollthread.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include diff --git a/imagewriter.cpp b/imagewriter.cpp index fa0f3a1..a88dfdb 100644 --- a/imagewriter.cpp +++ b/imagewriter.cpp @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "imagewriter.h" diff --git a/imagewriter.h b/imagewriter.h index e24ef44..f8bb878 100644 --- a/imagewriter.h +++ b/imagewriter.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include diff --git a/license.txt b/license.txt index 065dbc9..b0afec0 100644 --- a/license.txt +++ b/license.txt @@ -2,7 +2,7 @@ Raspberry Pi Imaging Utility main code license terms == -Copyright (C) 2020 Raspberry Pi (Trading) Limited +Copyright (C) 2020 Raspberry Pi Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/linux/linuxdrivelist.cpp b/linux/linuxdrivelist.cpp index dce1119..7a8c88f 100644 --- a/linux/linuxdrivelist.cpp +++ b/linux/linuxdrivelist.cpp @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "../dependencies/drivelist/src/drivelist.hpp" diff --git a/linux/udisks2api.cpp b/linux/udisks2api.cpp index 7b0360e..527110c 100644 --- a/linux/udisks2api.cpp +++ b/linux/udisks2api.cpp @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "udisks2api.h" diff --git a/linux/udisks2api.h b/linux/udisks2api.h index 2450c96..5cea40f 100644 --- a/linux/udisks2api.h +++ b/linux/udisks2api.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include diff --git a/localfileextractthread.cpp b/localfileextractthread.cpp index 0ac86a3..4cef167 100644 --- a/localfileextractthread.cpp +++ b/localfileextractthread.cpp @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "localfileextractthread.h" diff --git a/localfileextractthread.h b/localfileextractthread.h index 4375e58..3170d81 100644 --- a/localfileextractthread.h +++ b/localfileextractthread.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "downloadextractthread.h" diff --git a/mac/macfile.cpp b/mac/macfile.cpp index 5ccc949..5494ad6 100644 --- a/mac/macfile.cpp +++ b/mac/macfile.cpp @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "macfile.h" diff --git a/mac/macfile.h b/mac/macfile.h index b24dd3d..3a3402b 100644 --- a/mac/macfile.h +++ b/mac/macfile.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include diff --git a/main.cpp b/main.cpp index 498ce1e..5c00457 100644 --- a/main.cpp +++ b/main.cpp @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include diff --git a/main.qml b/main.qml index c1a9b6d..5046c3f 100644 --- a/main.qml +++ b/main.qml @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ import QtQuick 2.9 diff --git a/nan.h b/nan.h index 7de9844..3744349 100644 --- a/nan.h +++ b/nan.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ // Dummy Node.js macros for 3rd party dependencies diff --git a/networkaccessmanagerfactory.cpp b/networkaccessmanagerfactory.cpp index 35b3080..5581f33 100644 --- a/networkaccessmanagerfactory.cpp +++ b/networkaccessmanagerfactory.cpp @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "networkaccessmanagerfactory.h" diff --git a/networkaccessmanagerfactory.h b/networkaccessmanagerfactory.h index de240b1..fbae7e5 100644 --- a/networkaccessmanagerfactory.h +++ b/networkaccessmanagerfactory.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include diff --git a/powersaveblocker.cpp b/powersaveblocker.cpp index 3c724bc..16ad9a6 100644 --- a/powersaveblocker.cpp +++ b/powersaveblocker.cpp @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "powersaveblocker.h" diff --git a/powersaveblocker.h b/powersaveblocker.h index 5569612..55eca34 100644 --- a/powersaveblocker.h +++ b/powersaveblocker.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include diff --git a/windows/rpi-imager.nsi.in b/windows/rpi-imager.nsi.in index 2901248..6afa54f 100644 --- a/windows/rpi-imager.nsi.in +++ b/windows/rpi-imager.nsi.in @@ -5,11 +5,10 @@ ############################################################################################ !define APP_NAME "Raspberry Pi Imager" -!define COMP_NAME "Raspberry Pi" -#!define WEB_SITE "https://www.raspberrypi.org/" +!define COMP_NAME "Raspberry Pi Ltd" !define VERSION "@IMAGER_VERSION_STR@" !define INSTALLER_NAME "imager-${VERSION}.exe" -!define COPYRIGHT "Raspberry Pi" +!define COPYRIGHT "Raspberry Pi Ltd" !define DESCRIPTION "Raspberry Pi Imager" !define MAIN_APP_EXE "rpi-imager.exe" !define INSTALL_TYPE "SetShellVarContext current" diff --git a/windows/rpi-imager.rc b/windows/rpi-imager.rc index f55d120..84f19b2 100644 --- a/windows/rpi-imager.rc +++ b/windows/rpi-imager.rc @@ -11,7 +11,7 @@ PRODUCTVERSION IMAGER_VERSION_CSV { BLOCK "040904b0" { - VALUE "CompanyName", "Raspberry Pi" + VALUE "CompanyName", "Raspberry Pi Ltd" VALUE "FileDescription", "Raspberry Pi Imager" } } diff --git a/windows/winfile.cpp b/windows/winfile.cpp index 580b772..70e5b72 100644 --- a/windows/winfile.cpp +++ b/windows/winfile.cpp @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include "winfile.h" diff --git a/windows/winfile.h b/windows/winfile.h index b72f7cb..f5fa359 100644 --- a/windows/winfile.h +++ b/windows/winfile.h @@ -3,7 +3,7 @@ /* * SPDX-License-Identifier: Apache-2.0 - * Copyright (C) 2020 Raspberry Pi (Trading) Limited + * Copyright (C) 2020 Raspberry Pi Ltd */ #include