sync with plucky archive

debian/changelog

@@ -1,3 +1,21 @@
+calamares (3.3.14-0ubuntu6) plucky; urgency=medium
+
+  * No-change rebuild with Python 3.13 only
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Tue, 04 Mar 2025 16:59:58 +0000
+
+calamares (3.3.14-0ubuntu4) plucky; urgency=medium
+
+  * Move the unversioned .so files to the individual libraries (LP: #2099870).
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 24 Feb 2025 03:30:01 -0600
+
+calamares (3.3.14-0ubuntu3) plucky; urgency=medium
+
+  * Add validate-unpackfsc-1 to the XFAIL list.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 22 Feb 2025 13:11:52 -0600
+
 calamares (3.3.14-0ubuntu2) plucky; urgency=medium
 
   * Add some Breaks/Replaces for the odd case where Calamares is already

debian/control

@@ -62,8 +62,8 @@ Depends: calamares-data (= ${binary:Version}),
          util-linux-extra,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: calamares (<< 3.3.14-0ubuntu1)
-Replaces: calamares (<< 3.3.14-0ubuntu1)
+Breaks: calamares (<< 3.3.14-0ubuntu4)
+Replaces: calamares (<< 3.3.14-0ubuntu4)
 Recommends: btrfs-progs, squashfs-tools
 Description: distribution-independent installer framework
  Calamares is a distribution-independent installer framework.
@@ -80,8 +80,8 @@ Description: distribution-independent installer framework
 Package: calamares-data
 Architecture: all
 Depends: ${misc:Depends}, ${qml6:Depends}
-Breaks: calamares (<< 3.3.14-0ubuntu1)
-Replaces: calamares (<< 3.3.14-0ubuntu1)
+Breaks: calamares (<< 3.3.14-0ubuntu4)
+Replaces: calamares (<< 3.3.14-0ubuntu4)
 Description: data for Calamares
  Calamares is a distribution-independent installer framework.
  .
@@ -103,8 +103,8 @@ Depends: libcalamares3.3 (= ${binary:Version}),
          libcalamaresui3.3 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: calamares (<< 3.3.14-0ubuntu1)
-Replaces: calamares (<< 3.3.14-0ubuntu1)
+Breaks: calamares (<< 3.3.14-0ubuntu4)
+Replaces: calamares (<< 3.3.14-0ubuntu4)
 Description: Development files for Calamares
  Calamares is a distribution-independent installer framework.
  .
@@ -124,8 +124,8 @@ Section: libs
 Architecture: linux-any
 Provides: libcalamares
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: calamares (<< 3.3.14-0ubuntu1)
-Replaces: calamares (<< 3.3.14-0ubuntu1)
+Breaks: calamares (<< 3.3.14-0ubuntu4)
+Replaces: calamares (<< 3.3.14-0ubuntu4)
 Description: Shared object files for Calamares
  Calamares is a distribution-independent installer framework.
  .
@@ -145,8 +145,8 @@ Section: libs
 Architecture: linux-any
 Provides: libcalamaresui
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: calamares (<< 3.3.14-0ubuntu1)
-Replaces: calamares (<< 3.3.14-0ubuntu1)
+Breaks: calamares (<< 3.3.14-0ubuntu4)
+Replaces: calamares (<< 3.3.14-0ubuntu4)
 Description: UI shared object files for Calamares
  Calamares is a distribution-independent installer framework.
  .

debian/libcalamares-dev.install

@@ -1,5 +1,2 @@
 /usr/include/libcalamares/
-/usr/lib/${DEB_HOST_MULTIARCH}/calamares/libcalamares.so
 /usr/lib/${DEB_HOST_MULTIARCH}/cmake/Calamares/
-/usr/lib/${DEB_HOST_MULTIARCH}/libcalamares.so
-/usr/lib/${DEB_HOST_MULTIARCH}/libcalamaresui.so

debian/libcalamares3.3.install

@@ -1 +1,2 @@
-/usr/lib/${DEB_HOST_MULTIARCH}/libcalamares.so.*
+/usr/lib/${DEB_HOST_MULTIARCH}/libcalamares.so*
+/usr/lib/${DEB_HOST_MULTIARCH}/calamares/libcalamares.so

debian/libcalamaresui3.3.install

@@ -1 +1 @@
-/usr/lib/${DEB_HOST_MULTIARCH}/libcalamaresui.so.*
+/usr/lib/${DEB_HOST_MULTIARCH}/libcalamaresui.so*

debian/tests/main

@@ -4,4 +4,4 @@ set -ex
 mkdir build && cd build &&
 cmake .. -DWITH_PYBIND11=OFF -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DBUILD_APPDATA=ON -DBUILD_APPSTREAM=ON -DINSTALL_COMPLETION=ON -DWITH_QT6=ON -DBUILD_TESTING=ON -DBUILD_SCHEMA_TESTING=ON &&
 make -j$(nproc) &&
-ctest -j$(nproc) -V -E '^(test_libcalamaresuipaste|validate-unpackfsc|validate-unpackfsc-unpackfsc|partitioncreatelayoutstest|userstest|hostinfotest)$'
+ctest -j$(nproc) -V -E '^(test_libcalamaresuipaste|validate-unpackfsc|validate-unpackfsc-unpackfsc|validate-unpackfsc-1|partitioncreatelayoutstest|userstest|hostinfotest)$'