[neon/kde/pimcommon/Neon/unstable] debian: kf6ify
Carlos De Maine
null at kde.org
Mon Sep 25 10:55:22 BST 2023
Git commit b8d906733b0083941f61378bd2f939ca140a9ee8 by Carlos De Maine.
Committed on 25/09/2023 at 11:55.
Pushed by carlosdem into branch 'Neon/unstable'.
kf6ify
M +1 -1 debian/changelog
M +52 -54 debian/control
R +0 -0 debian/kpim6-pimcommon-dev.install [from: debian/libkf5pimcommon-dev.install - 100% similarity]
A +8 -0 debian/kpim6-pimcommon.install
A +2 -0 debian/kpim6-pimcommon.lintian-overrides
R +0 -0 debian/kpim6-pimcommon.maintscript [from: debian/libkf5pimcommon-data.maintscript - 100% similarity]
D +0 -3 debian/libkf5pimcommon-data.install
D +0 -1 debian/libkf5pimcommon-plugins.install
D +0 -2 debian/libkf5pimcommon5.install
D +0 -2 debian/libkf5pimcommon5.lintian-overrides
D +0 -1 debian/libkf5pimcommonakonadi5.install
D +0 -1 debian/libkf5pimcommonakonadi5.lintian-overrides
https://invent.kde.org/neon/kde/pimcommon/-/commit/b8d906733b0083941f61378bd2f939ca140a9ee8
diff --git a/debian/changelog b/debian/changelog
index 3d61577..6192553 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libkf5pimcommon (4:23.08.1-0neon) jammy; urgency=medium
+kpim6-pimcommon (4:23.08.1-0neon) jammy; urgency=medium
* New release
diff --git a/debian/control b/debian/control
index 903b0c1..8f7dac3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
-Source: libkf5pimcommon
+Source: kpim6-pimcommon
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 (>= 2.8.12~),
+Build-Depends: cmake,
debhelper-compat (= 13),
- kf6-codecs-dev,
kf6-extra-cmake-modules,
kf6-karchive-dev,
+ kf6-kcodecs-dev,
kf6-kconfig-dev,
+ kf6-kcontacts-dev,
kf6-kdbusaddons-dev,
kf6-ki18n-dev,
kf6-knewstuff-dev,
@@ -19,30 +20,29 @@ Build-Depends: cmake (>= 2.8.12~),
kf6-kxmlgui-dev,
kf6-purpose-dev,
kf6-sonnet-dev,
- kpim6-akonadi-contact-dev,
+ kpim6-akonadi-contacts-dev,
kpim6-akonadi-dev,
kpim6-akonadi-mime-dev,
kpim6-akonadi-search-dev,
- kpim6-contacteditor-dev,
- kpim6-contacts-dev,
kpim6-grantleetheme-dev,
- kpim6-imap-dev,
- kpim6-kdepim-dev,
- kpim6-mime-dev,
- kpim6-pimtextedit-dev,
+ kpim6-kimap-dev,
+ kpim6-kmime-dev,
+ kpim6-kpimtextedit-dev,
+ kpim6-libkdepim-dev,
pkg-kde-tools-neon,
qt6-base-dev,
qt6-tools-dev,
- qt6-webchannel-dev | qt6-webchannel-dev,
- qt6-webengine-dev | qt6-webengine-dev,
+ qt6-webchannel-dev,
+ qt6-webengine-dev,
xsltproc
-Standards-Version: 3.9.8
+Standards-Version: 4.6.2
Homepage: http://pim.kde.org/
Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/pimcommon.git
Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/pimcommon.git
-Package: libkf5pimcommon5
+Package: kpim6-pimcommon
Architecture: any
+X-Neon-MergedPackage: true
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Common library for KDE PIM
@@ -51,54 +51,21 @@ Description: Common library for KDE PIM
.
This package provides the shared libraries.
-Package: libkf5pimcommonakonadi5
+Package: kpim6-pimcommon-dev
Architecture: any
+X-Neon-MergedPackage: true
Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Common library for KDE PIM Akonadi
- This library provides the common parts used across different KDE PIM Akonadi
- components.
- .
- This package provides the shared libraries.
-
-Package: libkf5pimcommon-data
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}
-Breaks: storageservicemanager (<= 4:16.04), ${kde-l10n:all}
-Replaces: storageservicemanager (<= 4:16.04), ${kde-l10n:all}
-Description: Common library for KDE PIM - data files
- This library provides the common parts used across different KDE PIM
- components.
- .
- This package provides the data files used by the library.
-
-Package: libkf5pimcommon-plugins
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libkf5libkdepim5 (<= 4:16.04)
-Replaces: libkf5libkdepim5 (<= 4:16.04)
-Description: Common library for KDE PIM - plugins
- This library provides the common parts used across different KDE PIM
- components.
- .
- This package provides the plugins distributed with the library.
-
-Package: libkf5pimcommon-dev
-Section: libdevel
-Architecture: any
Depends: kf6-kconfig-dev,
+ kf6-kcontacts-dev,
kf6-ktextaddons-dev,
kf6-ktextwidgets-dev,
- kpim6-akonadi-contact-dev,
+ kpim6-akonadi-contacts-dev,
kpim6-akonadi-dev,
- kpim6-contacts-dev,
kpim6-grantleetheme-dev,
- kpim6-imap-dev,
- kpim6-kdepim-dev,
+ kpim6-kimap-dev,
+ kpim6-kpimtextedit-dev,
+ kpim6-libkdepim-dev,
kpim6-pimcommon (= ${binary:Version}),
- kpim6-pimtextedit-dev,
${misc:Depends},
${shlibs:Depends}
Description: Common library for KDE PIM - devel files
@@ -106,3 +73,34 @@ Description: Common library for KDE PIM - devel files
components.
.
This package provides the development files.
+
+Package: libkf6pimcommon6
+Architecture: all
+Depends: kpim6-akonadi-search
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6pimcommon-dev
+Architecture: all
+Depends: kpim6-akonadi-search
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6pimcommonakonadi6
+Architecture: all
+Depends: kpim6-akonadi-search
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6pimcommon-data
+Architecture: all
+Depends: kpim6-akonadi-search
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6pimcommon-plugins
+Architecture: all
+Depends: kpim6-akonadi-search
+Description: Dummy transitional
+ Transitional dummy package.
+
diff --git a/debian/libkf5pimcommon-dev.install b/debian/kpim6-pimcommon-dev.install
similarity index 100%
rename from debian/libkf5pimcommon-dev.install
rename to debian/kpim6-pimcommon-dev.install
diff --git a/debian/kpim6-pimcommon.install b/debian/kpim6-pimcommon.install
new file mode 100644
index 0000000..0b6dc94
--- /dev/null
+++ b/debian/kpim6-pimcommon.install
@@ -0,0 +1,8 @@
+usr/share/locale/
+usr/share/qlogging-categories6/pimcommon.categories
+usr/share/qlogging-categories6/pimcommon.renamecategories
+usr/lib/*/libKPim5PimCommon.so.6
+usr/lib/*/libKPim5PimCommon.so.*.*
+usr/lib/*/libKPim5PimCommonAkonadi.so.6
+usr/lib/*/libKPim5PimCommonAkonadi.so.*.*
+usr/lib/*/qt6/plugins/
diff --git a/debian/kpim6-pimcommon.lintian-overrides b/debian/kpim6-pimcommon.lintian-overrides
new file mode 100644
index 0000000..c802f77
--- /dev/null
+++ b/debian/kpim6-pimcommon.lintian-overrides
@@ -0,0 +1,2 @@
+kpim6-pimcommon: package-name-doesnt-match-sonames libKPim6PimCommon6
+kpim6-pimcommon: package-name-doesnt-match-sonames libKPim6PimCommonAkonadi6
diff --git a/debian/libkf5pimcommon-data.maintscript b/debian/kpim6-pimcommon.maintscript
similarity index 100%
rename from debian/libkf5pimcommon-data.maintscript
rename to debian/kpim6-pimcommon.maintscript
diff --git a/debian/libkf5pimcommon-data.install b/debian/libkf5pimcommon-data.install
deleted file mode 100644
index 07d89ef..0000000
--- a/debian/libkf5pimcommon-data.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/locale/
-usr/share/qlogging-categories6/pimcommon.categories
-usr/share/qlogging-categories6/pimcommon.renamecategories
diff --git a/debian/libkf5pimcommon-plugins.install b/debian/libkf5pimcommon-plugins.install
deleted file mode 100644
index bc669e2..0000000
--- a/debian/libkf5pimcommon-plugins.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt6/plugins/
diff --git a/debian/libkf5pimcommon5.install b/debian/libkf5pimcommon5.install
deleted file mode 100644
index 7a7088f..0000000
--- a/debian/libkf5pimcommon5.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libKPim5PimCommon.so.5
-usr/lib/*/libKPim5PimCommon.so.5.*
diff --git a/debian/libkf5pimcommon5.lintian-overrides b/debian/libkf5pimcommon5.lintian-overrides
deleted file mode 100644
index 1d8ebdb..0000000
--- a/debian/libkf5pimcommon5.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libkf5pimcommon5: package-name-doesnt-match-sonames libKPim5PimCommon5
-
diff --git a/debian/libkf5pimcommonakonadi5.install b/debian/libkf5pimcommonakonadi5.install
deleted file mode 100644
index 953c21a..0000000
--- a/debian/libkf5pimcommonakonadi5.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libKPim5PimCommonAkonadi.so.5*
diff --git a/debian/libkf5pimcommonakonadi5.lintian-overrides b/debian/libkf5pimcommonakonadi5.lintian-overrides
deleted file mode 100644
index 2d68614..0000000
--- a/debian/libkf5pimcommonakonadi5.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkf5pimcommonakonadi5: package-name-doesnt-match-sonames libKPim5PimCommonAkonadi5
More information about the Neon-commits
mailing list