[neon/kde/calendarsupport/Neon/stable] debian: merge unstable into stable for kde_megarelease_6

[Carlos De Maine]

Git commit 8a3126afdef82e2165d68d960b26aa19da45c05e by Carlos De Maine.
Committed on 15/01/2024 at 10:56.
Pushed by carlosdem into branch 'Neon/stable'.

merge unstable into stable for kde_megarelease_6

M  +98   -59   debian/control

https://invent.kde.org/neon/kde/calendarsupport/-/commit/8a3126afdef82e2165d68d960b26aa19da45c05e

diff --cc debian/control
index 61c8bd9,e17007b..e378af3
--- a/debian/control
+++ b/debian/control
@@@ -31,50 -33,87 +33,87 @@@ Homepage: http://pim.kde.org
  Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/calendarsupport
  Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/calendarsupport.git
  
- Package: libkf5calendarsupport-data
- Architecture: all
- Multi-Arch: foreign
- Depends: ${misc:Depends}
- Breaks: korganizer (<= 4:16.04), ${kde-l10n:all}
- Replaces: korganizer (<= 4:16.04), ${kde-l10n:all}
- Description: KDE PIM Calendar support - data files
-  This library provides calendar support for KDE PIM.
-  .
-  This package provides data files used by the library.
- 
- Package: libkf5calendarsupport-dev
- Section: libdevel
+ Package: kpim6-calendarsupport
  Architecture: any
+ X-Neon-MergedPackage: true
  Multi-Arch: same
- Depends: libkf5akonadi-dev (>= 4:18.08.3~),
-          libkf5akonadicalendar-dev (>= 4:18.08.3~),
-          libkf5calendarsupport5 (= ${binary:Version}),
-          libkf5identitymanagement-dev (>= 18.08.3~),
-          libkf5mime-dev (>= 18.08.3~),
-          qtbase5-dev (>= 5.9.0~),
+ Depends: kf6-kcolorscheme-dev,
           ${misc:Depends},
           ${shlibs:Depends}
- Description: KDE PIM Calendar support - devel files
+ Description: KDE PIM Calendar support - library
   This library provides calendar support for KDE PIM.
   .
-  This package provides development files.
- Breaks: libkf5eventviews-dev (<< 4:17.08)
+  This package provides the shared libraries.
  
- Package: libkf5calendarsupport5
+ Package: kpim6-calendarsupport-dev
  Architecture: any
+ X-Neon-MergedPackage: true
  Multi-Arch: same
- Depends: libkf5calendarsupport-data (= ${source:Version}),
+ Depends: kpim6-akonadi-calendar-dev,
+          kpim6-akonadi-dev,
+          kpim6-calendarsupport (= ${binary:Version}),
+          kpim6-kidentitymanagement-dev,
+          kpim6-kmime-dev,
+          qt6-base-dev,
           ${misc:Depends},
           ${shlibs:Depends}
- Description: KDE PIM Calendar support - library
+ Description: KDE PIM Calendar support - devel files
   This library provides calendar support for KDE PIM.
   .
-  This package provides the shared libraries.
- Breaks: akonadiconsole (<< 4:17.08),
-         kdepim-addons (<< 17.08),
-         kmail (<< 4:17.08),
-         konsolekalendar (<< 4:17.08),
-         korganizer (<< 4:17.08),
-         libkf5eventviews5 (<< 4:17.08),
-         libkf5incidenceeditor-bin (<< 17.08),
-         libkf5incidenceeditor5 (<< 17.08)
+  This package provides development files.
+ 
+ Package: libkpim6calendarsupport6
+ Architecture: all
+ Depends: kpim6-calendarsupport, ${misc:Depends}
+ Replaces: libkf6calendarsupport6, libkf5calendarsupport5
+ Description: Dummy transitional
+  Transitional dummy package.
+ 
+ Package: libkpim6calendarsupport-data
+ Architecture: all
+ Depends: kpim6-calendarsupport, ${misc:Depends}
+ Replaces: libkf6calendarsupport-data, libkf5calendarsupport-data
+ Description: Dummy transitional
+  Transitional dummy package.
+ 
+ Package: libkpim6calendarsupport-dev
+ Architecture: all
+ Depends: kpim6-calendarsupport-dev, ${misc:Depends}
+ Replaces: libkf6calendarsupport-dev, libkf5calendarsupport-dev
+ Description: Dummy transitional
+  Transitional dummy package.
+ 
+ Package: libkf6calendarsupport6
+ Architecture: all
+ Depends: kpim6-calendarsupport, ${misc:Depends}
+ Description: Dummy transitional
+  Transitional dummy package.
+ 
+ Package: libkf6calendarsupport-data
+ Architecture: all
+ Depends: kpim6-calendarsupport, ${misc:Depends}
+ Description: Dummy transitional
+  Transitional dummy package.
+ 
+ Package: libkf6calendarsupport-dev
+ Architecture: all
+ Depends: kpim6-calendarsupport-dev, ${misc:Depends}
+ Description: Dummy transitional
+  Transitional dummy package.
+ Package: libkf5calendarsupport5
+ Architecture: all
+ Depends: kpim6-calendarsupport, ${misc:Depends}
+ Description: Dummy transitional
+  Transitional dummy package.
+ 
+ Package: libkf5calendarsupport-data
+ Architecture: all
+ Depends: kpim6-calendarsupport, ${misc:Depends}
+ Description: Dummy transitional
+  Transitional dummy package.
+ 
+ Package: libkf5calendarsupport-dev
+ Architecture: all
+ Depends: kpim6-calendarsupport-dev, ${misc:Depends}
+ Description: Dummy transitional
 - Transitional dummy package.
++ Transitional dummy package.