[neon/kde/libkgapi/Neon/unstable] debian: First attempt dual support qt5, qt6
Scarlett Moore
null at kde.org
Tue Oct 3 16:24:31 BST 2023
Git commit 6fa4967b87b0d07b007dac6bf453c4e8bb0f1608 by Scarlett Moore.
Committed on 03/10/2023 at 17:24.
Pushed by scarlettmoore into branch 'Neon/unstable'.
First attempt dual support qt5, qt6
M +161 -76 debian/control
A +1 -0 debian/libkgapitasks5.lintian-overrides
A +1 -0 debian/libkpimapilatitude.lintian-overrides
A +2 -0 debian/libkpimgapi-data.install
A +1 -0 debian/libkpimgapi-data.maintscript
A +19 -0 debian/libkpimgapi-dev.install
A +1 -0 debian/libkpimgapiblogger5abi1.install
A +1 -0 debian/libkpimgapiblogger5abi1.lintian-overrides
A +2 -0 debian/libkpimgapicalendar5.install
A +1 -0 debian/libkpimgapicalendar5.lintian-overrides
A +0 -0 debian/libkpimgapicalendar5.symbols
A +2 -0 debian/libkpimgapicore5.install
A +1 -0 debian/libkpimgapicore5.lintian-overrides
A +2 -0 debian/libkpimgapidrive5.install
A +1 -0 debian/libkpimgapidrive5.lintian-overrides
M +16 -1 debian/rules
https://invent.kde.org/neon/kde/libkgapi/-/commit/6fa4967b87b0d07b007dac6bf453c4e8bb0f1608
diff --git a/debian/control b/debian/control
index 09a58793..0d446491 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,12 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake,
debhelper-compat (= 13),
+ extra-cmake-modules (>= 5.47.0~),
+ libkf5calendarcore-dev (>= 4:18.08.3~),
+ libkf5contacts-dev (>= 4:18.08.3~),
+ libkf5kio-dev (>= 5.47.0~),
+ libkf5wallet-dev (>= 5.47.0~),
+ libkf5windowsystem-dev (>= 5.47.0~),
kf6-extra-cmake-modules,
kf6-kcalendarcore-dev,
kf6-kcontacts-dev,
@@ -13,6 +19,11 @@ Build-Depends: cmake,
kf6-kwindowsystem-dev,
libsasl2-dev,
libxml2-utils,
+ pkg-kde-tools (>= 0.5.0),
+ qtbase5-dev (>= 5.9.0~),
+ qttools5-dev,
+ qttools5-dev-tools,
+ qtwebengine5-dev (>= 5.9.0~),
pkg-kde-tools-neon,
qt6-base-dev,
qt6-tools-dev,
@@ -24,7 +35,139 @@ Homepage: https://projects.kde.org/libkgapi
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/libkgapi.git
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/libkgapi
-Package: kpim6-libkgapi-dev
+Package: libkf5gapi-data
+Architecture: any
+Multi-Arch: foreign
+Depends: libkpimgapi-data, ${misc:Depends}, ${shlibs:Depends}
+Section: oldlibs
+Description: Google API library for KDE -- transitional
+ LibKGAPI (previously called LibKGoogle) is a C++ library that implements APIs
+ for various Google services.
+ .
+ This is a transitional package which can be safely removed.
+
+Package: libkpimgapi-data
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: libkf5gapi-data (<< 16.12)
+Breaks: libkf5gapi-data (<< 16.12)
+Replaces: libkf5gapi-data (<< 16.12)
+Description: Google API library for KDE -- data files
+ LibKGAPI (previously called LibKGoogle) is a C++ library that implements APIs
+ for various Google services.
+ .
+ This package contains data files.
+
+Package: libkpimgapi-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: libkf5calendarcore-dev (>= 4:18.08.3~),
+ libkf5contacts-dev (>= 4:18.08.3~),
+ libkpimgapiblogger5abi1 (= ${binary:Version}),
+ libkpimgapicalendar5 (= ${binary:Version}),
+ libkpimgapicore5 (= ${binary:Version}),
+ libkpimgapidrive5 (= ${binary:Version}),
+ libkpimgapilatitude5 (= ${binary:Version}),
+ libkpimgapimaps5 (= ${binary:Version}),
+ libkpimgapipeople5 (= ${binary:Version}),
+ libkpimgapitasks5 (= ${binary:Version}),
+Breaks: libkf5gapi-dev (<< 16.12)
+Replaces: libkf5gapi-dev (<< 16.12)
+Description: Google API library for KDE -- development files
+ LibKGAPI (previously called LibKGoogle) is a C++ library that implements APIs
+ for various Google services.
+ This package contains development files for building software that uses
+ the LibKGAPI library.
+
+Package: libkpimgapiblogger5abi1
+X-Debian-ABI: 1
+X-CMake-Target: KPimGAPIBlogger
+Architecture: any
+Multi-Arch: same
+Depends: libkpimgapi-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: library to integrate with Google Blogger service API
+ This package is part of libkgapi.
+
+Package: libkpimgapicalendar5
+Architecture: any
+Multi-Arch: same
+Depends: libkpimgapi-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: library to integrate with Google Calendar service API
+ This package is part of libkgapi.
+
+Package: libkpimgapicontacts5
+Architecture: any
+Multi-Arch: same
+Depends: libkpimgapi-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: library to integrate with Google Contacts service API
+ This package is part of libkgapi.
+
+Package: libkpimgapicore5
+Architecture: any
+Multi-Arch: same
+Depends: libkpimgapi-data (= ${source:Version}),
+ libqt5webengine5,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Breaks: ${kde-l10n:all}
+Replaces: ${kde-l10n:all}
+Description: core library to integrate with Google service APIs
+ This package is part of libkgapi.
+
+Package: libkpimgapidrive5
+Architecture: any
+Multi-Arch: same
+Depends: libkpimgapi-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: library to integrate with Google Drive service API
+ This package is part of libkgapi.
+
+Package: libkpimgapilatitude5
+Architecture: any
+Multi-Arch: same
+Depends: libkpimgapi-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: library to integrate with Google Latitude service API
+ This package is part of libkgapi.
+
+Package: libkpimgapimaps5
+Architecture: any
+Multi-Arch: same
+Depends: libkpimgapi-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: library to integrate with Google Maps service API
+ This package is part of libkgapi.
+
+Package: libkpimgapipeople5
+Architecture: any
+Multi-Arch: same
+Depends: libkpimgapi-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: library to integrate with Google People service API
+ This package is part of libkgapi.
+
+Package: libkpimgapitasks5
+Architecture: any
+Multi-Arch: same
+Depends: libkpimgapi-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: library to integrate with Google Tasks service API
+ This package is part of libkgapi.
+
+Package: kpim6-kpimgapi-dev
Section: libdevel
X-Neon-MergedPackage: true
Architecture: any
@@ -51,80 +194,22 @@ Depends: qt6-webengine,
Description: core library to integrate with Google service APIs
This package is part of libkgapi.
-Package: libkf6gapi-data
-Architecture: all
-Depends: kpim6-libkgapi
-Description: Dummy transitional
- Transitional dummy package.
-
-Package: libkpimgapi-data
-Architecture: all
-Depends: kpim6-libkgapi
-Description: Dummy transitional
- Transitional dummy package.
-
-Package: libkpimgapi-dev
-Architecture: all
-Depends: kpim6-libkgapi-dev
-Description: Dummy transitional
- Transitional dummy package.
-
-Package: libkpimgapiblogger6abi1
-Architecture: all
-Depends: kpim6-libkgapi
-Description: Dummy transitional
- Transitional dummy package.
-
-Package: libkpimgapicalendar
-Architecture: all
-Depends: kpim6-libkgapi
-Description: Dummy transitional
- Transitional dummy package.
-
-Package: libkpimgapicontacts6
-Architecture: all
-Depends: kpim6-libkgapi
-Description: Dummy transitional
- Transitional dummy package.
-
-Package: libkpimgapicore6
-Architecture: all
-Depends: kpim6-libkgapi
-Description: Dummy transitional
- Transitional dummy package.
-
-Package: libkpimgapidrive6
-Architecture: all
-Depends: kpim6-libkgapi
-Description: Dummy transitional
- Transitional dummy package.
-
-Package: libkpimgapilatitude6
-Architecture: all
-Depends: kpim6-libkgapi
-Description: Dummy transitional
- Transitional dummy package.
-
-Package: libkpimgapimaps6
-Architecture: all
-Depends: kpim6-libkgapi
-Description: Dummy transitional
- Transitional dummy package.
-
-Package: libkpimgapipeople6
-Architecture: all
-Depends: kpim6-libkgapi
-Description: Dummy transitional
- Transitional dummy package.
-
-Package: libkpimgapitasks6
-Architecture: all
-Depends: kpim6-libkgapi
-Description: Dummy transitional
- Transitional dummy package.
+Package: libsasl2-modules-kdexoauth2-6
+Architecture: any
+Multi-Arch: same
+Depends: kpim6-kpimgapi (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: library to integrate with Cyrus SASL
+ This package is part of libkgapi.
Package: libsasl2-modules-kdexoauth2
-Architecture: all
-Depends: kpim6-libkgapi
-Description: Dummy transitional
- Transitional dummy package.
+Architecture: any
+Multi-Arch: same
+Depends: libkpimgapi-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Breaks: kdepim-runtime (<< 4:18.04.9)
+Replaces: kdepim-runtime (<< 4:18.04.9)
+Description: library to integrate with Cyrus SASL
+ This package is part of libkgapi.
diff --git a/debian/libkgapitasks5.lintian-overrides b/debian/libkgapitasks5.lintian-overrides
new file mode 100644
index 00000000..bbf25f17
--- /dev/null
+++ b/debian/libkgapitasks5.lintian-overrides
@@ -0,0 +1 @@
+libkpimgapitasks5: package-name-doesnt-match-sonames libKPim5GAPITasks5
diff --git a/debian/libkpimapilatitude.lintian-overrides b/debian/libkpimapilatitude.lintian-overrides
new file mode 100644
index 00000000..1b56a10a
--- /dev/null
+++ b/debian/libkpimapilatitude.lintian-overrides
@@ -0,0 +1 @@
+libkpimgapilatitude5: package-name-doesnt-match-sonames libKPim5GAPILatitude5
diff --git a/debian/libkpimgapi-data.install b/debian/libkpimgapi-data.install
new file mode 100644
index 00000000..8ac0af75
--- /dev/null
+++ b/debian/libkpimgapi-data.install
@@ -0,0 +1,2 @@
+usr/share/qlogging-categories5/libkgapi.categories
+usr/share/locale/
diff --git a/debian/libkpimgapi-data.maintscript b/debian/libkpimgapi-data.maintscript
new file mode 100644
index 00000000..c090da14
--- /dev/null
+++ b/debian/libkpimgapi-data.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/xdg/libkgapi.categories
diff --git a/debian/libkpimgapi-dev.install b/debian/libkpimgapi-dev.install
new file mode 100644
index 00000000..3d6eaed3
--- /dev/null
+++ b/debian/libkpimgapi-dev.install
@@ -0,0 +1,19 @@
+usr/include/KPim5/KGAPI/
+usr/lib/*/cmake/KPimGAPI/
+usr/lib/*/cmake/KPim5GAPI/
+usr/lib/*/libKPim5GAPIBlogger.so
+usr/lib/*/libKPim5GAPICalendar.so
+usr/lib/*/libKPim5GAPICore.so
+usr/lib/*/libKPim5GAPIDrive.so
+usr/lib/*/libKPim5GAPILatitude.so
+usr/lib/*/libKPim5GAPIMaps.so
+usr/lib/*/libKPim5GAPIPeople.so
+usr/lib/*/libKPim5GAPITasks.so
+usr/lib/*/qt5/mkspecs/modules/qt_KGAPIBlogger.pri
+usr/lib/*/qt5/mkspecs/modules/qt_KGAPICalendar.pri
+usr/lib/*/qt5/mkspecs/modules/qt_KGAPICore.pri
+usr/lib/*/qt5/mkspecs/modules/qt_KGAPIDrive.pri
+usr/lib/*/qt5/mkspecs/modules/qt_KGAPILatitude.pri
+usr/lib/*/qt5/mkspecs/modules/qt_KGAPIMaps.pri
+usr/lib/*/qt5/mkspecs/modules/qt_KGAPIPeople.pri
+usr/lib/*/qt5/mkspecs/modules/qt_KGAPITasks.pri
diff --git a/debian/libkpimgapiblogger5abi1.install b/debian/libkpimgapiblogger5abi1.install
new file mode 100644
index 00000000..e02f1595
--- /dev/null
+++ b/debian/libkpimgapiblogger5abi1.install
@@ -0,0 +1 @@
+usr/lib/*/libKPim5GAPIBlogger.so.5*
diff --git a/debian/libkpimgapiblogger5abi1.lintian-overrides b/debian/libkpimgapiblogger5abi1.lintian-overrides
new file mode 100644
index 00000000..ecd68711
--- /dev/null
+++ b/debian/libkpimgapiblogger5abi1.lintian-overrides
@@ -0,0 +1 @@
+libkpimgapiblogger5abi1: package-name-doesnt-match-sonames libKPim5GAPIBlogger5
diff --git a/debian/libkpimgapicalendar5.install b/debian/libkpimgapicalendar5.install
new file mode 100644
index 00000000..0fd58fe3
--- /dev/null
+++ b/debian/libkpimgapicalendar5.install
@@ -0,0 +1,2 @@
+usr/lib/*/libKPim5GAPICalendar.so.5
+usr/lib/*/libKPim5GAPICalendar.so.5.*
diff --git a/debian/libkpimgapicalendar5.lintian-overrides b/debian/libkpimgapicalendar5.lintian-overrides
new file mode 100644
index 00000000..bb4f43e4
--- /dev/null
+++ b/debian/libkpimgapicalendar5.lintian-overrides
@@ -0,0 +1 @@
+libkpimgapicalendar5: package-name-doesnt-match-sonames libKPim5GAPICalendar5
diff --git a/debian/libkpimgapicalendar5.symbols b/debian/libkpimgapicalendar5.symbols
new file mode 100644
index 00000000..e69de29b
diff --git a/debian/libkpimgapicore5.install b/debian/libkpimgapicore5.install
new file mode 100644
index 00000000..2d0caa37
--- /dev/null
+++ b/debian/libkpimgapicore5.install
@@ -0,0 +1,2 @@
+usr/lib/*/libKPim5GAPICore.so.5
+usr/lib/*/libKPim5GAPICore.so.5.*
diff --git a/debian/libkpimgapicore5.lintian-overrides b/debian/libkpimgapicore5.lintian-overrides
new file mode 100644
index 00000000..719baa54
--- /dev/null
+++ b/debian/libkpimgapicore5.lintian-overrides
@@ -0,0 +1 @@
+libkpimgapicore5: package-name-doesnt-match-sonames libKPim5GAPICore5
diff --git a/debian/libkpimgapidrive5.install b/debian/libkpimgapidrive5.install
new file mode 100644
index 00000000..cea28b56
--- /dev/null
+++ b/debian/libkpimgapidrive5.install
@@ -0,0 +1,2 @@
+usr/lib/*/libKPim5GAPIDrive.so.5
+usr/lib/*/libKPim5GAPIDrive.so.5.*
diff --git a/debian/libkpimgapidrive5.lintian-overrides b/debian/libkpimgapidrive5.lintian-overrides
new file mode 100644
index 00000000..62c0b9c3
--- /dev/null
+++ b/debian/libkpimgapidrive5.lintian-overrides
@@ -0,0 +1 @@
+libkpimgapidrive5: package-name-doesnt-match-sonames libKPim5GAPIDrive5
diff --git a/debian/rules b/debian/rules
index 3d69b0d3..a4262acb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,4 +3,19 @@
# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
%:
- dh $@ --with kf6 --buildsystem kf6
+ dh $@ --with kf5 --with kf6 --buildsystem kf6
+
+override_dh_auto_configure:
+ mkdir -p build6 && cd build6 && QT_SELECT=6 cmake ../
+ mkdir -p build && cd build && QT_SELECT=5 cmake ../
+
+override_dh_auto_build:
+ cd build6 && make
+ cd build && make
+
+override_dh_auto_install:
+ cd build6 && make install INSTALL_ROOT=$(CURDIR)/debian/tmp
+ cd build && make install INSTALL_ROOT=$(CURDIR)/debian/tmp
+
+override_dh_install:
+ cd /workspace/build && dh_install
More information about the Neon-commits
mailing list