[SCM] kdesu packaging branch, master, updated. debian/5.37.0-2-50-g19907f3

Maximiliano Curia maxy at moszumanska.debian.org
Tue Jan 2 18:38:12 UTC 2018


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdesu.git;a=commitdiff;h=6e4f72d

The following commit has been merged in the master branch:
commit 6e4f72dfbd61034d708d454e4dc615b1c8147add
Author: Rohan Garg <rohan at garg.io>
Date:   Fri Sep 16 16:35:31 2016 +0200

    Revert "Drop the Debian vs Ubuntu divergence"
    
    This reverts commit 9925793af43c21cb9241492d31f958f4602ea79d.
    Overridden by a custom setting in kdesurc since Debian wants to
    keep using su.
---
 debian/rules | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index ca8e170..9250063 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,13 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
+# Debian/Ubuntu divergence, Ubuntu uses sudo by default
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
+	KDESU_USE_SUDO_DEFAULT="-DKDESU_USE_SUDO_DEFAULT=true"
+endif
+
 override_dh_auto_configure:
-	$(overridden_command) -- -DKDESU_USE_SUDO_DEFAULT=true
+	$(overridden_command) -- $(KDESU_USE_SUDO_DEFAULT)
 
 override_dh_strip:
 	$(overridden_command) --dbgsym-migration='libkf5su5-dbg (<= 5.19.0-1~~)'

-- 
kdesu packaging



More information about the pkg-kde-commits mailing list