[neon/kde/calendarsupport/Neon/unstable] debian: rebase

[Carlos De Maine]

Git commit 32e22aae93b3e4d5070895f326d419ea0b18b034 by Carlos De Maine.
Committed on 26/09/2023 at 05:37.
Pushed by carlosdem into branch 'Neon/unstable'.

rebase

M  +1    -1    debian/changelog
M  +21   -13   debian/control
M  +1    -1    debian/kpim6-calendarsupport.lintian-overrides

https://invent.kde.org/neon/kde/calendarsupport/-/commit/32e22aae93b3e4d5070895f326d419ea0b18b034

diff --git a/debian/changelog b/debian/changelog
index 606b722..830ebad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libkf5calendarsupport (4:23.08.1-0neon) jammy; urgency=medium
+kpim6-calendarsupport (4:23.08.1-0neon) jammy; urgency=medium
 
   * New release
 
diff --git a/debian/control b/debian/control
index 2fd90dc..3faae04 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,13 @@
-Source: libkf5calendarsupport
+Source: kpim6-calendarsupport
 Section: libs
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
                debhelper-compat (= 13),
-               kf6-kcodecs-dev,
                kf6-extra-cmake-modules,
+               kf6-kcalendarcore-dev,
+               kf6-kcodecs-dev,
                kf6-kguiaddons-dev,
                kf6-kholidays-dev,
                kf6-ki18n-dev,
@@ -17,7 +18,6 @@ Build-Depends: cmake,
                kpim6-akonadi-dev,
                kpim6-akonadi-mime-dev,
                kpim6-akonadi-notes-dev,
-               kf6-kcalendarcore-dev,
                kpim6-kcalendarutils-dev,
                kpim6-kidentitymanagement-dev,
                kpim6-kimap-dev,
@@ -25,21 +25,25 @@ Build-Depends: cmake,
                kpim6-pimcommon-dev,
                pkg-kde-tools-neon,
                qt6-base-dev,
-               qt6-tools-dev
+               qt6-tools-dev,
 Standards-Version: 4.6.2
 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: libkf6calendarsupport-data
-Architecture: all
-Depends: kpim6-akonadi-search
-Description: Dummy transitional
- Transitional dummy package.
+Package: kpim6-calendarsupport
+Architecture: any
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: KDE PIM Calendar support - library
+ This library provides calendar support for KDE PIM.
+ .
+ This package provides the shared libraries.
 
 Package: kpim6-calendarsupport-dev
-Section: libdevel
 Architecture: any
+X-Neon-MergedPackage: true
 Multi-Arch: same
 Depends: kpim6-akonadi-calendar-dev,
          kpim6-akonadi-dev,
@@ -64,15 +68,19 @@ Description: KDE PIM Calendar support - library
  This library provides calendar support for KDE PIM.
  .
  This package provides the shared libraries.
+Package: libkf6calendarsupport-data
+Architecture: all
+Depends: kpim6-calendarsupportDescription: Dummy transitional
+ Transitional dummy package.
 
 Package: libkf6calendarsupport-dev
 Architecture: all
-Depends: kpim6-akonadi-search
+Depends: kpim6-calendarsupport-dev
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf6calendarsupport6
 Architecture: all
-Depends: kpim6-akonadi-search
+Depends: kpim6-calendarsupport
 Description: Dummy transitional
- Transitional dummy package.
+ Transitional dummy package.
\ No newline at end of file
diff --git a/debian/kpim6-calendarsupport.lintian-overrides b/debian/kpim6-calendarsupport.lintian-overrides
index 861dc39..85aa8d2 100644
--- a/debian/kpim6-calendarsupport.lintian-overrides
+++ b/debian/kpim6-calendarsupport.lintian-overrides
@@ -1 +1 @@
-kpim6-calendarsupport: package-name-doesnt-match-sonames libKPim5CalendarSupport5
+kpim6-calendarsupport: package-name-doesnt-match-sonames libKPim6CalendarSupport6
\ No newline at end of file