[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:17 UTC 2018


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

The following commit has been merged in the master branch:
commit 1ffd6829e8e6b821302f55479559ac0eb96d3dab
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Dec 13 12:55:36 2017 -0300

    Drop Ubuntu/Debian divergence
    
    + Use sudo by default
    + Add sudo runtime dependency
    
    Gbp-Dch: Full
---
 debian/control | 1 +
 debian/rules   | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index e72ad6b..7f4dfc3 100644
--- a/debian/control
+++ b/debian/control
@@ -69,6 +69,7 @@ Package: libkf5su5
 Architecture: any
 Multi-Arch: same
 Depends: libkf5su-data (= ${source:Version}),
+         sudo,
          ${misc:Depends},
          ${shlibs:Depends},
 Recommends: libkf5su-bin (= ${binary:Version})
diff --git a/debian/rules b/debian/rules
index 477ea96..067f2c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,13 +4,8 @@
 %:
 	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5
 
-# 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:
-	dh_auto_configure -- $(KDESU_USE_SUDO_DEFAULT) -DBUILD_QCH=ON
+	dh_auto_configure -- -DKDESU_USE_SUDO_DEFAULT=true -DBUILD_QCH=ON
 
 override_dh_strip:
 	dh_strip --dbgsym-migration='libkf5su5-dbg (<= 5.19.0-1~~)'

-- 
kdesu packaging



More information about the pkg-kde-commits mailing list