[Merge request] Make kdesu buildable for debian and kubuntu without

[Jonathan Riddell]

committed, thanks

Jonathan


On Mon, Jun 29, 2015 at 07:41:26PM +0200, José Manuel Santamaría Lema wrote:
> Hi,
> 
> I have noticed that you need to diverge with debian passing 
> "-DKDESU_USE_SUDO_DEFAULT=true" to cmake. 
> 
> I'm attaching a patch which makes the package able to build on both 
> distributions with the same debian/rules; thus making the merges easier.

> diff --git a/debian/changelog b/debian/changelog
> index a2aa07e..d92a356 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,6 +1,8 @@
>  kdesu (5.10.0-0ubuntu2) UNRELEASED; urgency=medium
>  
>    * 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.
>  
>   -- José Manuel Santamaría Lema <panfaust at gmail.com>  Mon, 08 Jun 2015 10:33:24 +0200
>  
> diff --git a/debian/rules b/debian/rules
> index 02acff7..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=true
> +# 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




> -- 
> kubuntu-devel mailing list
> kubuntu-devel at lists.ubuntu.com
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel