Merge ~lucaskanashiro/ubuntu/+source/pacemaker:merge-version-2.0.5 into ubuntu/+source/pacemaker:debian/sid

Proposed by Lucas Kanashiro
Status: Approved
Approved by: Lucas Kanashiro
Approved revision: 96d091fda75fd25e523f8ded17b5b9bd65240e47
Proposed branch: ~lucaskanashiro/ubuntu/+source/pacemaker:merge-version-2.0.5
Merge into: ubuntu/+source/pacemaker:debian/sid
Diff against target: 657 lines (+502/-3)
3 files modified
debian/changelog (+489/-0)
debian/control (+5/-3)
debian/rules (+8/-0)
Reviewer Review Type Date Requested Status
Sergio Durigan Junior (community) Approve
Bryce Harrington (community) Approve
Review via email: mp+396607@code.staging.launchpad.net

Description of the change

Merge version 2.0.5-2 from Debian. A good chunk of the delta was dropped, mostly backported patches from upstream.

PPA with the proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/ha-stack/+packages

autopkgtest result:

https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-hirsute-lucaskanashiro-ha-stack/hirsute/amd64/p/pacemaker/20210120_125553_73c83@/log.gz

autopkgtest [12:55:42]: @@@@@@@@@@@@@@@@@@@@ summary
pacemaker PASS
pkg-config PASS (superficial)

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

* Changelog:
  - [√] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [√] update-maintainer has been run

* Actual changes:
  - [√] no upstream changes to consider
  - [√] no further upstream version to consider
  - [-] debian changes look safe

* Old Delta:
  - [√] dropped changes are ok to be dropped
  - [√] nothing else to drop
  - [-] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [√] no new patches added
  - [-] patches match what was proposed upstream
  - [-] patches correctly included in debian/patches/series
  - [-] patches have correct DEP3 metadata

* Build/Test:
  - [√] build is ok
  - [√] verified PPA package installs/uninstalls
  - [√] autopkgtest against the PPA package passes
  - [√] sanity checks test fine

Looks good. I didn't doublecheck each of the commits as landed upstream since there were quite a few. I did verify installation/upgradability. Autopkgtest in a local lxc container passes fine for me:

triage-hirsute+21.04:~/pkg/Phpunit/phpunit-unblock/composer-2.0.8$ apt-cache policy pacemaker
pacemaker:
  Installed: 2.0.5-2ubuntu1~ppa2
  Candidate: 2.0.5-2ubuntu1~ppa2
  Version table:
 *** 2.0.5-2ubuntu1~ppa2 500
        500 http://ppa.launchpad.net/lucaskanashiro/ha-stack/ubuntu hirsute/main amd64 Packages
        100 /var/lib/dpkg/status
     2.0.4-2ubuntu5 500
        500 http://archive.ubuntu.com/ubuntu hirsute-proposed/main amd64 Packages
     2.0.4-2ubuntu3.1 500
        500 http://archive.ubuntu.com/ubuntu hirsute/main amd64 Packages
triage-hirsute+21.04:~/pkg/Phpunit/phpunit-unblock/composer-2.0.8$ sudo autopkgtest pacemaker -- null
autopkgtest [02:50:46]: @@@@@@@@@@@@@@@@@@@@ summary
pacemaker SKIP exit status 77 and marked as skippable
pkg-config PASS (superficial)

A minor changelog verbage suggestion inlined below.

review: Approve
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Since I was looking into this one already, I'll just post that I approve this MP, but with the same comment I've made in the corosync MP: if possible, please get rid of the colon in the "LP: #nnn" excerpts in the commits messages, since this will make it easier to merge this again without having to worry about editing d/changelog directly.

Thanks!

review: Approve
Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

Thanks for the review Bryce and Sergio.

Bryce, I tried to keep the same wording used previously but I'll incorporate your suggestion.

Sergio, I am going to remove the colon from the git commit messages mentioning LP bugs but it should not be a problem if you are using the git-ubuntu workflow to merge packages.

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

Uploaded:

$ git push pkg upload/2.0.5-2ubuntu1
Enumerating objects: 39, done.
Counting objects: 100% (39/39), done.
Delta compression using up to 32 threads
Compressing objects: 100% (33/33), done.
Writing objects: 100% (34/34), 11.42 KiB | 899.00 KiB/s, done.
Total 34 (delta 21), reused 1 (delta 1)
To ssh://git.launchpad.net/ubuntu/+source/pacemaker
 * [new tag] upload/2.0.5-2ubuntu1 -> upload/2.0.5-2ubuntu1
$ dput ubuntu ../pacemaker_2.0.5-2ubuntu1_source.changes
Checking signature on .changes
gpg: ../pacemaker_2.0.5-2ubuntu1_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../pacemaker_2.0.5-2ubuntu1.dsc: Valid signature from F823A2729883C97C
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading pacemaker_2.0.5-2ubuntu1.dsc: done.
  Uploading pacemaker_2.0.5.orig.tar.gz: done.
  Uploading pacemaker_2.0.5-2ubuntu1.debian.tar.xz: done.
  Uploading pacemaker_2.0.5-2ubuntu1_source.changes: done.
Successfully uploaded packages.

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