diff -pruN 6.7.0-1/.gitlab-ci.yml 6.8.0-0ubuntu1/.gitlab-ci.yml
--- 6.7.0-1/.gitlab-ci.yml 2024-10-04 15:06:17.000000000 +0000
+++ 6.8.0-0ubuntu1/.gitlab-ci.yml 2024-11-02 15:46:01.000000000 +0000
@@ -5,6 +5,7 @@ include:
- project: sysadmin/ci-utilities
file:
- /gitlab-templates/linux-qt6.yml
+ - /gitlab-templates/linux-qt6-static.yml
- /gitlab-templates/android-qt6.yml
- /gitlab-templates/freebsd-qt6.yml
- /gitlab-templates/windows-qt6.yml
diff -pruN 6.7.0-1/CMakeLists.txt 6.8.0-0ubuntu1/CMakeLists.txt
--- 6.7.0-1/CMakeLists.txt 2024-10-04 15:06:17.000000000 +0000
+++ 6.8.0-0ubuntu1/CMakeLists.txt 2024-11-02 15:46:01.000000000 +0000
@@ -1,13 +1,13 @@
cmake_minimum_required(VERSION 3.16)
-set(KF_VERSION "6.7.0") # handled by release scripts
-set(KF_DEP_VERSION "6.7.0") # handled by release scripts
+set(KF_VERSION "6.8.0") # handled by release scripts
+set(KF_DEP_VERSION "6.8.0") # handled by release scripts
project(KContacts VERSION ${KF_VERSION})
# ECM setup
include(FeatureSummary)
-find_package(ECM 6.7.0 NO_MODULE)
+find_package(ECM 6.8.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules")
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -pruN 6.7.0-1/debian/changelog 6.8.0-0ubuntu1/debian/changelog
--- 6.7.0-1/debian/changelog 2024-11-04 01:29:24.000000000 +0000
+++ 6.8.0-0ubuntu1/debian/changelog 2024-11-08 16:34:54.000000000 +0000
@@ -1,34 +1,27 @@
-kf6-kcontacts (6.7.0-1) experimental; urgency=medium
+kf6-kcontacts (6.8.0-0ubuntu1) plucky; urgency=medium
- * Team upload.
- * New upstream release.
+ * New upstream release (6.7.0)
+ * New upstream release (6.8.0)
- -- Simon Quigley Sun, 03 Nov 2024 19:29:24 -0600
+ -- Rik Mills Fri, 08 Nov 2024 16:34:54 +0000
-kf6-kcontacts (6.6.0-1) unstable; urgency=medium
+kf6-kcontacts (6.6.0-0ubuntu1) oracular; urgency=medium
- [ Aurélien COUDERC ]
- * New upstream release (6.6.0).
- * Update build-deps and deps with the info from cmake.
+ * New upstream release (6.6.0)
- -- Aurélien COUDERC Fri, 06 Sep 2024 23:09:37 +0200
+ -- Scarlett Moore Fri, 20 Sep 2024 19:05:01 +0100
-kf6-kcontacts (6.5.0-1) unstable; urgency=medium
+kf6-kcontacts (6.5.0-0ubuntu1) oracular; urgency=medium
- [ Aurélien COUDERC ]
- * New upstream release (6.5.0).
- * Update build-deps and deps with the info from cmake.
- * Release to unstable.
+ * New upstream release (6.5.0)
- -- Aurélien COUDERC Sat, 10 Aug 2024 23:22:03 +0200
+ -- Rik Mills Tue, 13 Aug 2024 19:21:52 +0100
-kf6-kcontacts (6.4.0-1) experimental; urgency=medium
+kf6-kcontacts (6.4.0-0ubuntu1) oracular; urgency=medium
- [ Aurélien COUDERC ]
- * New upstream release (6.4.0).
- * Update build-deps and deps with the info from cmake.
+ * New upstream release (6.4.0)
- -- Aurélien COUDERC Fri, 19 Jul 2024 09:24:26 +0200
+ -- José Manuel Santamaría Lema Sat, 13 Jul 2024 16:33:14 +0100
kf6-kcontacts (6.3.0-2) experimental; urgency=medium
diff -pruN 6.7.0-1/debian/control 6.8.0-0ubuntu1/debian/control
--- 6.7.0-1/debian/control 2024-11-04 01:23:37.000000000 +0000
+++ 6.8.0-0ubuntu1/debian/control 2024-11-08 16:34:54.000000000 +0000
@@ -1,7 +1,8 @@
Source: kf6-kcontacts
Section: libs
Priority: optional
-Maintainer: Debian Qt/KDE Maintainers
+Maintainer: Kubuntu Developers
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers
Uploaders: Aurélien COUDERC ,
Patrick Franz ,
Sandro Knauß ,
@@ -10,24 +11,23 @@ Build-Depends: cmake (>= 3.16~),
dh-sequence-kf6,
dh-sequence-pkgkde-symbolshelper,
doxygen,
- extra-cmake-modules (>= 6.7.0~),
+ extra-cmake-modules (>= 6.8.0~),
gettext,
iso-codes ,
- libkf6codecs-dev (>= 6.7.0~),
- libkf6config-dev (>= 6.7.0~),
- libkf6coreaddons-dev (>= 6.7.0~),
- libkf6i18n-dev (>= 6.7.0~),
+ libkf6codecs-dev (>= 6.8.0~),
+ libkf6config-dev (>= 6.8.0~),
+ libkf6coreaddons-dev (>= 6.8.0~),
+ libkf6i18n-dev (>= 6.8.0~),
libxkbcommon-dev,
locales-all ,
qt6-base-dev (>= 6.5.0+dfsg~),
- qt6-declarative-dev (>= 6.5.0~),
qt6-tools-dev (>= 6.5.0~),
xauth ,
xvfb ,
Standards-Version: 4.7.0
Homepage: https://invent.kde.org/frameworks/kcontacts
-Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kf6-kcontacts
-Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kf6-kcontacts.git
+Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kf6-kcontacts
+Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kf6-kcontacts
Rules-Requires-Root: no
Package: libkf6contacts-data
@@ -43,11 +43,11 @@ Package: libkf6contacts-dev
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libkf6codecs-dev (>= 6.7.0~),
- libkf6config-dev (>= 6.7.0~),
+Depends: libkf6codecs-dev (>= 6.8.0~),
+ libkf6config-dev (>= 6.8.0~),
libkf6contacts6 (= ${binary:Version}),
- libkf6coreaddons-dev (>= 6.7.0~),
- libkf6i18n-dev (>= 6.7.0~),
+ libkf6coreaddons-dev (>= 6.8.0~),
+ libkf6i18n-dev (>= 6.8.0~),
qt6-base-dev (>= 6.5.0+dfsg~),
${misc:Depends},
Description: development files for kcontacts
@@ -78,7 +78,8 @@ Description: address book API for KDE fr
Package: qml6-module-org-kde-contacts
Architecture: any
Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends},
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
Description: address book API for KDE frameworks (QML module)
KContacts is an API for address book data.
.
diff -pruN 6.7.0-1/src/CMakeLists.txt 6.8.0-0ubuntu1/src/CMakeLists.txt
--- 6.7.0-1/src/CMakeLists.txt 2024-10-04 15:06:17.000000000 +0000
+++ 6.8.0-0ubuntu1/src/CMakeLists.txt 2024-11-02 15:46:01.000000000 +0000
@@ -86,9 +86,35 @@ target_sources(KF6Contacts PRIVATE
vcardtool.cpp
vcardtool_p.h
+ kcontacts.qrc
+)
- kcontacts.qrc
- improtocols/improtocols.qrc
+qt6_add_resources(KF6Contacts "improtocols"
+ PREFIX "/org.kde.kcontacts/improtocols/"
+ BASE "improtocols"
+ OUTPUT_TARGETS _out_targets
+ FILES
+ improtocols/aim.desktop
+ improtocols/facebook.desktop
+ improtocols/gg.desktop
+ improtocols/googletalk.desktop
+ improtocols/groupwise.desktop
+ improtocols/icq.desktop
+ improtocols/irc.desktop
+ improtocols/meanwhile.desktop
+ improtocols/msn.desktop
+ improtocols/qq.desktop
+ improtocols/sip.desktop
+ improtocols/skype.desktop
+ improtocols/sms.desktop
+ improtocols/twitter.desktop
+ improtocols/xmpp.desktop
+ improtocols/ymsgr.desktop
+ improtocols/matrix.desktop
+ improtocols/telegram.desktop
+ improtocols/rocketchat.desktop
+ improtocols/signal.desktop
+ improtocols/threema.desktop
)
ecm_qt_declare_logging_category(KF6Contacts
@@ -131,7 +157,7 @@ PRIVATE
KF6::Codecs # for the vcard parser
)
-install(TARGETS KF6Contacts EXPORT KF6ContactsTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS KF6Contacts ${_out_targets} EXPORT KF6ContactsTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
ecm_generate_headers(KContacts_CamelCase_HEADERS
HEADER_NAMES
diff -pruN 6.7.0-1/src/improtocols/improtocols.qrc 6.8.0-0ubuntu1/src/improtocols/improtocols.qrc
--- 6.7.0-1/src/improtocols/improtocols.qrc 2024-10-04 15:06:17.000000000 +0000
+++ 6.8.0-0ubuntu1/src/improtocols/improtocols.qrc 1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-
-
- aim.desktop
- facebook.desktop
- gg.desktop
- googletalk.desktop
- groupwise.desktop
- icq.desktop
- irc.desktop
- meanwhile.desktop
- msn.desktop
- qq.desktop
- sip.desktop
- skype.desktop
- sms.desktop
- twitter.desktop
- xmpp.desktop
- ymsgr.desktop
- matrix.desktop
- telegram.desktop
- rocketchat.desktop
- signal.desktop
- threema.desktop
-
-