[06:41] < Lawouach_> morning all

[08:09] *** orphans has joined #kamaelia

[10:25] *** Davbo has joined #kamaelia

[10:34] < Davbo> morning all

[10:34] < Davbo> Lawouach_ are you BST+1? or GMT+1

[10:34] < Lawouach> GMT

[10:35] < Lawouach> currently GMT+2 due to summer time

[10:35] < Davbo> ah,yeah

[11:16] *** bcarlyon|laptop has joined #kamaelia

[11:33] *** MS- has joined #kamaelia

[11:41] < Davbo> MS-: Why in Tools2Apps do we have /Kamaelia/Tools/Whiteboard but also have /Kamaelia/Kamaelia/Apps/Whiteboard?

[11:41] < MS-> Because the lift & shift is

[11:42] < MS-> /Kamaelia/Tools/Whiteboard/Whiteboard

[11:42] < MS-> to

[11:42] < MS-> /Kamaelia/Kamaelia/Apps/Whiteboard

[11:42] < Davbo> oh right, so it is

[11:42] < MS-> The whiteboard tools are in: /Kamaelia/Tools/Whiteboard

[11:42] < Davbo> Sorry, I must have not paid attention with the diff

[11:42] < Davbo> it's a bit of a confusing diff, in fairness :)

[11:43] < MS-> it essentiall does boil down to a lift and shift of things really

[11:47] < Davbo> Yeah, lets just get this merged, there doesn't seem to be anything wrong with it

[11:48] < Davbo> Compose works fine, I get the same error about Speex I always get when trying to run Whiteboard :-)

[11:53] < Davbo> Did you get chance to look at my diff for the irc logger MS-?

[11:53] *** Uraeus has joined #kamaelia

[11:54] < Davbo> I was holding off merging it until you checked that

[11:54] < MS-> Did you install speex?

[11:55] *** MS- moves off channel

[12:09] < Davbo> pyrex fails building pyspeex I believe

[12:09] < Davbo> and it just drops out

[12:09] < Davbo> it's a very uninformative error so I'm not entirely sure what to do with it

[12:09] < Davbo> I can run Whiteboard without speex anyway with minor changes

[12:11] < MS-> Cool. That means the minor changes to make that work, work :)

[12:14] < Davbo> I don't know what package layout I should use hmm

[12:16] < Davbo> speex.c:1:2: error: #error Do not use this file, it is the result of a failed Pyrex compilation.

[12:16] < Davbo> error: command 'gcc' failed with exit status 1

[12:21] < MS-> which version of pyrex are you using?

[12:21] < MS-> pyrex changed

[12:21] < Davbo> I've made a start on a Paint tools component and a Colour Selector MS-, I don't think I'll add them onto MagnaDoodle, instead copy MagnaDoodle rename it to Paint and add those features to that, make the transition to my main project.

[12:21] < MS-> It may be a good idea to use the version in the megabundle

[12:22] < MS-> k

[12:22] < MS-> sounds reasonable

[12:22] < MS-> you can always later look at integrating into the whiteboard (part of the _original_ ) plan later, but fundamentally the project is about a paint tool :)

[12:23] < MS-> And it's always worth remembering the original aims with these things and what mattered - in this case a fun paint tool :)

[12:24] < MS-> with multiple windows to show multiprocess stuff

[12:24] < MS-> That reminds me, I'll need to deal with multiprocess stuff next week

[12:24] < Davbo> I'm sure things will come across from Whiteboard in the process

[12:24] < Davbo> if not it wouldn't be difficult due to the nature of them

[12:25] *** MS- wanders off for a while

[12:32] < vmlemon> Hi

[12:39] < Davbo> Hey vmlemon

[12:40] < vmlemon> o.O "This plug for the IDE allows the legal staff not to delete this section C1(c) and thereby mess up our section numbering system between licenses."

[13:29] *** bcarlyon|laptop has joined #kamaelia

[13:29] *** bcarlyon|laptop has parted #kamaelia

[13:45] < Davbo> MS-: I don't see any blockers for merging both Tools2Apps and IRC Logger

[13:45] < Davbo> Alright if i go ahead and merge now?

[13:59] < MS-> yep - if it all looks horribly wrong afterwards, we can always revert :)

[13:59] < MS-> But they wouldn't've been up for merge if I didn't think they were basically OK

[13:59] < MS-> :)

[13:59] < Davbo> I'm trying to do it now humm

[13:59] < Davbo> not 100% on what I do

[13:59] < MS-> That was in the ready to merge mail...

[13:59] < MS-> :-)

[14:00] < Davbo> I made changes to the logger so i don't want to merge the revision you have here though right?

[14:01] < MS-> That number remains the same

[14:01] < MS-> that number on the left is the revision number where the branch was created

[14:02] < Davbo> ah

[14:03] < Davbo> [root@localhost private_MPS_KamaeliaLogger]# svn update

[14:03] < Davbo> At revision 4346.

[14:03] < Davbo> [root@localhost Python]# svn merge -r4346:HEAD ../../../private_MPS_KamaeliaLogger .

[14:03] < Davbo> that didn't do anything then did it?

[14:03] < Davbo> hmm

[14:04] < Davbo> (it didn't spit out any updates anyway)

[14:06] *** Davbo see's what it does now

[14:06] < MS-> That doesn't cause any checkin - it just modifies your local version

[14:06] < MS-> if you type

[14:06] < MS-> svn diff

[14:06] < MS-> it will show you want you've applied to /trunk/Code/Python

[14:08] < Davbo> svn: Access scheme mixtures not yet supported ('http://kamaelia.svn.sourceforge.net/svnroot/kamaelia/branches/private_MPS_KamaeliaLogger/Apps/Kamaelia-Logger' and 'https://kamaelia.svn.sourceforge.net/svnroot/kamaelia/trunk/Code/Python/Apps')

[14:13] *** Davbo tries somethign

[14:18] < Davbo> merged the logger

[14:19] < MS-> ta

[14:19] < MS-> :)

[14:20] *** MS- gets lunch

[14:36] < Davbo> MS-: I tried merging the Tools2Apps but I dont think it worked correctly

[14:37] < Davbo> It made merge-left and merge-right files from the setup.py

[14:37] < Davbo> a merging conflict i think

[14:37] < Davbo> i've not commited so no big problem

[16:04] *** orphans_ has joined #kamaelia

[16:25] *** Chong- has joined #kamaelia

[16:41] < Lawouach> back

[16:58] < Davbo> Lawouach I tried to merge and ended up with merge-left and merge-right

[16:58] < Davbo> that means it didn't go to plan doesn't it? :-(

[16:58] < Lawouach> probably, just try again :)

[16:59] < Lawouach> merging is hard

[16:59] < Davbo> Will leave it for now, I have a suspicion about it though

[16:59] < Davbo> it was on setup.py for Kamaelia

[17:29] *** j_baker has joined #kamaelia

[17:42] *** bcarlyon|laptop has joined #kamaelia

[17:54] *** vmlemon_ has joined #kamaelia

[18:02] *** vmlemon_ has joined #kamaelia

[18:02] *** jle_ has joined #kamaelia

[18:02] *** vmlemon__ has joined #kamaelia

[18:12] *** vmlemon__ has joined #kamaelia

[18:12] *** vmlemon__ is now known as vmlemon_

[18:24] *** jle_ has joined #kamaelia

[18:26] *** Chong- has joined #kamaelia