[SCM] kdesu packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-7-geaaab4a

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_unstable branch:
commit eaaab4a2c32afbae59e58a2ed42f7cd45d5bc7ab
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 15 20:34:27 2015 +0200

    remove patch now upstream
---
 debian/patches/kubuntu_sudo-support.diff | 26 --------------------------
 debian/patches/series                    |  1 -
 debian/rules                             |  4 ++--
 3 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/debian/patches/kubuntu_sudo-support.diff b/debian/patches/kubuntu_sudo-support.diff
deleted file mode 100644
index a03baba..0000000
--- a/debian/patches/kubuntu_sudo-support.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix sudo support
-Forwarded: https://git.reviewboard.kde.org/r/120380/
-Author: Jonathan Riddell <jriddell at ubuntu.com>
-Last-Update: 2014-26-09
-Index: kdesu/CMakeLists.txt
-===================================================================
---- kdesu.orig/CMakeLists.txt
-+++ kdesu/CMakeLists.txt
-@@ -63,4 +63,5 @@ install(FILES
-   DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
- )
- 
-+message("Note: pass -DKDESU_USE_SUDO_DEFAULT=true to use sudo instead of su")
- feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)
-Index: kdesu/src/CMakeLists.txt
-===================================================================
---- kdesu.orig/src/CMakeLists.txt
-+++ kdesu/src/CMakeLists.txt
-@@ -30,6 +30,7 @@ add_library(KF5Su ${kdesu_LIB_SRCS})
- generate_export_header(KF5Su BASE_NAME KDESu EXPORT_FILE_NAME kdesu/kdesu_export.h)
- add_library(KF5::Su ALIAS KF5Su)
- 
-+target_compile_definitions(KF5Su PRIVATE -DKDESU_USE_SUDO_DEFAULT="${KDESU_USE_SUDO_DEFAULT}")
- target_include_directories(KF5Su PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/..)
- 
- # Apps must include <KDESu/File> or <kdesu/file.h>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d6a8a3f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kubuntu_sudo-support.diff
diff --git a/debian/rules b/debian/rules
index 02acff7..36de452 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,8 @@
 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=true
+override_dh_auto_configure:
+	$(overridden_command) -- -DKDESU_USE_SUDO_DEFAULT=On
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=libkf5su5-dbg

-- 
kdesu packaging