sync with recent archive uploads

debian/changelog

@@ -1,3 +1,21 @@
+calamares (3.3.0.0-0ubuntu4) noble; urgency=medium
+
+  * Add d/p/support-appstream-1.0.patch
+
+ -- Rik Mills <rikmills@kde.org>  Mon, 18 Dec 2023 20:15:16 +0000
+
+calamares (3.3.0.0-0ubuntu3) noble; urgency=medium
+
+  * Change appstream build depend to libappstreamqt5-dev (>= 1.0.0~).
+
+ -- Rik Mills <rikmills@kde.org>  Mon, 18 Dec 2023 16:24:24 +0000
+
+calamares (3.3.0.0-0ubuntu2) noble; urgency=medium
+
+  * No-change rebuild against appstream 1.0.
+
+ -- Rik Mills <rikmills@kde.org>  Mon, 18 Dec 2023 13:48:07 +0000
+
 calamares (3.3.0.0-0ubuntu1) noble; urgency=medium
 
   * New upstream version.

debian/control

@@ -8,7 +8,7 @@ Build-Depends: cmake,
                debhelper-compat (= 13),
                extra-cmake-modules,
                gettext,
-               libappstreamqt-dev,
+               libappstreamqt5-dev (>= 1.0.0~),
                libkf5config-dev,
                libkf5coreaddons-dev,
                libkf5crash-dev,

debian/patches/series

@@ -1,2 +1,3 @@
 0001-replace-pkexec-by-sudo.patch
 apport-package-hook.patch
+support-appstream-1.0.patch

debian/patches/support-appstream-1.0.patch

@@ -0,0 +1,82 @@
+Description: Support building with appstream 1.0.x
+ Following similar fixes in some KDE packages
+Author: Rik Mills <rikmills@kde.org>
+
+--- a/src/modules/packagechooser/CMakeLists.txt
++++ b/src/modules/packagechooser/CMakeLists.txt
+@@ -25,18 +25,18 @@
+ #
+ option(BUILD_APPSTREAM "Support appstream: items in PackageChooser (requires libappstream-qt)" ON)
+ if(BUILD_APPSTREAM)
+-    find_package(AppStreamQt)
++    find_package(AppStreamQt5)
+     set_package_properties(
+-        AppStreamQt
++        AppStreamQt5
+         PROPERTIES
+         DESCRIPTION "Support for AppStream (cache) data"
+         URL "https://github.com/ximion/appstream"
+         PURPOSE "AppStream provides package data"
+         TYPE OPTIONAL
+     )
+-    if(AppStreamQt_FOUND)
+-        add_definitions(-DHAVE_APPSTREAM_VERSION=${AppStreamQt_VERSION_MAJOR})
+-        list(APPEND _extra_libraries AppStreamQt)
++    if(AppStreamQt5_FOUND)
++        add_definitions(-DHAVE_APPSTREAM_VERSION=${AppStreamQt5_VERSION_MAJOR})
++        list(APPEND _extra_libraries AppStreamQt5)
+         list(APPEND _extra_src ItemAppStream.cpp)
+     endif()
+ endif()
+--- a/src/modules/packagechooser/Config.cpp
++++ b/src/modules/packagechooser/Config.cpp
+@@ -16,7 +16,7 @@
+ 
+ #ifdef HAVE_APPSTREAM_VERSION
+ #include "ItemAppStream.h"
+-#include <AppStreamQt/pool.h>
++#include <AppStreamQt5/pool.h>
+ #include <memory>
+ #endif
+ 
+--- a/src/modules/packagechooser/ItemAppStream.cpp
++++ b/src/modules/packagechooser/ItemAppStream.cpp
+@@ -17,9 +17,9 @@
+ #include "utils/Logger.h"
+ #include "utils/Variant.h"
+ 
+-#include <AppStreamQt/image.h>
+-#include <AppStreamQt/pool.h>
+-#include <AppStreamQt/screenshot.h>
++#include <AppStreamQt5/image.h>
++#include <AppStreamQt5/pool.h>
++#include <AppStreamQt5/screenshot.h>
+ 
+ /// @brief Return number of pixels in a size, for < ordering purposes
+ static inline quint64
+--- a/src/modules/packagechooserq/CMakeLists.txt
++++ b/src/modules/packagechooserq/CMakeLists.txt
+@@ -36,18 +36,18 @@
+ #
+ option(BUILD_APPSTREAM "Support appstream: items in PackageChooser (requires libappstream-qt)" ON)
+ if(BUILD_APPSTREAM)
+-    find_package(AppStreamQt)
++    find_package(AppStreamQt5)
+     set_package_properties(
+-        AppStreamQt
++        AppStreamQt5
+         PROPERTIES
+         DESCRIPTION "Support for AppStream (cache) data"
+         URL "https://github.com/ximion/appstream"
+         PURPOSE "AppStream provides package data"
+         TYPE OPTIONAL
+     )
+-    if(AppStreamQt_FOUND)
+-        add_definitions(-DHAVE_APPSTREAM_VERSION=${AppStreamQt_VERSION_MAJOR})
+-        list(APPEND _extra_libraries AppStreamQt)
++    if(AppStreamQt5_FOUND)
++        add_definitions(-DHAVE_APPSTREAM_VERSION=${AppStreamQt5_VERSION_MAJOR})
++        list(APPEND _extra_libraries AppStreamQt5)
+         list(APPEND _extra_src ${_packagechooser}/ItemAppStream.cpp)
+     endif()
+ endif()