Merge ~michal-maloszewski99/ubuntu/+source/heimdal:merge-7.8.git20221117.28daf24+dfsg-1-lunar into ubuntu/+source/heimdal:debian/sid

Proposed by Michał Małoszewski
Status: Needs review
Proposed branch: ~michal-maloszewski99/ubuntu/+source/heimdal:merge-7.8.git20221117.28daf24+dfsg-1-lunar
Merge into: ubuntu/+source/heimdal:debian/sid
Diff against target: 141 lines (+81/-2)
3 files modified
debian/changelog (+77/-0)
debian/control (+2/-1)
debian/rules (+2/-1)
Reviewer Review Type Date Requested Status
Bryce Harrington (community) Needs Information
Andreas Hasenack Pending
Robie Basak Pending
Canonical Server Reporter Pending
git-ubuntu import Pending
Review via email: mp+436342@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Michał Małoszewski (michal-maloszewski99) wrote :

Created MP, added Reviewers and linked the bug (merge). But it is not yet ready to be scored.
(Status: Work in progress)
In a while I will add dep8 tests and write a comment regarding delta which has not been dropped.

Revision history for this message
Michał Małoszewski (michal-maloszewski99) wrote :

No autopkgtests for heimdal.

Revision history for this message
Michał Małoszewski (michal-maloszewski99) wrote :

I was trying to figure out if the delta which is still not dropped is required or not.
So, to test it, I have created 2 PPAs, one in which lto is disabled, and the second one, where the lto is enabled. I have built them and downloaded the debs for i386 and amd64.
Then I have compared amd64 deb from PPA1 with amd64 deb from PPA2. The same story with i386. The binary dependencies were identical. No difference between the files. So in that case, the delta can be possibly dropped.
I think that Andreas might know something about it.

Revision history for this message
Michał Małoszewski (michal-maloszewski99) wrote (last edit ):
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Together with Michal we checked the builds that seem to show they are good without delta vs the originally reported bug https://bugs.launchpad.net/ubuntu/+source/heimdal/+bug/1934936

Checking the non-lto PPA the two changelogs are now matching:

$ dpkg -x libwind0-heimdal_7.8.git20221117.28daf24+dfsg-1ubuntu1~ppa2_amd64.deb hd-amd64
$ dpkg -x libwind0-heimdal_7.8.git20221117.28daf24+dfsg-1ubuntu1~ppa2_i386.deb hd-i386
$ md5sum hd-amd64/usr/share/doc/libwind0-heimdal/changelog.Debian.gz hd-i386/usr/share/doc/libwind0-heimdal/changelog.Debian.gz
5dd57970afedcb4a75ece78e94109d17 hd-amd64/usr/share/doc/libwind0-heimdal/changelog.Debian.gz
5dd57970afedcb4a75ece78e94109d17 hd-i386/usr/share/doc/libwind0-heimdal/changelog.Debian.gz

Build logs:
https://launchpadlibrarian.net/646899573/buildlog_ubuntu-lunar-amd64.heimdal_7.8.git20221117.28daf24+dfsg-1ubuntu1~ppa2_BUILDING.txt.gz
https://launchpadlibrarian.net/646899827/buildlog_ubuntu-lunar-i386.heimdal_7.8.git20221117.28daf24+dfsg-1ubuntu1~ppa2_BUILDING.txt.gz

no more show "Searching for duplicated docs in dependency libroken18-heimdal... symlinking changelog.Debian.gz in" despit being built without LTO.

TL;DR
- I agree we seem to not need this delta anymore

Revision history for this message
Bryce Harrington (bryce) wrote (last edit ):

Good work identifying that the delta is no longer needed. I notice though that the package has already been merged again, with the change:

heimdal (7.8.git20221117.28daf24+dfsg-2ubuntu1) mantic; urgency=low

  * Merge from Debian unstable. Remaining changes:
    - d/rules: Disable lto, to regain dep on roken, otherwise
      dependencies on amd64 are different than i386 resulting in
      different files on amd64 and i386.

 -- Steve Langasek <email address hidden> Tue, 02 May 2023 09:56:10 +0200

heimdal (7.8.git20221117.28daf24+dfsg-1ubuntu1) lunar; urgency=low

  * Merge from Debian unstable. Remaining changes:
    - d/rules: Disable lto, to regain dep on roken, otherwise
      dependencies on amd64 are different than i386 resulting in
      different files on amd64 and i386.
      (LP #1934936)

 -- Steve Langasek <email address hidden> Tue, 24 Jan 2023 19:14:54 -0800

Due to this, syncpackage doesn't run:

$ syncpackage heimdal
Version in Debian 7.8.git20221117.28daf24+dfsg-2 (unstable) isn't newer than Ubuntu 7.8.git20221117.28daf24+dfsg-2ubuntu1 (mantic-proposed)

There's a few options I can think of:
  - Let Steve Langasek (vorlon) know the package can be sync'd next time it comes up
  - File a bug against heimdal requesting it be sync'd next time,
    and providing the rationale just as in this MP.
  - Create a *ubuntu2 update that explicitly drops the change,
    and mentions in changelog that it can be sync'd in the future.

Those options are not mutually exclusive. I would probably do the second, and then the first, and then offer to do the third.

review: Needs Information

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches