[neon/kde/kidentitymanagement/Neon/unstable] debian: Merge branch 'Neon/release' into Neon/unstable

Scarlett Moore null at kde.org
Fri Sep 22 17:05:25 BST 2023


Git commit bca4e308a98ffb7e6da4463473ee2aeb114a9f6d by Scarlett Moore.
Committed on 22/09/2023 at 18:04.
Pushed by scarlettmoore into branch 'Neon/unstable'.

Merge branch 'Neon/release' into Neon/unstable

M  +60   -88   debian/control
M  +11   -0    debian/kpim6-kidentitymanagement.install

https://invent.kde.org/neon/kde/kidentitymanagement/-/commit/bca4e308a98ffb7e6da4463473ee2aeb114a9f6d

diff --cc debian/control
index bd67656,3f0d6a8..943d5b8
--- a/debian/control
+++ b/debian/control
@@@ -4,23 -4,20 +4,22 @@@ Priority: optiona
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 3.0~),
-                debhelper (>= 11),
-                extra-cmake-modules (>= 5.47.0~),
+                debhelper-compat (= 12),
 +               kirigami-addons-dev,
-                libkf5codecs-dev (>= 5.47.0~),
-                libkf5completion-dev (>= 5.47.0~),
-                libkf5config-dev (>= 5.47.0~),
-                libkf5coreaddons-dev (>= 5.47.0~),
-                libkf5iconthemes-dev (>= 5.47.0~),
-                libkf5kio-dev (>= 5.47.0~),
-                libkf5ktextaddons-dev,
-                libkf5pimtextedit-dev (>= 21.12.0),
-                libkf5textwidgets-dev (>= 5.47.0~),
-                libkf5xmlgui-dev (>= 5.47.0~),
-                pkg-kde-tools (>> 0.15.15),
-                qtbase5-dev (>= 5.9.0~),
-                qtdeclarative5-dev,
-                qtquickcontrols2-5-dev,
+                kf6-extra-cmake-modules,
+                kf6-kcodecs-dev,
+                kf6-kcompletion-dev,
+                kf6-kconfig-dev,
+                kf6-kcoreaddons-dev,
+                kf6-kiconthemes-dev,
+                kf6-kio-dev,
+                kf6-ktextaddons-dev,
+                kf6-kpimtextedit-dev,
+                kf6-ktextwidgets-dev,
+                kf6-kxmlgui-dev,
+                pkg-kde-tools-neon,
+                qt6-base-dev,
++               qt6-declarative-dev,
                 xauth,
                 xvfb
  Standards-Version: 4.3.0
@@@ -42,83 -37,36 +39,58 @@@ Description: library for managing user 
   This library provides an API for managing user identities.
   .
   This package contains the development files.
- Breaks: libkf5alarmcalendar-dev (<< 4:17.08),
-         libkf5calendarsupport-dev (<< 4:17.08),
-         libkf5incidenceeditor-dev (<< 17.08),
-         libkf5messagecomposer-dev (<< 4:17.08)
  
- Package: libkf5identitymanagement5
- Architecture: any
- Multi-Arch: same
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Breaks: accountwizard (<< 4:17.08),
-         kalarm (<< 4:17.08),
-         kdepim-runtime (<< 4:17.08),
-         kmail (<< 4:17.08),
-         kontact (<< 4:17.08),
-         korganizer (<< 4:17.08),
-         libkf5akonadicalendar5 (<< 4:17.08),
-         libkf5alarmcalendar5 (<< 4:17.08),
-         libkf5calendarsupport5 (<< 4:17.08),
-         libkf5calendarutils5 (<< 4:17.08),
-         libkf5incidenceeditor5 (<< 17.08),
-         libkf5ksieveui5 (<< 4:17.08),
-         libkf5messagecomposer5 (<< 4:17.08),
-         libkf5messagecore5 (<< 4:17.08),
-         libkf5templateparser5 (<< 4:17.08),
-         ${kde-l10n:all},
-         libkf5identitymanagement-data (<< 22.04)
- Replaces: libkf5identitymanagement-data (<< 22.04), ${kde-l10n:all}
- Description: library for managing user identities
-  This library provides an API for managing user identities.
-  .
-  This package is part of the KDE Development Platform PIM libraries module.
+ Package: libkf6identitymanagement-dev
+ Architecture: all
+ Depends: kpim6-kidentitymanagement-dev
+ Description: Dummy transitional
+  Transitional dummy package.
  
