Merge lp://staging/~bulldog98/kdepim-runtime/ubuntu-4.6 into lp://staging/~kubuntu-packagers/kubuntu-packaging/kdepim-runtime

Proposed by Jonathan Kolberg
Status: Merged
Merge reported by: Jonathan Riddell
Merged at revision: not available
Proposed branch: lp://staging/~bulldog98/kdepim-runtime/ubuntu-4.6
Merge into: lp://staging/~kubuntu-packagers/kubuntu-packaging/kdepim-runtime
Diff against target: 232 lines (+94/-24)
4 files modified
debian/changelog (+7/-0)
debian/kdepim-runtime.install (+82/-7)
debian/not-installed (+3/-1)
debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff (+2/-16)
To merge this branch: bzr merge lp://staging/~bulldog98/kdepim-runtime/ubuntu-4.6
Reviewer Review Type Date Requested Status
Jonathan Riddell Pending
Review via email: mp+42024@code.staging.launchpad.net

Description of the change

I did the changes for compiling KDE 4.6 beta 1 with the debian folder.

To post a comment you must log in.
Revision history for this message
Jonathan Kolberg (bulldog98) wrote :

Here the change Jonathan wanted to have

62. By Jonathan Riddell

* New upstream release
* updated the patch fix_ontology_vs_feeder_automoc_race_condition.diff

Revision history for this message
Jonathan Riddell (jr) wrote :

merged into new ubuntu-4.6 branch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches