[Merge] lp:~gary-wzl77/net-cpp/dual_landing_support into lp:net-cpp

[Robert Bruce Park]

Review: Needs Fixing

One more thing inline.

Diff comments:

> 
> === modified file 'debian/rules'
> --- debian/rules	2014-06-27 08:16:12 +0000
> +++ debian/rules	2016-08-11 14:09:31 +0000
> @@ -5,13 +5,27 @@
>  
>  include /usr/share/dpkg/default.mk
>  
> -# Explicitly selecting a G{CC,++}-version here to avoid accidental
> -# ABI breaks introduced by toolchain updates.
> -export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
> -export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
> +distro=$(shell lsb_release -c -s)

This is also wrong, in bileto everything is trusty (soon xenial). You need to rely on the $SERIES environment variable being set, and only fall back on lsb_release if it is not set.

> + 
> +ifeq ($(distro),vivid)
> +    full_version=$(shell cat $(CURDIR)/debian/VERSION.vivid)
> +else
> +    full_version=$(shell cat $(CURDIR)/debian/VERSION)
> +endif
> + 
> +major=$(shell echo $(full_version) | cut -d'.' -f1)
> +minor=$(shell echo $(full_version) | cut -d'.' -f2)
> +patch=$(shell echo $(full_version) | cut -d'.' -f3)
> + 
> +# The home directory of user buildd does not exist on the builders
> +export XDG_DATA_HOME=/tmp
>  
>  %:
>  	dh $@ --fail-missing
>  
>  override_dh_auto_configure:
> -	dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
> +	dh_auto_configure -- -DNET_CPP_VERSION_MAJOR=$(major) -DNET_CPP_VERSION_MINOR=$(minor) -DNET_CPP_VERSION_PATCH=$(patch)
> + 
> +override_dh_auto_clean:
> +	/bin/sh $(CURDIR)/debian/bileto_pre_release_hook
> +	dh_auto_clean


-- 
https://code.launchpad.net/~gary-wzl77/net-cpp/dual_landing_support/+merge/302671
Your team Ubuntu Phablet Team is subscribed to branch lp:net-cpp.