- Package: libkf5identitymanagementquick5
+ Package: kpim6-kidentitymanagement
  Architecture: any
  Multi-Arch: same
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Description: library for managing user identities widgets
-  This library provides an API for managing user identities with widgets.
-  .
-  This package is part of the KDE Development Platform PIM libraries module.
- 
- Package: libkf5identitymanagementwidgets5
- Architecture: any
- Multi-Arch: same
--Depends: ${misc:Depends}, ${shlibs:Depends}
- Description: library for managing user identities widgets
-  This library provides an API for managing user identities with widgets.
-  .
-  This package is part of the KDE Development Platform PIM libraries module.
- 
- Package: qml-module-org-kde-kidentitymanagement
- Architecture: any
 +Depends: qml-module-org-kde-kirigami2,
 +         qml-module-qtquick-controls2,
 +         qml-module-qt-labs-platform,
 +         qml-module-org-kde-kirigamiaddons,
-          ${misc:Depends},
-          ${shlibs:Depends}
++         ${misc:Depends}, ${shlibs:Depends}
  Description: library for managing user identities
   This library provides an API for managing user identities.
   .
   This package is part of the KDE Development Platform PIM libraries module.
  
- Package: libkf5identitymanagement-data
- Architecture: any
- Multi-Arch: same
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Priority: extra
- Section: oldlibs
- Description: transitional
-  Transitional dummy package which can be removed
++Package: libkf6identitymanagementquick6
++Architecture: all
++Depends: kpim6-kidentitymanagement
++Description: Dummy transitional
++ Transitional dummy package.
 +
- Package: libkf5identitymanagement5abi1
- Architecture: any
- Multi-Arch: same
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Priority: extra
- Section: oldlibs
- Description: transitional
-  Transitional dummy package which can be removed
++Package: libkf6identitymanagementwidgets6
++Architecture: all
++Depends: kpim6-kidentitymanagement
++Description: Dummy transitional
++ Transitional dummy package.
++
++Package: qml6-module-org-kde-kidentitymanagement
++Architecture: all
++Depends: kpim6-kidentitymanagement
++Description: Dummy transitional
++ Transitional dummy package.
++
+ Package: libkf6identitymanagement6
+ Architecture: all
+ Depends: kpim6-kidentitymanagement
+ Description: Dummy transitional
+  Transitional dummy package.
+ 
+ Package: libkf6identitymanagementwidgets6
+ Architecture: all
+ Depends: kpim6-kidentitymanagement
+ Description: Dummy transitional
+  Transitional dummy package.
+ 
+ Package: libkf6identitymanagement-data
+ Architecture: all
+ Depends: kpim6-kidentitymanagement
+ Description: Dummy transitional
+  Transitional dummy package.
diff --cc debian/kpim6-kidentitymanagement.install
index 0000000,6962f69..a07c522
mode 000000,100644..100644
--- a/debian/kpim6-kidentitymanagement.install
+++ b/debian/kpim6-kidentitymanagement.install
@@@ -1,0 -1,8 +1,11 @@@
+ usr/lib/*/libKPim6IdentityManagement.so.6
+ usr/lib/*/libKPim6IdentityManagement.so.*.*
+ usr/share/locale/
+ usr/share/qlogging-categories6/kidentitymanagement.categories
+ usr/share/qlogging-categories6/kidentitymanagement.renamecategories
+ usr/lib/*/libKPim6IdentityManagementWidgets.so.6
+ usr/lib/*/libKPim6IdentityManagementWidgets.so.*.*
+ usr/share/dbus-1/interfaces/kf6_org.kde.pim.IdentityManager.xml
++usr/lib/*/libKPim5IdentityManagementQuick.so.6
++usr/lib/*/libKPim5IdentityManagementQuick.so.*.*
++usr/lib/*/qt6/qml/org/kde/kidentitymanagement/


More information about the Neon-commits mailing list