In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Andrey Yashkin authored Nov 19, 2020 and Carlo Vanini committed Nov 19, 2020

libqapt already provides a state QApt::Package::Orphaned, but does not calculate it. This patch fixes this problem.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

in preparation of release

previously it'd only apply to the left hand side of the bitwise &

looks the only concerning change is that md5.h is gone

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

from https://github.com/julian-klode/libqapt/tree/apt-1.9.0

Reviewers: O3 libqapt & debconf-kde, apol, sitter

Reviewed By: O3 libqapt & debconf-kde, apol, sitter

Subscribers: sitter

Differential Revision: https://phabricator.kde.org/D21896

APT 1.9.0 moves CurrentSize to items, so we use CurrentItem
for now - but that should go away so we can have multiple
current items for http/2 later.

usleep() is defined in that header, but the header is not
included.

Seriously

The Setup() method went away, use the constructor instead.

Probably want to export HashStringList instead

Packages do not really have a section, this moved to Version a few
years ago (they can differ between versions). Let's just use the
candidate's section, if there is one.

GetCandidateVer() never actually returned the correct candidate,
so this probably also fixes something.

APT 1.9 drops a few "using" uses in headers, so we have to use
the namespaced name now.

APT 1.9 dropped some includes from headers, so we actually
need to include the headers we're using.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"