[neon/extras/kio-fuse/Neon/unstable] debian: Revert "kf6ify"

Carlos De Maine null at kde.org
Sun May 14 17:13:56 BST 2023


Git commit b83f9622cef4bbb8dd9f409aa6f225aa7ee2b4c1 by Carlos De Maine.
Committed on 14/05/2023 at 16:13.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert "kf6ify"

This reverts commit 62e28e01ae69ca8384b31a096079665d72f314b4

M  +10   -10   debian/control
M  +7    -7    debian/rules

https://invent.kde.org/neon/extras/kio-fuse/commit/b83f9622cef4bbb8dd9f409aa6f225aa7ee2b4c1

diff --git a/debian/control b/debian/control
index afc63fe..fe3a6fa 100644
--- a/debian/control
+++ b/debian/control
@@ -1,29 +1,29 @@
-Source: kio-fuse6
+Source: kio-fuse
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Norbert Preining <norbert at preining.info>,
 Build-Depends: cmake,
                debhelper-compat (= 13),
+               extra-cmake-modules (>= 5.66.0~),
                libfuse3-dev,
-               kf6-extra-cmake-modules,
-               kf6-kconfig-dev,
-               kf6-kdbusaddons-dev,
-               kf6-ki18n-dev,
-               kf6-kio-dev,
+               libkf5config-dev (>= 5.66.0~),
+               libkf5dbusaddons-dev (>= 5.66.0~),
+               libkf5i18n-dev (>= 5.66.0~),
+               libkf5kio-dev (>= 5.66.0~),
                pkg-config,
-               pkg-kde-tools-neon,
-               qt6-base-dev,
+               pkg-kde-tools,
+               qtbase5-dev (>= 5.12.0~)
 Standards-Version: 4.6.0
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/kio-fuse
 Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/kio-fuse.git
 Homepage: https://invent.kde.org/system/kio-fuse
 
-Package: kio-fuse6
+Package: kio-fuse
 Architecture: any
 Depends: fuse3, ${misc:Depends}, ${shlibs:Depends}
 Enhances: dolphin
 Description: FUSE Interface for KIO
  KIOFuse allows the possibility to mount KIO filesystems in the local
- system, exposing them to every application.
\ No newline at end of file
+ system, exposing them to every application.
diff --git a/debian/rules b/debian/rules
index ff2dadf..77bcf0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,13 @@
 #!/usr/bin/make -f
-# SPDX-License-Identifier: LGPL-2.0-or-later
-# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with kf6 --buildsystem kf6
+	dh $@ --with kf5
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DSYSTEMD_USER_UNIT_INSTALL_DIR=/usr/kf6/lib/systemd/user -DBUILD_TESTING=OFF
-
-override_dh_shlibdeps:
-	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
+	dh_auto_configure -Skf5 -- -DBUILD_TESTING=OFF
 
+override_dh_auto_test:
+	# Disable dh_auto_test at build time
+	:


More information about the Neon-commits mailing list