Page MenuHomeLubuntu Development

Merge from Ubuntu Merge-o-Matic
AbandonedPublic

Authored by The_LoudSpeaker on Jan 31 2020, 11:08 AM.

Details

Summary

Merge from new upstream version

Test Plan

Check if anything breaks. Also check if the manpages are correct.

Diff Detail

Repository
rLXQTCONFIGPACKAGING lxqt-config Packaging
Branch
ubuntu/focal
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 166
Build 166: arc lint + arc unit

Event Timeline

The_LoudSpeaker created this revision.

I cannot comment much on the validity of depends/patches etc, but the following things occur to me.

  • debian added debian/upstream/metadata which you have not merged. Why? If you intended to exclude it, this is not mentioned in the changelog.
  • you have not merged the change to depending on debhelper-compat (= 12) and corresponding removal of debian/compat. Again why, and why not mentioned?
  • you have not merged some minor changes to debian/copyright which look like they should have been.
  • there is no mention that you retained the lubuntu Vcs fields in debian/control
  • in debian control the Depends: sections have not been sorted and made a line per depend as in debian. This is a trivial difference, but IMO is a pointless delta to keep.
  • in debian control the lxqt-config recommends and suggest differ from debian. If this is intended, again there is no mention of this in the merge changelog.

As a note, when compiling a merge changelog, I find it usual to use a merge/diff tool like meld or kompare to compare the debian directory from debian itself with the result of my merge. Then I can see precisely what "Remaining changes" exist, so I can either document or correct them.

In D79#1704, @rikmills wrote:

I cannot comment much on the validity of depends/patches etc, but the following things occur to me.

  • debian added debian/upstream/metadata which you have not merged. Why? If you intended to exclude it, this is not mentioned in the changelog.
  • you have not merged the change to depending on debhelper-compat (= 12) and corresponding removal of debian/compat. Again why, and why not mentioned?
  • you have not merged some minor changes to debian/copyright which look like they should have been.

MoM itself didn't include them. It is probably coz MoM merges 3 versions: upstream, debian and previous ubuntu one AND This change in debian is actually before previous ubuntu version (As seen from the merged changelog), hence not included (It was also not included in previous ubuntu version if I am not wrong).

  • there is no mention that you retained the lubuntu Vcs fields in debian/control

I will add that to changelog as I did for the install file.

  • in debian control the Depends: sections have not been sorted and made a line per depend as in debian. This is a trivial difference, but IMO is a pointless delta to keep.

trivial

  • in debian control the lxqt-config recommends and suggest differ from debian. If this is intended, again there is no mention of this in the merge changelog.

This too is simillar to the first 3 cases imo.

As a note, when compiling a merge changelog, I find it usual to use a merge/diff tool like meld or kompare to compare the debian directory from debian itself with the result of my merge. Then I can see precisely what "Remaining changes" exist, so I can either document or correct them.

Noted.

In D79#1704, @rikmills wrote:

I cannot comment much on the validity of depends/patches etc, but the following things occur to me.

  • debian added debian/upstream/metadata which you have not merged. Why? If you intended to exclude it, this is not mentioned in the changelog.
  • you have not merged the change to depending on debhelper-compat (= 12) and corresponding removal of debian/compat. Again why, and why not mentioned?
  • you have not merged some minor changes to debian/copyright which look like they should have been.

MoM itself didn't include them. It is probably coz MoM merges 3 versions: upstream, debian and previous ubuntu one AND This change in debian is actually before previous ubuntu version (As seen from the merged changelog), hence not included (It was also not included in previous ubuntu version if I am not wrong).

This does not mean they should not be merged. MoM is not all knowing or infallible. MoM is a tool to help, not a replacement for common sense and judgement

  • in debian control the Depends: sections have not been sorted and made a line per depend as in debian. This is a trivial difference, but IMO is a pointless delta to keep.

trivial

but pointless and easy to correct.

  • in debian control the lxqt-config recommends and suggest differ from debian. If this is intended, again there is no mention of this in the merge changelog.

This too is simillar to the first 3 cases imo.

Not in any sense similar. The recommends and suggests differ greatly, so at the very least what differs and the rational as to why this should be the case should be explained in the changelog. If there is no good reason for the delta, it should be matched with debian.

This revision now requires changes to proceed.Jan 31 2020, 7:09 PM

Simon updated it. No need of this now.