[PATCH] KMyMoney has move to git. Cleanup portage file by removing really old and obsolete versions.

Patrick Spendrin ps_ml at gmx.de
Wed Nov 16 20:32:35 UTC 2011


Am 16.11.2011 08:29, schrieb Ralf Habacker:
> Am 15.11.2011 16:09, schrieb Patrick Spendrin:
>>> Looking at the history i saw, that there are several commits applied to
>>> kde-4.7.3 and not to master. I tried to apply them step by step but this
>>> fails.
>>> Merging kde-4.7.3 into master fails too.
>> This shouldn't happen as well. kde-4.7.3 should be merged into kde-4.7
>> but not into master.
> and how could master get up to date kmymoney portage scripts ?

Well, as we did it now - adapting the files by hand. The issue basically
comes from the way we trigger rebuilds. Since renaming the files is also
not that obvious too, we might need to think about a better solution for
that.

>> There is a difference between building the 4.7 branch and the master
>> branch.
> where is the difference, in the kmymoney portage script itself or in the
> dependencies  ?

Well, theoretically the kde-4.7 branch should contain the stable builds
- which means that external packages should have their default target on
a stable release (e.g. soprano, poppler, win32libs-sources, etc.) and
the KDE packages on the release branch (which is KDE/4.7 for kde-4.7).
Also, for the KDE packages, all the stable releases should be in the
kde-4.7 branch (for kmymoney e.g. the 4.6.1 release) which is where the
differences come from - the master branch doesn't contain the releases.
Normally there isn't to much merging going on between kde-4.7 and master
branch, at least not for packages that differ so for now I think we can
keep it this way.
We still should think about a different way for versioning though.

> 
> Regards
>  Ralf
> 
regards,
Patrick


More information about the Kde-windows mailing list