[neon/kde/kmbox/Neon/unstable] debian: more kf6ify
Carlos De Maine
null at kde.org
Sun Sep 24 09:35:15 BST 2023
Git commit 9354aa4c6027027dbb0233365271c1f44a0489a7 by Carlos De Maine.
Committed on 24/09/2023 at 10:35.
Pushed by carlosdem into branch 'Neon/unstable'.
more kf6ify
D +0 -1 debian/compat
M +20 -6 debian/control
R +3 -3 debian/kpim6-mbox-dev.acc.in [from: debian/libkf5mbox-dev.acc.in - 059% similarity]
R +2 -2 debian/kpim6-mbox-dev.install [from: debian/libkf5mbox-dev.install - 056% similarity]
A +3 -0 debian/kpim6-mbox.install
A +1 -0 debian/kpim6-mbox.lintian-overrides
R +0 -0 debian/kpim6-mbox.maintscript [from: debian/libkf5mbox5.maintscript - 100% similarity]
D +0 -3 debian/libkf5mbox5.install
D +0 -1 debian/libkf5mbox5.lintian-overrides
D +0 -38 debian/libkf5mbox5.symbols
https://invent.kde.org/neon/kde/kmbox/-/commit/9354aa4c6027027dbb0233365271c1f44a0489a7
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 7349cf1..82b0c33 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ 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~),
- debhelper (>= 9),
+Build-Depends: cmake,
+ debhelper-compat (= 13),
kf6-extra-cmake-modules,
kpim6-mime-dev,
libboost-dev,
@@ -15,9 +15,10 @@ Homepage: https://projects.kde.org/projects/kde/pim/kmbox
Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kmbox.git
Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kmbox.git
-Package: libkf5mbox-dev
-Section: libdevel
+Package: kpim6-mbox-dev
Architecture: any
+X-Neon-MergedPackage: true
+Multi-Arch: same
Depends: kf6-codecs-dev,
kpim6-mbox (= ${binary:Version}),
kpim6-mime-dev,
@@ -29,12 +30,25 @@ Description: library for handling mbox mailboxes - development files
.
This package contains the development files.
-Package: libkf5mbox5
+Package: kpim6-mbox5
Architecture: any
+X-Neon-MergedPackage: true
Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: misc:Depends, shlibs:Depends
Description: library for handling mbox mailboxes
This is a library for handling mailboxes in mbox format, using a Qt/KMime C++
API.
.
This package is part of the KDE Development Platform PIM libraries module.
+
+Package: libkf5mbox-dev
+Architecture: all
+Depends: kpim6-akonadi-search
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5mbox5
+Architecture: all
+Depends: kpim6-akonadi-search
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/libkf5mbox-dev.acc.in b/debian/kpim6-mbox-dev.acc.in
similarity index 59%
rename from debian/libkf5mbox-dev.acc.in
rename to debian/kpim6-mbox-dev.acc.in
index 7a179dc..aad1c5e 100644
--- a/debian/libkf5mbox-dev.acc.in
+++ b/debian/kpim6-mbox-dev.acc.in
@@ -6,12 +6,12 @@
</version>
<headers>
- /usr/include/KF5/KMbox/
- /usr/include/KF5/kmbox_version.h
+ /usr/include/KPim6/KMbox/
+ /usr/include/KPim6/kmbox_version.h
</headers>
<libs>
- /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5Mbox.so
+ /usr/lib/@@DEB_HOST_MULTIARCH@@/libKPim6Mbox.so
</libs>
<gcc_options>
diff --git a/debian/libkf5mbox-dev.install b/debian/kpim6-mbox-dev.install
similarity index 56%
rename from debian/libkf5mbox-dev.install
rename to debian/kpim6-mbox-dev.install
index e4e8866..7f765cb 100644
--- a/debian/libkf5mbox-dev.install
+++ b/debian/kpim6-mbox-dev.install
@@ -1,4 +1,4 @@
usr/include/KPim6/KMbox/
-usr/lib/*/cmake/KPim5Mbox/
-usr/lib/*/libKPim5Mbox.so
+usr/lib/*/cmake/KPim6Mbox/
+usr/lib/*/libKPim6Mbox.so
usr/lib/*/qt6/mkspecs/modules/qt_KMbox.pri
diff --git a/debian/kpim6-mbox.install b/debian/kpim6-mbox.install
new file mode 100644
index 0000000..ae0daeb
--- /dev/null
+++ b/debian/kpim6-mbox.install
@@ -0,0 +1,3 @@
+usr/lib/*/libKPim6Mbox.so.6
+usr/lib/*/libKPim6Mbox.so.6.*
+usr/share/qlogging-categories6/
diff --git a/debian/kpim6-mbox.lintian-overrides b/debian/kpim6-mbox.lintian-overrides
new file mode 100644
index 0000000..87f3d3a
--- /dev/null
+++ b/debian/kpim6-mbox.lintian-overrides
@@ -0,0 +1 @@
+kpim6-mbox: package-name-doesnt-match-sonames libKPim6Mbox6
diff --git a/debian/libkf5mbox5.maintscript b/debian/kpim6-mbox.maintscript
similarity index 100%
rename from debian/libkf5mbox5.maintscript
rename to debian/kpim6-mbox.maintscript
diff --git a/debian/libkf5mbox5.install b/debian/libkf5mbox5.install
deleted file mode 100644
index 1d17c92..0000000
--- a/debian/libkf5mbox5.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libKPim5Mbox.so.5
-usr/lib/*/libKPim5Mbox.so.5.*
-usr/share/qlogging-categories6/
diff --git a/debian/libkf5mbox5.lintian-overrides b/debian/libkf5mbox5.lintian-overrides
deleted file mode 100644
index f0ada7d..0000000
--- a/debian/libkf5mbox5.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkf5mbox5: package-name-doesnt-match-sonames libKPim5Mbox5
diff --git a/debian/libkf5mbox5.symbols b/debian/libkf5mbox5.symbols
deleted file mode 100644
index 77a751f..0000000
--- a/debian/libkf5mbox5.symbols
+++ /dev/null
@@ -1,38 +0,0 @@
-# SymbolsHelper-Confirmed: 15.12.0 amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64el s390x
-libKF5Mbox.so.5 libkf5mbox5 #MINVER#
- _ZN5KMBox4MBox11readMessageERKNS_9MBoxEntryE at Base 15.07.90
- _ZN5KMBox4MBox11setLockFileERK7QString at Base 15.07.90
- _ZN5KMBox4MBox11setLockTypeENS0_8LockTypeE at Base 15.07.90
- _ZN5KMBox4MBox11setReadOnlyEb at Base 15.07.90
- (optional=boost)_ZN5KMBox4MBox13appendMessageERK14QSharedPointerIN5KMime7MessageEE at Base 15.12.0
- _ZN5KMBox4MBox14readRawMessageERKNS_9MBoxEntryE at Base 15.07.90
- _ZN5KMBox4MBox16setUnlockTimeoutEi at Base 15.07.90
- _ZN5KMBox4MBox18readMessageHeadersERKNS_9MBoxEntryE at Base 15.07.90
- _ZN5KMBox4MBox4loadERK7QString at Base 15.07.90
- _ZN5KMBox4MBox4lockEv at Base 15.07.90
- _ZN5KMBox4MBox4saveERK7QString at Base 15.07.90
- _ZN5KMBox4MBox5purgeERK7QVectorINS_9MBoxEntryEEP5QListI5QPairIS2_S2_EE at Base 15.07.90
- _ZN5KMBox4MBox6unlockEv at Base 15.07.90
- _ZN5KMBox4MBoxC1Ev at Base 15.07.90
- _ZN5KMBox4MBoxC2Ev at Base 15.07.90
- _ZN5KMBox4MBoxD1Ev at Base 15.07.90
- _ZN5KMBox4MBoxD2Ev at Base 15.07.90
- _ZN5KMBox9MBoxEntryC1ERKS0_ at Base 15.07.90
- _ZN5KMBox9MBoxEntryC1Ev at Base 15.07.90
- _ZN5KMBox9MBoxEntryC1Ey at Base 15.07.90
- _ZN5KMBox9MBoxEntryC2ERKS0_ at Base 15.07.90
- _ZN5KMBox9MBoxEntryC2Ev at Base 15.07.90
- _ZN5KMBox9MBoxEntryC2Ey at Base 15.07.90
- _ZN5KMBox9MBoxEntryD1Ev at Base 15.07.90
- _ZN5KMBox9MBoxEntryD2Ev at Base 15.07.90
- _ZN5KMBox9MBoxEntryaSERKS0_ at Base 15.07.90
- _ZNK5KMBox4MBox10isReadOnlyEv at Base 15.07.90
- _ZNK5KMBox4MBox6lockedEv at Base 15.07.90
- _ZNK5KMBox4MBox7entriesERK7QVectorINS_9MBoxEntryEE at Base 15.07.90
- _ZNK5KMBox4MBox8fileNameEv at Base 15.07.90
- _ZNK5KMBox9MBoxEntry11messageSizeEv at Base 15.07.90
- _ZNK5KMBox9MBoxEntry13messageOffsetEv at Base 15.07.90
- _ZNK5KMBox9MBoxEntry13separatorSizeEv at Base 15.07.90
- _ZNK5KMBox9MBoxEntry7isValidEv at Base 15.07.90
- _ZNK5KMBox9MBoxEntryeqERKS0_ at Base 15.07.90
- _ZNK5KMBox9MBoxEntryneERKS0_ at Base 15.07.90
More information about the Neon-commits
mailing list