[neon/neon-packaging/mauikit-calendar/Neon/unstable] debian: fix patch and rules and transitionals

[Carlos De Maine]

Git commit 926b4caebad9844fe48a6ecad66bae8d246dfa69 by Carlos De Maine.
Committed on 04/12/2023 at 04:21.
Pushed by carlosdem into branch 'Neon/unstable'.

fix patch and rules and transitionals

M  +15   -3    debian/control
M  +2    -2    debian/patches/akonadicontactscore
M  +4    -2    debian/rules

https://invent.kde.org/neon/neon-packaging/mauikit-calendar/-/commit/926b4caebad9844fe48a6ecad66bae8d246dfa69

diff --git a/debian/control b/debian/control
index bdde9bf..cac0540 100644
--- a/debian/control
+++ b/debian/control
@@ -26,8 +26,8 @@ Homepage: https://mauikit.org/
 Package: libmauikitcalendar4
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libmauikitcalendar, libmauikitcalendar1, libmauikitcalendar2, libmauikitcalendar3
-Replaces: libmauikitcalendar, libmauikitcalendar1, libmauikitcalendar2, libmauikitcalendar3
+Provides: libmauikitcalendar3
+Replaces: libmauikitcalendar3
 Description: Calendar support components for Maui applications
  .
  This package contains the mauikit calendar support library.
@@ -53,8 +53,20 @@ Depends: libmauikit,
          qml6-module-qtquick-shapes,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: qml-module-org-kde-mauikit-calendar
+Provides: qml-module-org-kde-mauikit-calendar
 Replaces: qml-module-org-kde-mauikit-calendar
 Description: Calendar support components for Maui applications
  .
  This package contains the mauikit calendar support qml module.
+
+Package: qml-module-org-mauikit-calendar
+Architecture: all
+Depends: qml6-module-org-mauikit-calendar, misc:Depends
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libmauikitcalendar3
+Architecture: all
+Depends: libmauikitcalendar4, misc:Depends
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/patches/akonadicontactscore b/debian/patches/akonadicontactscore
index 63fd351..72decc2 100644
--- a/debian/patches/akonadicontactscore
+++ b/debian/patches/akonadicontactscore
@@ -20,7 +20,7 @@ index f1809ce3af2d3cc166c945743dac947e09bd0e01..33ede9672d2751690feed5fc9f5f44a9
  
      KF${KF_MAJOR_VERSION}::CalendarCore
 -    KF${KF_MAJOR_VERSION}::Contacts
-+    KF${KF_MAJOR_VERSION}::ContactsCore
++    KF${KF_MAJOR_VERSION}::ContactCore
  
      KPim${KF_MAJOR_VERSION}::AkonadiCore
      KPim${KF_MAJOR_VERSION}::AkonadiCalendar
@@ -33,7 +33,7 @@ index f185ad0f7234db505724c6901765a2927fab0200..e56b10cf3f1591b66b19de3e9a5be06e
      KF${KF_MAJOR_VERSION}::CalendarCore
      KF${KF_MAJOR_VERSION}::ConfigWidgets
 -    KF${KF_MAJOR_VERSION}::Contacts
-+    KF${KF_MAJOR_VERSION}::ContactsCore
++    KF${KF_MAJOR_VERSION}::ContactCore
      KF${KF_MAJOR_VERSION}::ItemModels
  
      KPim${KF_MAJOR_VERSION}::AkonadiCore
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index c5e140f..8e3d1b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,12 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 export QT_SELECT=qt6
 
 %:
-	dh $@ --buildsystem=cmake
+	dh $@ --with kf6 --buildsystem kf6
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-	-DBUILD_WITH_QT6=ON
+	-DBUILD_WITH_QT6=ON
\ No newline at end of file