Additional fix for packages with different types but same ids

Fix in 26e59d58 implemented fully in this.

CCMAIL: release-team@kde.org
CCMAIL: distributions@kde.org
CCMAIL: faure@kde.org

David, sorry, but in addition to 26e59d58 please include this commit
also in new tar

(cherry picked from commit 17915200)