patches for kde-workspace

[Maurice de la Ferte]

Hi all,
 
I created the patch set on my own. Here some information
what I have done:
 
94b134f964c5fe4f0588e2db70c076c56a3a8091: applied clean
 
098b163ba37e467c963fd28d73197a2bb5a2149c: simple conficts about coding style
 
123185da836cedbe0376d4e1dd2ccbce9ba34a30: skipped because files are not present
    plasma/generic/dataengines/powermanagement/powermanagementjob.cpp
    plasma/generic/dataengines/powermanagement/powermanagementjob.h
 
76589567624eadbb2c07ca2578dafa24cb34681a: already included in 4.7 branch
 
f51623878ae9d18c0704c3f17b27fcede6df4965: applied clean
 
For now I will apply the 'fix-wetab-power-button-freeze.patch' patch set
to the meego kde-workspace package.
 
Cheers
 
Maurice 

On October 3, 2011 at 7:44 PM Maurice de la Ferte <Maurice.Ferte at basyskom.de> wrote:

> Hi all,
>
> I have some trouble to create a patch set via
> 'git format-patch' on top of:
>
> Repository URL: git://anongit.kde.org/kde-workspace
> Branch:  KDE/4.7
>
> Trying 'git cherry-pick' results into conflicts by picking following
> commits (from down to top):
>
> f51623878ae9d18c0704c3f17b27fcede6df4965
> 76589567624eadbb2c07ca2578dafa24cb34681a
> 123185da836cedbe0376d4e1dd2ccbce9ba34a30
> 098b163ba37e467c963fd28d73197a2bb5a2149c
> 94b134f964c5fe4f0588e2db70c076c56a3a8091
>  
> Can anybody help me with this, because I do not like random changes ;)
>  
> Cheers
>  
> Maurice 
>
> On October 3, 2011 at 7:33 PM Marco Martin <notmart at gmail.com> wrote:
>
> > On Monday 03 October 2011, Maurice de la Ferte wrote:
> > > > >
> > > > > Maybe on another branch? I will check...
> > > >
> > > > kde-workspace, branch master
> > >
> > > 
> > > sorry my fault....
> > > 
> > > But still the same on:
> > > 
> > > Repository URL: git://anongit.kde.org/kde-workspace
> > > Branch:  KDE/4.7
> > > 
> > > Some of these IDs could be found via "git cherry-pick".
> > > Should they go into the KDE/4.7 branch or applied inside obs project?
> >
> > be applied in the obs build, since are too invasice to be backported for
> > everybody
> >
> >
> > --
> > Marco Martin
> >
> Maurice de la Ferté
>
> basysKom GmbH
> Südwestpark 108 | 90449 Nürnberg | Germany
> Tel: +49 6151 3969-961 | Fax: -736
> maurice.ferte at basyskom.de | www.basyskom.de
>
> Handelsregister: Darmstadt HRB 9352
> Geschaeftsfuehrung: Eva Brucherseifer
>
> _______________________________________________
> Active mailing list
> Active at kde.org
> https://mail.kde.org/mailman/listinfo/active
Maurice de la Ferté

basysKom GmbH
Südwestpark 108 | 90449 Nürnberg | Germany
Tel: +49 6151 3969-961 | Fax: -736
maurice.ferte at basyskom.de | www.basyskom.de

Handelsregister: Darmstadt HRB 9352
Geschaeftsfuehrung: Eva Brucherseifer