Re: Removing Special exception for aws
Xavier Grave wrote:
> I have removed the GMGPL exception in revision
> a37bb6f52a9276f7e37c72e9502f581c2185450c of com.adacore.aws
> and done a commit to com.adacore.aws.debian. I have tried a
> merge between 067c52a93544c2bb156cf9676cf90a691349e0d9 and
> b004f0c94b426ad53ef5b7d874421c79ecb1be6b without success.
> Lot's of conflicts
> Can I do a push to ada-france without solving the merge ?
I think you're doing it wrong. The com.adacore.aws.debian already
has the GMGPL exception removed; if you re-do the same changes in
com.adacore.aws and then try to merge, you create conflicts. The
proper way is to merge c.a.aws into c.a.aws.debian first, then
remove any remaining GMGPL exception in c.a.aws.debian.
[Note: pushing your revision would not harm anyway as we'd simply
disapprove later.]
> b004f0c94b426ad53ef5b7d874421c79ecb1be6b is a 2.10 version of AWS.
AdaCore change the version number in the sources immediately after
each stable release. This means that the latest release is 2.9 and
what you see is a work-in-progress that will in the future become
2.10. The latest stable release is t:aws-2.9 (3d019523...),
which I merged into c.a.aws.debian a while ago to create 067c52a9.
It might be a good idea to just package 067c52a9 as it stands now
and call it libaws2.9-dev (=2.9-1). If you decide to package the
current head instead, you should call it
libaws2.10~20110216-dev (=2.10~20110216-1) because any subsequent
revision might change the aliversion again.
--
Ludovic Brenta.
Reply to: