How to handle GPL-2 and GPL-2+ code in same upstream repo situation?

Dear colleagues,

Recently FTP Master Thorsten Alteholz pointed me to the fact that mixing code
licensed under GPL-2 only with code under GPL-2+ / GPL-3+ is not allowed in same
repository [1]. So, what is the proper solution for me as a maintainer (and a member
of upstream team)?

Should I initiate moving of GPL-2 code in the separate Git repo upstream and package
it as a new separate package which I can use as a runtime Depends / Recommends ?

Or there is easier way to handle this around?

[1] <https://www.gnu.org/licenses/gpl-faq.en.html#AllCompatibility>

-- 
Vasyl Gello
==================================================
Certified SolidWorks Expert

E-Mail: [email protected]
==================================================
호랑이는 죽어서 가죽을 남기고 사람은 죽어서 이름을 남긴다