diff --git a/debian/changelog b/debian/changelog index 27946ea2..c32032fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +rpi-imager (1.8.5) unstable; urgency=medium + + * Downloader: Fixed #767, which caused terminated downloads + when connections stalled for >60s + * Branding: Update the URL, application name to match branding + guidelines. + + -- Floris Bos Wed, 10 Jan 2024 16:00:00 +0200 + rpi-imager (1.8.4) unstable; urgency=medium * OS customisation: Fixed #531, which caused password entry diff --git a/debian/control b/debian/control index 79de610a..9b99f87a 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 10), cmake, libarchive-dev, liblzma-dev, libcurl4-g qtbase5-dev, qtbase5-dev-tools, qtdeclarative5-dev, libqt5svg5-dev, qttools5-dev, libgnutls28-dev, qml-module-qtquick2, qml-module-qtquick-controls2, qml-module-qtquick-layouts, qml-module-qtquick-templates2, qml-module-qtquick-window2, qml-module-qtgraphicaleffects Standards-Version: 4.1.2 -Homepage: https://www.raspberrypi.org/ +Homepage: https://www.raspberrypi.com/software Package: rpi-imager Architecture: any diff --git a/src/cli.cpp b/src/cli.cpp index 97f00e83..d14303a4 100644 --- a/src/cli.cpp +++ b/src/cli.cpp @@ -30,8 +30,8 @@ Cli::Cli(int &argc, char *argv[]) : QObject(nullptr) #endif _app = new QCoreApplication(argc, argv); _app->setOrganizationName("Raspberry Pi"); - _app->setOrganizationDomain("raspberrypi.org"); - _app->setApplicationName("Imager"); + _app->setOrganizationDomain("raspberrypi.com"); + _app->setApplicationName("Raspberry Pi Imager"); _imageWriter = new ImageWriter; connect(_imageWriter, &ImageWriter::success, this, &Cli::onSuccess); connect(_imageWriter, &ImageWriter::error, this, &Cli::onError); diff --git a/src/config.h b/src/config.h index 65033bca..b3ba96d4 100644 --- a/src/config.h +++ b/src/config.h @@ -8,10 +8,10 @@ /* Repository URL */ -#define OSLIST_URL "https://downloads.raspberrypi.org/os_list_imagingutility_v4.json" +#define OSLIST_URL "https://downloads.raspberrypi.com/os_list_imagingutility_v4.json" /* Time synchronization URL (only used on eglfs QPA platform, URL must be HTTP) */ -#define TIME_URL "http://downloads.raspberrypi.org/os_list_imagingutility_v4.json?time_synchronization" +#define TIME_URL "http://downloads.raspberrypi.com/os_list_imagingutility_v4.json?time_synchronization" /* Phone home the name of images downloaded for image popularity ranking */ #define TELEMETRY_URL "https://rpi-imager-stats.raspberrypi.com/downloads" diff --git a/src/imagewriter.cpp b/src/imagewriter.cpp index 4d6119ae..24792807 100644 --- a/src/imagewriter.cpp +++ b/src/imagewriter.cpp @@ -61,7 +61,7 @@ ImageWriter::ImageWriter(QObject *parent) : QObject(parent), _repo(QUrl(QString(OSLIST_URL))), _dlnow(0), _verifynow(0), _engine(nullptr), _thread(nullptr), _verifyEnabled(false), _cachingEnabled(false), _embeddedMode(false), _online(false), _customCacheFile(false), _trans(nullptr), - _networkManager(this) + _networkManager(this), _settings("Raspberry Pi", "Imager", nullptr) { connect(&_polltimer, SIGNAL(timeout()), SLOT(pollProgress())); diff --git a/src/linux/rpi-imager.desktop b/src/linux/rpi-imager.desktop index 3ff80d7b..5d4a792b 100644 --- a/src/linux/rpi-imager.desktop +++ b/src/linux/rpi-imager.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Version=1.0 -Name=Imager +Name=Raspberry Pi Imager Comment=Raspberry Pi Imager Icon=rpi-imager Exec=rpi-imager %F diff --git a/src/linux/rpi-imager.metainfo.xml.in b/src/linux/rpi-imager.metainfo.xml.in index 6b55caab..c6383616 100644 --- a/src/linux/rpi-imager.metainfo.xml.in +++ b/src/linux/rpi-imager.metainfo.xml.in @@ -30,23 +30,23 @@ rpi-imager.desktop - http://downloads.raspberrypi.org/imager/IMAGING-UTILITY-MAIN.png + http://downloads.raspberrypi.com/imager/IMAGING-UTILITY-MAIN.png Main window - http://downloads.raspberrypi.org/imager/IMAGING-UTILITY-OS.png + http://downloads.raspberrypi.com/imager/IMAGING-UTILITY-OS.png Choose OS - http://downloads.raspberrypi.org/imager/IMAGING-UTILITY-SD.png + http://downloads.raspberrypi.com/imager/IMAGING-UTILITY-SD.png Choose SD - http://downloads.raspberrypi.org/imager/IMAGING-UTILITY-WRITE.png + http://downloads.raspberrypi.com/imager/IMAGING-UTILITY-WRITE.png Write in progress - http://downloads.raspberrypi.org/imager/IMAGING-UTILITY-DONE.png + http://downloads.raspberrypi.com/imager/IMAGING-UTILITY-DONE.png Write done diff --git a/src/main.cpp b/src/main.cpp index 9ebe85cd..b4b5596f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -173,8 +173,8 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); #endif app.setOrganizationName("Raspberry Pi"); - app.setOrganizationDomain("raspberrypi.org"); - app.setApplicationName("Imager"); + app.setOrganizationDomain("raspberrypi.com"); + app.setApplicationName("Raspberry Pi Imager"); app.setWindowIcon(QIcon(":/icons/rpi-imager.ico")); ImageWriter imageWriter; NetworkAccessManagerFactory namf;