[neon/kde/kcalendarcore/Neon/unstable] debian: kf6ify

Scarlett Moore null at kde.org
Sun Sep 24 16:59:21 BST 2023 

Git commit 8278be50718485181061726c65958b058f40d70b by Scarlett Moore.
Committed on 24/09/2023 at 17:59.
Pushed by scarlettmoore into branch 'Neon/unstable'.

kf6ify

D  +0    -1    debian/compat
M  +19   -7    debian/control
R  +3    -3    debian/kpim6-kcalendarcore-dev.acc.in [from: debian/libkf5calendarcore-dev.acc.in - 059% similarity]
A  +6    -0    debian/kpim6-kcalendarcore-dev.install
A  +3    -0    debian/kpim6-kcalendarcore.install
R  +0    -0    debian/kpim6-kcalendarcore.maintscript [from: debian/libkf5calendarcore5.maintscript - 100% similarity]
R  +1    -1    debian/kpim6-kcalendarcore.symbols [from: debian/libkf5calendarcore5.symbols - 099% similarity]
D  +0    -6    debian/libkf5calendarcore-dev.install
D  +0    -3    debian/libkf5calendarcore5.install
M  +4    -8    debian/rules

https://invent.kde.org/neon/kde/kcalendarcore/-/commit/8278be50718485181061726c65958b058f40d70b

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 8c31f41..5f24d2e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,21 +5,21 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: bison,
                cmake (>= 2.8.12~),
-               debhelper (>= 9),
-               extra-cmake-modules (>= 5.19.0~),
+               debhelper-compat (= 12),
+               kf6-extra-cmake-modules,
                libical-dev,
-               pkg-kde-tools (>> 0.15.15),
-               qtbase5-dev (>= 5.2.0~)
+               pkg-kde-tools-neon,
+               qt6-base5-dev
 Standards-Version: 3.9.8
 Homepage: https://projects.kde.org/projects/kde/pim/kcalcore
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kcalcore.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kcalcore.git
 
-Package: libkf5calendarcore-dev
+Package: kpim6-kcalendarcore-dev
 Section: libdevel
 Architecture: any
 Depends: libical-dev (>= 0.42~),
-         libkf5calendarcore5 (= ${binary:Version}),
+         kpim6-kcalendarcore (= ${binary:Version}),
          ${misc:Depends}
 Description: development files for kcalcore
  This library provides access to and handling of calendar data.
@@ -28,7 +28,13 @@ Description: development files for kcalcore
  .
  This package contains the development files.
 
-Package: libkf5calendarcore5
+Package: libkf6calendarcore-dev
+Architecture: all
+Depends: kpim6-kcalendarcore-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: kpim6-kcalendarcore
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -36,3 +42,9 @@ Description: calendar access framework
  This library provides access to and handling of calendar data.
  It supports the standard formats iCalendar and vCalendar and the
  group scheduling standard iTIP.
+
+Package: libkf6calendarcore6
+Architecture: all
+Depends: kpim6-kcalendarcore
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/libkf5calendarcore-dev.acc.in b/debian/kpim6-kcalendarcore-dev.acc.in
similarity index 59%
rename from debian/libkf5calendarcore-dev.acc.in
rename to debian/kpim6-kcalendarcore-dev.acc.in
index 703ec1e..caa42de 100644
--- a/debian/libkf5calendarcore-dev.acc.in
+++ b/debian/kpim6-kcalendarcore-dev.acc.in
@@ -6,12 +6,12 @@
 </version>
 
 <headers>
-    /usr/include/KF5/KCalCore/
-    /usr/include/KF5/kcalcore_version.h
+    /usr/include/KPim6/KCalCore/
+    /usr/include/KPim6/kcalcore_version.h
 </headers>
 
 <libs>
-    /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5CalendarCore.so
+    /usr/lib/@@DEB_HOST_MULTIARCH@@/Kpim6CalendarCore.so
 </libs>
 
 <gcc_options>
diff --git a/debian/kpim6-kcalendarcore-dev.install b/debian/kpim6-kcalendarcore-dev.install
new file mode 100644
index 0000000..d54db0c
--- /dev/null
+++ b/debian/kpim6-kcalendarcore-dev.install
@@ -0,0 +1,6 @@
+usr/include/KPim6/Kpim6CalendarCore/
+usr/include/KPim6/kcalcore_version.h
+usr/lib/*/cmake/KPim6CalendarCore/
+usr/lib/*/KPim6CalendarCore.so
+usr/lib/*/pkgconfig/KPim6CalendarCore.pc
+usr/lib/*/qt6/mkspecs/modules/qt_KCalendarCore.pri
diff --git a/debian/kpim6-kcalendarcore.install b/debian/kpim6-kcalendarcore.install
new file mode 100644
index 0000000..d2f9ecf
--- /dev/null
+++ b/debian/kpim6-kcalendarcore.install
@@ -0,0 +1,3 @@
+usr/lib/*/KPim6CalendarCore.so.6
+usr/lib/*/KPim6CalendarCore.so.*.*
+usr/share/qlogging-categories6/
diff --git a/debian/libkf5calendarcore5.maintscript b/debian/kpim6-kcalendarcore.maintscript
similarity index 100%
rename from debian/libkf5calendarcore5.maintscript
rename to debian/kpim6-kcalendarcore.maintscript
diff --git a/debian/libkf5calendarcore5.symbols b/debian/kpim6-kcalendarcore.symbols
similarity index 99%
rename from debian/libkf5calendarcore5.symbols
rename to debian/kpim6-kcalendarcore.symbols
index ba6315b..65f0753 100644
--- a/debian/libkf5calendarcore5.symbols
+++ b/debian/kpim6-kcalendarcore.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 4:16.04.0 amd64 armhf i386
-libKF5CalendarCore.so.5 libkf5calendarcore5 #MINVER#
+KPim6CalendarCore.so.5 libkf5calendarcore5 #MINVER#
  _Z5qHashRKN8KCalCore6PeriodE at Base 15.07.90
  _Z5qHashRKN8KCalCore6PersonE at Base 15.07.90
  _ZN8KCalCore10Attachment11setMimeTypeERK7QString at Base 15.07.90
diff --git a/debian/libkf5calendarcore-dev.install b/debian/libkf5calendarcore-dev.install
deleted file mode 100644
index 4c788e0..0000000
--- a/debian/libkf5calendarcore-dev.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/include/KF5/KCalendarCore/
-usr/include/KF5/kcalcore_version.h
-usr/lib/*/cmake/KF5CalendarCore/
-usr/lib/*/libKF5CalendarCore.so
-usr/lib/*/pkgconfig/KF5CalendarCore.pc
-usr/lib/*/qt5/mkspecs/modules/qt_KCalendarCore.pri
diff --git a/debian/libkf5calendarcore5.install b/debian/libkf5calendarcore5.install
deleted file mode 100644
index 10d3507..0000000
--- a/debian/libkf5calendarcore5.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libKF5CalendarCore.so.5
-usr/lib/*/libKF5CalendarCore.so.5.*
-usr/share/qlogging-categories5/
diff --git a/debian/rules b/debian/rules
index d2b0a8d..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-
-override_dh_strip:
-	$(overridden_command) --dbgsym-migration='libkf5calendarcore-dbg (<= 4:15.12.0-1~~)'
-
-override_dh_auto_test:
-	# Disable auto test at build time, fakeroot breaks them
-	:
+%:
+	dh $@ --with kf6 --buildsystem kf6

More information about the Neon-commits mailing list