[SCM] kdesu packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-5-gbd63db8

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_unstable branch:
commit bd63db865c7b2fab3ed9d6c20bdfe376d95d543a
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jul 13 10:12:46 2015 +0200

    Fix debian/rules so it will be built wiht "-DKDESU_USE_SUDO_DEFAULT=true" for Ubuntu and without it somewhere else.
---
 debian/changelog |  2 ++
 debian/rules     | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1643909..996285b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ kdesu (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 
   [ José Manuel Santamaría Lema ]
   * libkf5su-data Breaks/Replaces libkf5su5 (<< 5.10)
+  * Fix debian/rules so it will be built wiht "-DKDESU_USE_SUDO_DEFAULT=true"
+    for Ubuntu and without it somewhere else.
 
   [ Scarlett Clark ]
   * New upstream release
diff --git a/debian/rules b/debian/rules
index a8e2feb..6e86653 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,13 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
-## Debian/Ubuntu divergence, Ubuntu uses sudo by default
-#override_dh_auto_configure:
-#	$(overridden_command) -- -DKDESU_USE_SUDO_DEFAULT=On
+# 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) -- $(KDESU_USE_SUDO_DEFAULT)
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=libkf5su5-dbg

-- 
kdesu packaging