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

[Scarlett Moore]

Git commit 4a22a6fbecf7284dd00f43811a7141299c860f7f by Scarlett Moore.
Committed on 25/09/2023 at 14:47.
Pushed by scarlettmoore into branch 'Neon/unstable'.

Revert "kf6ify"

This reverts commit 8278be50718485181061726c65958b058f40d70b.

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

https://invent.kde.org/neon/kde/kcalendarcore/-/commit/4a22a6fbecf7284dd00f43811a7141299c860f7f

diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..f599e28
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/control b/debian/control
index 5f24d2e..8c31f41 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-compat (= 12),
-               kf6-extra-cmake-modules,
+               debhelper (>= 9),
+               extra-cmake-modules (>= 5.19.0~),
                libical-dev,
-               pkg-kde-tools-neon,
-               qt6-base5-dev
+               pkg-kde-tools (>> 0.15.15),
+               qtbase5-dev (>= 5.2.0~)
 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: kpim6-kcalendarcore-dev
+Package: libkf5calendarcore-dev
 Section: libdevel
 Architecture: any
 Depends: libical-dev (>= 0.42~),
-         kpim6-kcalendarcore (= ${binary:Version}),
+         libkf5calendarcore5 (= ${binary:Version}),
          ${misc:Depends}
 Description: development files for kcalcore
  This library provides access to and handling of calendar data.
@@ -28,13 +28,7 @@ Description: development files for kcalcore
  .
  This package contains the development files.
 
-Package: libkf6calendarcore-dev
-Architecture: all
-Depends: kpim6-kcalendarcore-dev
-Description: Dummy transitional
- Transitional dummy package.
-
-Package: kpim6-kcalendarcore
+Package: libkf5calendarcore5
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -42,9 +36,3 @@ 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/kpim6-kcalendarcore-dev.install b/debian/kpim6-kcalendarcore-dev.install
deleted file mode 100644
index d54db0c..0000000
--- a/debian/kpim6-kcalendarcore-dev.install
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index d2f9ecf..0000000
--- a/debian/kpim6-kcalendarcore.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/KPim6CalendarCore.so.6
-usr/lib/*/KPim6CalendarCore.so.*.*
-usr/share/qlogging-categories6/
diff --git a/debian/kpim6-kcalendarcore-dev.acc.in b/debian/libkf5calendarcore-dev.acc.in
similarity index 59%
rename from debian/kpim6-kcalendarcore-dev.acc.in
rename to debian/libkf5calendarcore-dev.acc.in
index caa42de..703ec1e 100644
--- a/debian/kpim6-kcalendarcore-dev.acc.in
+++ b/debian/libkf5calendarcore-dev.acc.in
@@ -6,12 +6,12 @@
 </version>
 
 <headers>
-    /usr/include/KPim6/KCalCore/
-    /usr/include/KPim6/kcalcore_version.h
+    /usr/include/KF5/KCalCore/
+    /usr/include/KF5/kcalcore_version.h
 </headers>
 
 <libs>
-    /usr/lib/@@DEB_HOST_MULTIARCH@@/Kpim6CalendarCore.so
+    /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5CalendarCore.so
 </libs>
 
 <gcc_options>
diff --git a/debian/libkf5calendarcore-dev.install b/debian/libkf5calendarcore-dev.install
new file mode 100644
index 0000000..4c788e0
--- /dev/null
+++ b/debian/libkf5calendarcore-dev.install
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 0000000..10d3507
--- /dev/null
+++ b/debian/libkf5calendarcore5.install
@@ -0,0 +1,3 @@
+usr/lib/*/libKF5CalendarCore.so.5
+usr/lib/*/libKF5CalendarCore.so.5.*
+usr/share/qlogging-categories5/
diff --git a/debian/kpim6-kcalendarcore.maintscript b/debian/libkf5calendarcore5.maintscript
similarity index 100%
rename from debian/kpim6-kcalendarcore.maintscript
rename to debian/libkf5calendarcore5.maintscript
diff --git a/debian/kpim6-kcalendarcore.symbols b/debian/libkf5calendarcore5.symbols
similarity index 99%
rename from debian/kpim6-kcalendarcore.symbols
rename to debian/libkf5calendarcore5.symbols
index 65f0753..ba6315b 100644
--- a/debian/kpim6-kcalendarcore.symbols
+++ b/debian/libkf5calendarcore5.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 4:16.04.0 amd64 armhf i386
-KPim6CalendarCore.so.5 libkf5calendarcore5 #MINVER#
+libKF5CalendarCore.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/rules b/debian/rules
index 3d69b0d..d2b0a8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,10 @@
 #!/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
+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
+	: