RE-APPLIED[Disco]: [PATCH 1/1] UBUNTU: [Packaging] autoreconstruct -- base tag is always primary mainline version

[Kleber Souza]

On 2/7/19 11:30 AM, Andy Whitcroft wrote:
> The base tag for autoreconstruct comparisons is always the primary mainline
> version.  Since the switch to 3.x that has been the first two version
> number elements (VERSION and PATCHLEVEL).  We already ignore the SUBLEVEL
> but inexplicibly take the EXTRAVERSION into account.  This is plain wrong
> as the orig.tar.gz will, for example, be of v3.13 for the trusty kernel.
> The tag therefore is v$(VERSION).$(PATCHLEVEL).
> 
> Drop the errant lookup and insertion of EXTRAVERSION into the
> upstream_tag specifier.
> 
> BugLink: http://bugs.launchpad.net/bugs/1806380
> Signed-off-by: Andy Whitcroft <apw at canonical.com>
> ---
>  debian/rules.d/0-common-vars.mk | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
> index 4d8886496090..e2e40b843200 100644
> --- a/debian/rules.d/0-common-vars.mk
> +++ b/debian/rules.d/0-common-vars.mk
> @@ -15,8 +15,7 @@ prev_fullver ?= $(shell dpkg-parsechangelog -l$(DEBIAN)/changelog -o1 -c1 | sed
>  # Get upstream version info
>  upstream_version := $(shell sed -n 's/^VERSION = \(.*\)$$/\1/p' Makefile)
>  upstream_patchlevel := $(shell sed -n 's/^PATCHLEVEL = \(.*\)$$/\1/p' Makefile)
> -upstream_extraversion := $(shell sed -n 's/^EXTRAVERSION = \(.*\)$$/\1/p' Makefile)
> -upstream_tag := "v$(upstream_version).$(upstream_patchlevel)$(upstream_extraversion)"
> +upstream_tag := "v$(upstream_version).$(upstream_patchlevel)"
>  
>  family=ubuntu
>  
> 

As per off-line discussion with Seth, I have re-applied this patch to
to disco/master-next branch as no other solution has been proposed yet.

Thanks,
Kleber