[neon/kde/kcalutils/Neon/unstable] debian: more kf6ify
Carlos De Maine
null at kde.org
Sun Sep 24 22:07:38 BST 2023
Git commit 98638eaf0ea2e784569fa1c0943f0a70c36d6978 by Carlos De Maine.
Committed on 24/09/2023 at 23:07.
Pushed by carlosdem into branch 'Neon/unstable'.
more kf6ify
M +6 -4 debian/control
D +0 -22 debian/kpim6-calendarutils-dev.acc.in
M +1 -1 debian/kpim6-calendarutils.lintian-overrides
https://invent.kde.org/neon/kde/kcalutils/-/commit/98638eaf0ea2e784569fa1c0943f0a70c36d6978
diff --git a/debian/control b/debian/control
index 818cb7a..3df0af9 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ 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),
+ kf6-calendarcore-dev,
kf6-extra-cmake-modules,
kf6-kcodecs-dev,
kf6-kconfig-dev,
@@ -12,7 +13,6 @@ Build-Depends: cmake,
kf6-ki18n-dev,
kf6-ktextaddons-dev,
kf6-ktexttemplate-dev,
- kpim6-calendar-dev,
kpim6-identitymanagement-dev,
kpim6-pimtextedit-dev,
libical-dev,
@@ -25,6 +25,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kcalutils.git
Package: kpim6-calendarutils
Architecture: any
+X-Neon-MergedPackage: true
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: library with utility functions for the handling of calendar data
@@ -32,10 +33,11 @@ Description: library with utility functions for the handling of calendar data
and use calendar data via the KCalCore library.
Package: kpim6-calendarutils-dev
-Section: libdevel
Architecture: any
-Depends: kf6-kcoreaddons-dev,
- kpim6-calendar-dev,
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: kf6-kcalendar-dev,
+ kf6-kcoreaddons-dev,
kpim6-calendarutils (= ${binary:Version}),
${misc:Depends}
Description: kcalutils - development files
diff --git a/debian/kpim6-calendarutils-dev.acc.in b/debian/kpim6-calendarutils-dev.acc.in
deleted file mode 100644
index b7ff1df..0000000
--- a/debian/kpim6-calendarutils-dev.acc.in
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
- 15.07.90
-</version>
-
-<headers>
- /usr/include/KF5/KCalUtils/
- /usr/include/KF5/kcalutils_version.h
-</headers>
-
-<libs>
- /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5CalendarUtils.so
-</libs>
-
-<gcc_options>
- -fPIC
- -std=c++11
-</gcc_options>
-
-</descriptor>
diff --git a/debian/kpim6-calendarutils.lintian-overrides b/debian/kpim6-calendarutils.lintian-overrides
index 4fbe482..c2741db 100644
--- a/debian/kpim6-calendarutils.lintian-overrides
+++ b/debian/kpim6-calendarutils.lintian-overrides
@@ -1 +1 @@
-kpim6-calendarutils: package-name-doesnt-match-sonames libKPim5CalendarUtils5
+kpim6-calendarutils: package-name-doesnt-match-sonames libKPim6CalendarUtils6
More information about the Neon-commits
mailing list