[neon/kde/kguiaddons/Neon/release] debian: revert turn off geo for Neon/release for now
Jonathan Esk-Riddell
null at kde.org
Mon Jan 22 16:08:47 GMT 2024
Git commit 93d38327cfe46e05c65fe406b5a6c03587922a68 by Jonathan Esk-Riddell.
Committed on 22/01/2024 at 17:08.
Pushed by jriddell into branch 'Neon/release'.
revert turn off geo for Neon/release for now
M +1 -1 debian/libkf5guiaddons-bin.install
M +4 -0 debian/libkf5guiaddons-data.install
M +5 -1 debian/rules
https://invent.kde.org/neon/kde/kguiaddons/-/commit/93d38327cfe46e05c65fe406b5a6c03587922a68
diff --git a/debian/libkf5guiaddons-bin.install b/debian/libkf5guiaddons-bin.install
index 8b13789..ab1574b 100644
--- a/debian/libkf5guiaddons-bin.install
+++ b/debian/libkf5guiaddons-bin.install
@@ -1 +1 @@
-
+usr/bin/kde-geo-uri-handler
diff --git a/debian/libkf5guiaddons-data.install b/debian/libkf5guiaddons-data.install
index e690a63..0e12611 100644
--- a/debian/libkf5guiaddons-data.install
+++ b/debian/libkf5guiaddons-data.install
@@ -1 +1,5 @@
+usr/share/applications/google-maps-geo-handler.desktop
+usr/share/applications/openstreetmap-geo-handler.desktop
+usr/share/applications/qwant-maps-geo-handler.desktop
+usr/share/applications/wheelmap-geo-handler.desktop
usr/share/qlogging-categories5/kguiaddons.categories
diff --git a/debian/rules b/debian/rules
index 660941d..fbbfa6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,15 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
include /usr/share/dpkg/architecture.mk
+ifneq (linux,$(DEB_HOST_ARCH_OS))
+EXTRA_CMAKE_ARGS +=
+endif
+
%:
dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
override_dh_auto_configure:
- dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_TESTING=OFF -DBUILD_GEO_SCHEME_HANDLER=OFF
+ dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_TESTING=OFF $(EXTRA_CMAKE_ARGS)
override_dh_auto_test:
# Disable auto tests at build time
More information about the Neon-commits
mailing list