[neon/kde/kglobalaccel/Neon/stable] debian: Revert "revert -DKF6_COMPAT_BUILD=ON in Neon/release for now"

[Jonathan Esk-Riddell]

Git commit 02ef16447c16d1267572918e5446dcee2b1bdc8e by Jonathan Esk-Riddell.
Committed on 22/01/2024 at 17:18.
Pushed by jriddell into branch 'Neon/stable'.

Revert "revert -DKF6_COMPAT_BUILD=ON in Neon/release for now"

This reverts commit 9e611b477290b26e8b90e5f2b42f20b9ec579e58.

M  +2    -0    debian/control
M  +0    -18   debian/copyright
M  +1    -2    debian/libkf5globalaccel-bin.install
M  +0    -1    debian/libkf5globalaccel-bin.lintian-overrides
M  +0    -2    debian/libkf5globalaccel-data.install
M  +0    -2    debian/libkf5globalaccel-dev.install
M  +0    -1    debian/libkf5globalaccel5.install
A  +1    -0    debian/libkf5globalaccel5.lintian-overrides
A  +1    -0    debian/not-installed
M  +1    -1    debian/rules

https://invent.kde.org/neon/kde/kglobalaccel/-/commit/02ef16447c16d1267572918e5446dcee2b1bdc8e

diff --git a/debian/control b/debian/control
index 8adc8e4..26ab008 100644
--- a/debian/control
+++ b/debian/control
@@ -124,6 +124,8 @@ Package: libkf5globalaccelprivate5
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libkf5globalaccel5 (<< 5.114.0-1)
+Replaces: libkf5globalaccel5 (<< 5.114.0-1)
 Description: Configurable global shortcut support - private runtime library
  KGlobalAccel allows you to have global accelerators that are
  independent of the focused window. Unlike regular shortcuts,
diff --git a/debian/copyright b/debian/copyright
index 0f8c932..aef377b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,15 +25,6 @@ Copyright: 2007, Andreas Hartmetz <ahartmetz at gmail.com>
            2001, translate.org.za
 License: LGPL-2+
 
-Files: po/ca/kglobalaccel5.po
-       po/ca/kglobalaccel5_qt.po
-       po/ca at valencia/kglobalaccel5.po
-       po/ca at valencia/kglobalaccel5_qt.po
-       po/uk/kglobalaccel5.po
-       po/uk/kglobalaccel5_qt.po
-Copyright: 2014, This_file_is_part_of_KDE
-License: LGPL-2.1+3+KDEeV
-
 Files: src/runtime/main.cpp
 Copyright: 2007, Andreas Hartmetz <ahartmetz at gmail.com>
            2007, Michael Jansen <kde at michael-jansen.biz>
@@ -52,15 +43,6 @@ License: LGPL-2
  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.
 
-Files: COPYING.LIB
-Copyright: 1991-1999, Free Software Foundation, Inc
-License: LGPL-2.1+
-
-Files: po/bg/kglobalaccel5_qt.po
-Copyright: 2009-2013, Yasen Pramatarov <yasen at lindeas.com>
-           2006-2009, Zlatko Popov <zlatkopopov at fsa-bg.org>
-License: GPL
-
 Files: debian/*
 Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
 License: LGPL-2+
diff --git a/debian/libkf5globalaccel-bin.install b/debian/libkf5globalaccel-bin.install
index b6a01e9..8b13789 100644
--- a/debian/libkf5globalaccel-bin.install
+++ b/debian/libkf5globalaccel-bin.install
@@ -1,2 +1 @@
-usr/bin/kglobalaccel5
-usr/lib/*/qt5/plugins/org.kde.kglobalaccel5.platforms/KF5GlobalAccelPrivateXcb.so
+
diff --git a/debian/libkf5globalaccel-bin.lintian-overrides b/debian/libkf5globalaccel-bin.lintian-overrides
index d966829..34892b9 100644
--- a/debian/libkf5globalaccel-bin.lintian-overrides
+++ b/debian/libkf5globalaccel-bin.lintian-overrides
@@ -1,4 +1,3 @@
 libkf5globalaccel-bin: binary-without-manpage usr/bin/kglobalaccel5
 libkf5globalaccel-bin: package-name-doesnt-match-sonames libKF5GlobalAccelPrivate
 libkf5globalaccel-bin: shlib-without-versioned-soname usr/lib/*/libKF5GlobalAccelPrivate.so libKF5GlobalAccelPrivate.so
-libkf5globalaccel-bin: postinst-must-call-ldconfig usr/lib/*/libKF5GlobalAccelPrivate.so
diff --git a/debian/libkf5globalaccel-data.install b/debian/libkf5globalaccel-data.install
index 3890657..434db36 100644
--- a/debian/libkf5globalaccel-data.install
+++ b/debian/libkf5globalaccel-data.install
@@ -1,3 +1 @@
-usr/share/dbus-1/services/org.kde.kglobalaccel.service
-usr/share/kservices5/kglobalaccel5.desktop
 usr/share/locale/*/*/kglobalaccel*
diff --git a/debian/libkf5globalaccel-dev.install b/debian/libkf5globalaccel-dev.install
index b8402c1..0b53247 100644
--- a/debian/libkf5globalaccel-dev.install
+++ b/debian/libkf5globalaccel-dev.install
@@ -2,6 +2,4 @@ usr/include/KF5/KGlobalAccel/
 usr/lib/*/cmake/KF5GlobalAccel/
 usr/lib/*/libKF5GlobalAccel.so
 usr/lib/*/qt5/mkspecs/modules/qt_KGlobalAccel.pri
-usr/share/dbus-1/interfaces/kf5_org.kde.KGlobalAccel.xml
-usr/share/dbus-1/interfaces/kf5_org.kde.kglobalaccel.Component.xml
 usr/share/qt5/doc/KF5GlobalAccel.tags
diff --git a/debian/libkf5globalaccel5.install b/debian/libkf5globalaccel5.install
index 35814e0..9a03f99 100644
--- a/debian/libkf5globalaccel5.install
+++ b/debian/libkf5globalaccel5.install
@@ -1,4 +1,3 @@
 usr/lib/*/libKF5GlobalAccel.so.5
 usr/lib/*/libKF5GlobalAccel.so.5.*
-usr/lib/systemd/user/
 usr/share/qlogging-categories5/
diff --git a/debian/libkf5globalaccel5.lintian-overrides b/debian/libkf5globalaccel5.lintian-overrides
new file mode 100644
index 0000000..58678de
--- /dev/null
+++ b/debian/libkf5globalaccel5.lintian-overrides
@@ -0,0 +1 @@
+libkf5globalaccel5: lacks-unversioned-link-to-shared-library usr/lib/*/libKF5GlobalAccelPrivate.so.5.113.0 usr/lib/*/libKF5GlobalAccelPrivate.so
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..457aa50
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1 @@
+usr/share/dbus-1/interfaces/
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 83d6ec8..b357e91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_QCH=ON
+	dh_auto_configure -- -DBUILD_QCH=ON -DKF6_COMPAT_BUILD=ON
 
 override_dh_strip:
 	dh_strip --dbgsym-migration='libkf5globalaccel5-dbg (<= 5.19.0-1~~)'