ntp history seems incorrect

[Christian Ehrhardt]

Hi,
I was trying to prep an SRU but either I misinterpret things or there is an issue in the history the git reflects.

According to [1] in yakkety we have 1:4.2.8p8+dfsg-1ubuntu2
But [2] in the repo points to 1:4.2.8p4+dfsg-3ubuntu6.

Please see that the version is behind what we really have.
It was a security fix that also got into xenial as 1:4.2.8p4+dfsg-3ubuntu5.3.
But after that was the merge to 1:4.2.8p8+dfsg-1ubuntu2 which is missing.
See [3] for details.

It seems "only" to be confusion in pkg/ubuntu/yakkety-devel as there is pkg/import/1%4.2.8p8+dfsg-1ubuntu2 which is correct [4].

[1]: https://launchpad.net/ubuntu/+source/ntp
[2]: https://code.launchpad.net/~usd-import-team/ubuntu/+source/ntp/+git/ntp/+ref/ubuntu/yakkety-devel
[3]: https://launchpad.net/ubuntu/+source/ntp/+publishinghistory
[4]: https://git.launchpad.net/~usd-import-team/ubuntu/+source/ntp/commit/?id=addde900045b140b0f187c8403bb40af63ea0017

[Christian Ehrhardt (paelzer)]

Other versions around that (Xenial, Zesty) seemed to be ok.

[Christian Ehrhardt (paelzer)]

Trusty has issues as well:
pkg/ubuntu/trusty-devel is on 1:4.2.6.p5+dfsg-3ubuntu2.14.04.8
But pkg/import/1%4.2.6.p5+dfsg-3ubuntu2.14.04.10 is in the repo and would be correct.
So again it is in the repo, but the -devel pointer seems wrong?

We did say - if unsure checkout <release>-devel and develop there right?
I'm slowly getting the feeling the logic got changed and I expect the wrong thing here.
Or - since all of these are related to them - it is something about security uploads.

[Nish Aravamudan (nacc)]

I have saved off the upload tags and am re-importing src:ntp.

[Christian Ehrhardt (paelzer)]

Reviewed the fixed import as discussed:
- <release>-devel pointers ok now
- History is preserved correctly like in pkg/upload/1%4.2.8p10+dfsg-1ubuntu1
- After kicking a git ubuntu merge also all old/new pointers are good.

That said ack - thanks for the fix and re-import!