[neon/kde/kidentitymanagement/Neon/unstable] debian: kf6ify

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


Git commit 0fdba54169d10b6e10a2d840634e93abddd1e46b by Scarlett Moore.
Committed on 22/09/2023 at 17:54.
Pushed by scarlettmoore into branch 'Neon/unstable'.

kf6ify

D  +0    -1    debian/compat
M  +40   -66   debian/control
A  +8    -0    debian/kpim6-kidentitymanagement-dev.install
A  +8    -0    debian/kpim6-kidentitymanagement.install
A  +1    -0    debian/kpim6-kidentitymanagement.lintian-overrides
R  +0    -0    debian/kpim6-kidentitymanagement.maintscript [from: debian/libkf5identitymanagement5.maintscript - 100% similarity]
R  +0    -0    debian/kpim6-kidentitymanagement.symbols [from: debian/libkf5identitymanagement5.symbols - 100% similarity]
D  +0    -9    debian/libkf5identitymanagement-dev.install
D  +0    -5    debian/libkf5identitymanagement5.install
D  +0    -1    debian/libkf5identitymanagement5.lintian-overrides
D  +0    -2    debian/libkf5identitymanagementwidgets5.install
D  +0    -1    debian/libkf5identitymanagementwidgets5.lintian-overrides
M  +2    -7    debian/rules

https://invent.kde.org/neon/kde/kidentitymanagement/-/commit/0fdba54169d10b6e10a2d840634e93abddd1e46b

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index f3603ac..3f0d6a8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,20 +4,20 @@ 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 (>= 3.0~),
-               debhelper (>= 11),
-               extra-cmake-modules (>= 5.47.0~),
-               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~),
+               debhelper-compat (= 12),
+               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,
                xauth,
                xvfb
 Standards-Version: 4.3.0
@@ -25,74 +25,48 @@ Homepage: https://projects.kde.org/projects/kde/pim/kidentitymanagement
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kidentitymanagement
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kidentitymanagement.git
 
-Package: libkf5identitymanagement-dev
+Package: kpim6-kidentitymanagement-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkf5coreaddons-dev (>= 5.47.0~),
-         libkf5identitymanagement5 (= ${binary:Version}),
-         libkf5identitymanagementwidgets5 (= ${binary:Version}),
-         libkf5pimtextedit-dev (>= 18.08.3~),
+Depends: kf6-kcoreaddons-dev,
+         kpim6-kidentitymanagement (= ${binary:Version}),
+         kpim6-kpimtextedit-dev,
          ${misc:Depends}
 Description: library for managing user identities - development files
  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
+Package: libkf6identitymanagement-dev
+Architecture: all
+Depends: kpim6-kidentitymanagement-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: kpim6-kidentitymanagement
 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: 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: libkf6identitymanagement6
+Architecture: all
+Depends: kpim6-kidentitymanagement
+Description: Dummy transitional
+ Transitional dummy package.
 
-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: libkf6identitymanagementwidgets6
+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: libkf6identitymanagement-data
+Architecture: all
+Depends: kpim6-kidentitymanagement
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/kpim6-kidentitymanagement-dev.install b/debian/kpim6-kidentitymanagement-dev.install
new file mode 100644
index 0000000..8fca05d
--- /dev/null
+++ b/debian/kpim6-kidentitymanagement-dev.install
@@ -0,0 +1,8 @@
+usr/include/KPim6/KIdentityManagement/
+usr/include/KPim6/KIdentityManagementWidgets/
+usr/lib/*/cmake/KPim6IdentityManagement/
+usr/lib/*/libKPim6IdentityManagement.so
+usr/lib/*/libKPim6IdentityManagementWidgets.so
+usr/lib/*/qt6/mkspecs/modules/qt_KIdentityManagement.pri
+usr/lib/*/qt6/mkspecs/modules/qt_KIdentityManagementWidgets.pri
+
diff --git a/debian/kpim6-kidentitymanagement.install b/debian/kpim6-kidentitymanagement.install
new file mode 100644
index 0000000..6962f69
--- /dev/null
+++ b/debian/kpim6-kidentitymanagement.install
@@ -0,0 +1,8 @@
+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
diff --git a/debian/kpim6-kidentitymanagement.lintian-overrides b/debian/kpim6-kidentitymanagement.lintian-overrides
new file mode 100644
index 0000000..31fa512
--- /dev/null
+++ b/debian/kpim6-kidentitymanagement.lintian-overrides
@@ -0,0 +1 @@
+kpim6-kidentitymanagement: package-name-doesnt-match-sonames libKPim6IdentityManagement6
diff --git a/debian/libkf5identitymanagement5.maintscript b/debian/kpim6-kidentitymanagement.maintscript
similarity index 100%
rename from debian/libkf5identitymanagement5.maintscript
rename to debian/kpim6-kidentitymanagement.maintscript
diff --git a/debian/libkf5identitymanagement5.symbols b/debian/kpim6-kidentitymanagement.symbols
similarity index 100%
rename from debian/libkf5identitymanagement5.symbols
rename to debian/kpim6-kidentitymanagement.symbols
diff --git a/debian/libkf5identitymanagement-dev.install b/debian/libkf5identitymanagement-dev.install
deleted file mode 100644
index 28d2330..0000000
--- a/debian/libkf5identitymanagement-dev.install
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/include/KPim5/KIdentityManagement/
-usr/include/KPim5/KIdentityManagementWidgets/
-usr/lib/*/cmake/KF5IdentityManagement/
-usr/lib/*/cmake/KPim5IdentityManagement/
-usr/lib/*/libKPim5IdentityManagement.so
-usr/lib/*/libKPim5IdentityManagementWidgets.so
-usr/lib/*/qt5/mkspecs/modules/qt_KIdentityManagement.pri
-usr/lib/*/qt5/mkspecs/modules/qt_KIdentityManagementWidgets.pri
-usr/share/dbus-1/interfaces/kf5_org.kde.pim.IdentityManager.xml
diff --git a/debian/libkf5identitymanagement5.install b/debian/libkf5identitymanagement5.install
deleted file mode 100644
index 3b4b060..0000000
--- a/debian/libkf5identitymanagement5.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/*/libKPim5IdentityManagement.so.5
-usr/lib/*/libKPim5IdentityManagement.so.5.*
-usr/share/locale/
-usr/share/qlogging-categories5/kidentitymanagement.categories
-usr/share/qlogging-categories5/kidentitymanagement.renamecategories
diff --git a/debian/libkf5identitymanagement5.lintian-overrides b/debian/libkf5identitymanagement5.lintian-overrides
deleted file mode 100644
index c8c10bc..0000000
--- a/debian/libkf5identitymanagement5.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkf5identitymanagement5: package-name-doesnt-match-sonames libKPim5IdentityManagement5
diff --git a/debian/libkf5identitymanagementwidgets5.install b/debian/libkf5identitymanagementwidgets5.install
deleted file mode 100644
index 21f3187..0000000
--- a/debian/libkf5identitymanagementwidgets5.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libKPim5IdentityManagementWidgets.so.5
-usr/lib/*/libKPim5IdentityManagementWidgets.so.5.*
diff --git a/debian/libkf5identitymanagementwidgets5.lintian-overrides b/debian/libkf5identitymanagementwidgets5.lintian-overrides
deleted file mode 100644
index 1ba755f..0000000
--- a/debian/libkf5identitymanagementwidgets5.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkf5identitymanagementwidgets5: package-name-doesnt-match-sonames libKPim5IdentityManagementWidgets5
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index d817a3f..b742750 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,7 @@
 #!/usr/bin/make -f
 
-l10npkgs_firstversion_ok := 4:16.04.3-9~
-
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
-
-override_dh_strip:
-	$(overridden_command) --dbgsym-migration='libkf5identitymanagement-dbg (<= 15.12.0-1~~)'
+%:
+	dh $@ --with kf6 --buildsystem kf6
 
 override_dh_auto_test:
 	- xvfb-run -- dh_auto_test --no-parallel



More information about the Neon-commits mailing list