Merge ~ahasenack/ubuntu/+source/pmdk:eoan-merge-pmdk-1.5.1-debian-sid into ubuntu/+source/pmdk:debian/sid
Status: | Merged |
---|---|
Approved by: | Andreas Hasenack |
Approved revision: | 346bd80b8a3c1d6c474b8abcf45df8c9e6340034 |
Merge reported by: | Andreas Hasenack |
Merged at revision: | 346bd80b8a3c1d6c474b8abcf45df8c9e6340034 |
Proposed branch: | ~ahasenack/ubuntu/+source/pmdk:eoan-merge-pmdk-1.5.1-debian-sid |
Merge into: | ubuntu/+source/pmdk:debian/sid |
Diff against target: |
337 lines (+230/-6) 9 files modified
debian/NEWS (+19/-0) debian/README.source (+33/-0) debian/changelog (+22/-0) debian/control (+11/-3) debian/not-installed (+14/-0) debian/patches/manpage-debug-packages.patch (+127/-0) debian/patches/series (+1/-0) debian/rules (+3/-2) dev/null (+0/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christian Ehrhardt (community) | Approve | ||
Canonical Server | Pending | ||
Review via email: mp+367370@code.launchpad.net |
Description of the change
Bileto: https:/
This MP is to merge our Ubuntu delta on top of the Debian pmdk 1.5.1-1 package. This package was born separately in debian and ubuntu, and currently has no common ancestor.
These packages have diverged between Debian and Ubuntu, and I can now bring them back together. This merge will look like the package was a sync before, and now carries ubuntu delta one more time. I found no other way to start from a common ancestor.
Debian/sid has 1.5.1, whereas debian/experimental has 1.6. My goal is to get to 1.6 in Ubuntu, but first I want to have a common ancestor again, so that the upgrade from 1.5.1 to 1.6 can be done via our normal merge workflow.
Let's go over the delta piece by piece:
1) d/p/manpage-
This adds a note to the manpages explaining how to install the -debug packages. Debian could have adopted this, and I will propose it there, as they carry the same packaging we do.
2) * libpmemobj c++ bindings are on separate source now:
This is code that was removed from the upstream pmdk source, and placed in another source tree. Debian has it packaged, and it's a sync in Ubuntu atm. In the debian case, they never had this code part of pmdk, because they started the pmdk packaging at version 1.5, when the split had happened already. So we will have delta here because we started before, at 1.4, when the upstream split hadn't happened yet.
2.1) d/libpmemobj-
There is no libpmemobj-doc package anymore, not even in debian's d/control. This was fixed in debian's pmdk-1.6.
2.2) d/libpmemobj-
Same as 2.1
2.3) d/control: setup transition from libpmemobj-doc to libpmemobj-cpp-doc
This is ours, and I adopted case #5 (rename) from https:/
A: libpmemobj-doc (src: pmdk)
B: libpmemobj-cpp-doc (src: libpmemobj-cpp)
3) * d/rules: use dh_missing to list missing files
I like dh_missing, I might propose it for debian. It highlighted that we are not installing pmreorder (python script). I asked the debian maintainer and he replied it was on purpose:
"""
On Wed, May 08, 2019 at 05:57:47PM -0300, Andreas Hasenack wrote:
> Any particular reason for not including the pmreorder python
> script/tool, or just an oversight?
It requires a custom fork of valgrind: https:/
The main part of that fork is a new tool (pmemcheck), but it requires some
changes in the core as well, which haven't been accepted upstream.
Thus, unless this fork of valgrind is packaged somehow, pmreorder won't
work.
"""
4) * d/rules: don't remove TEST34 as it is passing in Ubuntu atm
Test passes in Ubuntu, and debian's pmdk 1.6 no longer removes it, so this delta will be dropped
5) * d/NEWS: added to explain important packaging changes in this update
Ours only. Doesn't apply to debian directly because they started the packaging at version 1.5, when these important changes happened.
6) * d/control: the valgrind test is failing, remove it from
build-depends
Ours only. The valgrind test fails for us in a vm and LXD. I question this test, because it's basically a text output comparison between the valgrind output and a template full of $macros and $variables. It sounds super brittle.
7) * d/README.source: explains some lintian checks and the reason why
jemalloc is bundled.
Ours only, but applies to Debian, since they are carrying the same lintian overrides as us.
I dropped this piece of delta we had before:
8) d/README.debian. It just introduces the packages, what they do, and so on. Nothing you cannot see already in d/control. For reference: https:/
Other info:
libpmemcto* packages are gone. Code was removed from upstream, and I simply dropped them from ubuntu. Debian never carried those packages (it was another change introduced in 1.5).
There is a libpmemobj-dev -> libpmemobj-cpp-dev package transition going on as well. This is case #7 from https:/
A: libpmemobj-dev (src: pmdk)
B: libpmemobj-cpp-dev (src: libpmemobj-cpp)
An MP for libpmemobj-cpp will be posted soon.
Current lintian output for this branch, with pedantic enabled: https:/
The new warning we have is this:
symbols-
That's something for debian to add, and I can propose it there only perhaps, but I can add it here too if you prefer.
I proposed a PR upstream for the spelling issues, not worth adding a delta for those I believe, and it was merged already: https:/
I like dh_missing as well, just add the files intentionally not installed (for now pmreorder) to not-installed
debian/
Then feel free to re-propose it to Debian with that.