[Swan-dev] make deb broken in #master

[Andrew Cagney]

On 3 April 2018 at 06:22, Antony Antony <antony at phenome.org> wrote:
> The commit, cc6f7f01a0,  broke "make deb" target in the #master. The official Debian packaging is probably not affected by this. This only for packaging/debian.
>
> It seems we are going back and forward with "@" see
> git log --follow ./packaging/debian/changelog
>
> I see many variables in mk/config.mk, e.g "@FINALBINDIR@", are with "@ @"
> Then why some of them without @? e.g packaging/debian/changelog different?  It is good idea to consistent.
>
> My preference is fix makerelease and use "@" everywhere where variable is replaced. I read these files I know @VAR@ will be replaced. Without such marker it is confusing, is it defined somewhere else.

Yes (since it also follows the auto* tool convention it should be
familiar to more more developers).

Andrew

> As the commit suggest there is no "scripts/utils/makerelease", however, there is packaging/utils/makerelease
> If there is a good reason not to fix makerelease at least fix Makefile.
>
> diff --git a/Makefile b/Makefile
> index f64ae08e3..f84fa82bd 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -606,9 +606,9 @@ showobjdir:
>
>  deb:
>         cp -r packaging/debian .
> -       grep "@IPSECBASEVERSION@" debian/changelog || \
> -               echo "no @IPSECBASEVERSION@ in debian/changelog" && \
> -               sed -i "s/@IPSECBASEVERSION@/`make -s showdebversion`/g" debian/changelog
> +       grep "IPSECBASEVERSION" debian/changelog || \
> +               echo "no IPSECBASEVERSION in debian/changelog" && \
> +               sed -i "s/IPSECBASEVERSION/`make -s showdebversion`/g" debian/changelog
>
> ---
>
> root at swanbase:/home/build/libreswan# make deb
> cp -r packaging/debian .
> grep "@IPSECBASEVERSION@" debian/changelog || \
>         echo "no @IPSECBASEVERSION@ in debian/changelog" && \
>         sed -i "s/@IPSECBASEVERSION@/`make -s showdebversion`/g" debian/changelog
> no @IPSECBASEVERSION@ in debian/changelog
> debuild -i -us -uc -b
> debuild: warning:     debian/changelog(l1): version 'IPSECBASEVERSION-1' is invalid: version number does not start with digit
> LINE: libreswan (IPSECBASEVERSION-1) UNRELEASED; urgency=low
>  dpkg-buildpackage -rfakeroot -us -uc -ui -i -b
> dpkg-buildpackage: warning:     debian/changelog(l1): version 'IPSECBASEVERSION-1' is invalid: version number does not start with digit
>
>
> On Thu, Mar 01, 2018 at 08:49:03PM +0000, Paul Wouters wrote:
>> New commits:
>> commit cc6f7f01a0b5c01dbd804be3a61aef4296499465
>> Author: Paul Wouters <pwouters at redhat.com>
>> Date:   Thu Mar 1 15:48:28 2018 -0500
>>
>>     packaging: don't use @ @ symbols for ipsec version
>>
>>     Because scripts/utils/makerelease does not change those.
>>
> _______________________________________________
> Swan-dev mailing list
> Swan-dev at lists.libreswan.org
> https://lists.libreswan.org/mailman/listinfo/swan-dev