[neon/kde/kcontacts/Neon/unstable] debian: Revert "kf6ify"
Scarlett Moore
null at kde.org
Sun Sep 24 17:32:30 BST 2023
Git commit c672a01f6ef6a99f638a917f23f0c5a2d0667ae6 by Scarlett Moore.
Committed on 24/09/2023 at 18:32.
Pushed by scarlettmoore into branch 'Neon/unstable'.
Revert "kf6ify"
This reverts commit 0b45935d7ae3b1a3f79ec92ce646e15c3b8e7368.
M +40 -39 debian/control
D +0 -5 debian/kpim6-kcontacts.install
A +2 -0 debian/libkf5contacts-data.install
R +0 -0 debian/libkf5contacts-data.maintscript [from: debian/kpim6-kcontacts.maintscript - 100% similarity]
R +3 -3 debian/libkf5contacts-dev.acc.in [from: debian/kpim6-kcontacts-dev.acc.in - 058% similarity]
R +0 -0 debian/libkf5contacts-dev.install [from: debian/kpim6-kcontacts-dev.install - 100% similarity]
A +1 -0 debian/libkf5contacts-doc.install
A +2 -0 debian/libkf5contacts5.install
R +1 -1 debian/libkf5contacts5.symbols [from: debian/kpim6-kcontacts.symbols - 099% similarity]
M +14 -4 debian/rules
https://invent.kde.org/neon/kde/kcontacts/-/commit/c672a01f6ef6a99f638a917f23f0c5a2d0667ae6
diff --git a/debian/control b/debian/control
index 9783edc..fc6ecab 100644
--- a/debian/control
+++ b/debian/control
@@ -6,63 +6,64 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 2.8.12~),
debhelper-compat (= 12),
doxygen,
- kf6-extra-cmake-modules,
- kf6-kcodecs-dev,
- kf6-kconfig-dev,
- kf6-kcoreaddons-dev,
- kf6-ki18n-dev,
- pkg-kde-tools-neon,
- qt6-base-dev,
- qt6-declarative-dev,
- qt6-tools-dev
+ extra-cmake-modules (>= 5.19.0~),
+ libkf5codecs-dev (>= 5.19.0~),
+ libkf5config-dev (>= 5.19.0~),
+ libkf5coreaddons-dev (>= 5.19.0~),
+ libkf5i18n-dev (>= 5.19.0~),
+ pkg-kde-tools (>> 0.15.15),
+ qtbase5-dev (>= 5.4~),
+ qtdeclarative5-dev,
+ qttools5-dev,
+ qttools5-dev-tools
Standards-Version: 3.9.8
Homepage: https://projects.kde.org/projects/kde/pim/kcontacts
Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kcontacts.git
Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kcontacts.git
-Package: kpim6-kcontacts-dev
+Package: libkf5contacts-dev
Section: libdevel
Architecture: any
-Depends: kf6-kcodecs-dev,
- kf6-kconfig-dev,
- kpim6-kcontacts (= ${binary:Version}),
- kf6-kcoreaddons-dev,
- kf6-ki18n-dev,
+Depends: libkf5codecs-dev,
+ libkf5config-dev,
+ libkf5contacts5 (= ${binary:Version}),
+ libkf5coreaddons-dev (>= 5.19.0~),
+ libkf5i18n-dev,
${misc:Depends}
+Recommends: libkf5contacts-doc (= ${source:Version})
Description: development files for kcontacts
KContacts is an API for address book data.
.
This package contains the development files.
-
-Package: libkf6contacts-dev
+Package: libkf5contacts-data
Architecture: all
-Depends: kpim6-kcontacts-dev
-Description: Dummy transitional
- Transitional dummy package.
-
-Package: libkf6contacts-data
-rchitecture: all
-Depends: kpim6-kcontacts
-Description: Dummy transitional
- Transitional dummy package.
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: ${kde-l10n:all}
+Replaces: ${kde-l10n:all}
+Description: data files for kcontacts
+ KContacts is an API for address book data.
+ .
+ This package contains shared data files.
-Package: kpim6-contacts
+Package: libkf5contacts5
Architecture: any
Multi-Arch: same
-Depends: ${misc:Depends},
+Depends: libkf5contacts-data (= ${source:Version}),
+ ${misc:Depends},
${shlibs:Depends}
Description: address book API for KDE frameworks
KContacts is an API for address book data.
-Package: libkf6contacts6
-rchitecture: all
-Depends: kpim6-kcontacts
-Description: Dummy transitional
- Transitional dummy package.
-
-Package: libkf6contacts-doc
-rchitecture: all
-Depends: kpim6-kcontacts
-Description: Dummy transitional
- Transitional dummy package.
+Package: libkf5contacts-doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Section: doc
+Description: address book API for KDE frameworks
+ KContacts is an API for address book data.
+ .
+ This package is part of KDE Frameworks 5.
+ .
+ This package contains the qch documentation files.
diff --git a/debian/kpim6-kcontacts.install b/debian/kpim6-kcontacts.install
deleted file mode 100644
index b9c5a0e..0000000
--- a/debian/kpim6-kcontacts.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/*/Kpim6Contacts.so.6
-usr/lib/*/Kpim6Contacts.so.*.*
-usr/share/locale/
-usr/share/qlogging-categories6/
-usr/share/qt6/doc/Kpim6Contacts.qch
diff --git a/debian/libkf5contacts-data.install b/debian/libkf5contacts-data.install
new file mode 100644
index 0000000..aa0beb7
--- /dev/null
+++ b/debian/libkf5contacts-data.install
@@ -0,0 +1,2 @@
+usr/share/locale/
+usr/share/qlogging-categories5/
diff --git a/debian/kpim6-kcontacts.maintscript b/debian/libkf5contacts-data.maintscript
similarity index 100%
rename from debian/kpim6-kcontacts.maintscript
rename to debian/libkf5contacts-data.maintscript
diff --git a/debian/kpim6-kcontacts-dev.acc.in b/debian/libkf5contacts-dev.acc.in
similarity index 58%
rename from debian/kpim6-kcontacts-dev.acc.in
rename to debian/libkf5contacts-dev.acc.in
index 010020d..bf60410 100644
--- a/debian/kpim6-kcontacts-dev.acc.in
+++ b/debian/libkf5contacts-dev.acc.in
@@ -6,12 +6,12 @@
</version>
<headers>
- /usr/include/Kpim6/KContacts/
- /usr/include/Kpim6/kcontacts_version.h
+ /usr/include/KF5/KContacts/
+ /usr/include/KF5/kcontacts_version.h
</headers>
<libs>
- /usr/lib/@@DEB_HOST_MULTIARCH@@/Kpim6Contacts.so
+ /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5Contacts.so
</libs>
<gcc_options>
diff --git a/debian/kpim6-kcontacts-dev.install b/debian/libkf5contacts-dev.install
similarity index 100%
rename from debian/kpim6-kcontacts-dev.install
rename to debian/libkf5contacts-dev.install
diff --git a/debian/libkf5contacts-doc.install b/debian/libkf5contacts-doc.install
new file mode 100644
index 0000000..fb78e96
--- /dev/null
+++ b/debian/libkf5contacts-doc.install
@@ -0,0 +1 @@
+usr/share/qt5/doc/KF5Contacts.qch
diff --git a/debian/libkf5contacts5.install b/debian/libkf5contacts5.install
new file mode 100644
index 0000000..c7cb8f4
--- /dev/null
+++ b/debian/libkf5contacts5.install
@@ -0,0 +1,2 @@
+usr/lib/*/libKF5Contacts.so.5
+usr/lib/*/libKF5Contacts.so.5.*
diff --git a/debian/kpim6-kcontacts.symbols b/debian/libkf5contacts5.symbols
similarity index 99%
rename from debian/kpim6-kcontacts.symbols
rename to debian/libkf5contacts5.symbols
index 35acdcc..d0a519d 100644
--- a/debian/kpim6-kcontacts.symbols
+++ b/debian/libkf5contacts5.symbols
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 16.04.1 amd64
-Kpim6Contacts.so.6 kpim6contacts6 #MINVER#
+libKF5Contacts.so.5 libkf5contacts5 #MINVER#
(optional=templinst)_ZN12KConfigGroup10writeEntryIiEEvPKcRK5QListIT_E6QFlagsIN11KConfigBase15WriteConfigFlagEE at Base 15.07.90
_ZN9KContacts11CalendarUrl13setParametersERK4QMapI7QString11QStringListE at Base 15.07.90
_ZN9KContacts11CalendarUrl6setUrlERK4QUrl at Base 15.07.90
diff --git a/debian/rules b/debian/rules
index 3d69b0d..b41b9c0 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,16 @@
#!/usr/bin/make -f
-# SPDX-License-Identifier: LGPL-2.0-or-later
-# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
-%:
- dh $@ --with kf6 --buildsystem kf6
+l10npkgs_firstversion_ok := 4:17.03.90-0~
+
+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='libkf5contacts-dbg (<= 15.12.1-1~~)'
+
+override_dh_auto_configure:
+ dh_auto_configure -- -DBUILD_QCH=ON
+
+override_dh_auto_test:
+ # Disable auto test at build time, fakeroot breaks them
+ :
More information about the Neon-commits
mailing list