[12:30] <manicka> hi bustacap
[12:31] <bustacap> gday manicka
[04:09] <Madpilot> is there an svn command to merge a diff I've been sent into my local copy? svn merge looks right, but I can't figure out the syntax
[04:12] <LaserJock> hmm, not sure
[04:14] <Madpilot> I've created a fair number of diffs, but never bothered figuring out how to handle them further :P
[04:15] <LaserJock> is your local copy clean?
[04:18] <Madpilot> yes
[04:20] <LaserJock> then you should just apply the patch then
[04:21] <LaserJock> yikes, bad grammar there
[04:30] <Madpilot> svn's help is being non-helpful - which *is* the 'apply this patch' command, anyway?
[04:31] <Burgundavia> Madpilot: svn not being helpful. What a shock
[04:32] <Madpilot> Burgundavia, by man-page standards, svn help is reasonable :P
[04:32] <LaserJock> Madpilot: why not use patch ?
[04:33] <Madpilot> the regular console command patch? (there doesn't seem to be an "svn patch"...)
[04:33] <LaserJock> yeah, that is what I always use
[04:34] <Madpilot> Ah, OK. bleh - given that svn uses it's own patch-creation routine, I was expecting patch-merging to be in svn as well
[04:36] <LaserJock> well, you aren't supposed to do anything outside of the repo so ;-)
[04:37] <Madpilot> I'm still confused - what's the 'usual' method of dealing with diffs, then?
[04:37] <LaserJock> patch
[04:40] <Burgundavia> patch -p0 patch.patch file (I think)
[04:41] <Madpilot> and if it's a diff encompassing multiple files?
[04:49] <LaserJock> usually you have to adjust the -p to -p1 or -p2 depending on how deep it is
[04:51] <Madpilot> "patch -p0 udgaddperiod.diff
[04:51] <Madpilot> " - but all it does is sit there until I hit Ctrl+C, no matter which directory I stick the .diff in before I start - wtf?
[04:53] <LaserJock> oh, use < to pipe the file in
[04:54] <LaserJock> patch uses stdin for the diff
[04:55] <Madpilot> ah
[04:56] <Madpilot> that finally worked - thanks
[05:13] <LaserJock> np Madpilot 
[05:34] <LaserJock> hi robotgeek 
[05:34] <robotgeek> hey LaserJock 
[05:34] <Madpilot> hi robotgeek 
[05:34] <robotgeek> hey Madpilot 
[05:37] <robotgeek> had to /remove someone in #kubuntu
[05:38] <LaserJock> really?
[05:39] <robotgeek> yeah, i hate it when people paste without reading /topic
[05:39] <crimsun> lj: will review packaging guide later this weekend (a bit more time now that the alsa patches have been spun)
[05:40] <LaserJock> crimsun: ok, cool. I really got to get a lot done on that this weekend
[05:41] <crimsun> ok, I'll see if I can svn up before sunday, but I'm away from Ubuntu this weekend visiting my gf in Atlanta
[05:43] <robotgeek> Madpilot: seveas fixed the nice script for me and nalioth
[05:43] <Madpilot> robotgeek, which script?
[05:44] <robotgeek> irssi only, but it basically ops and deops you automatically after performing the required action
[05:44] <Madpilot> ah, that one. Doesn't someone have an XChat version too? (Seveas?)
[05:44] <robotgeek> hmm, maybe
[05:45] <robotgeek> nalioth and I owe seveas some beer for fixing perl code!
[06:08] <robotgeek> Madpilot: apparently the java version is not at update 6. i will make those changes, with some added instructiosn for ppc also
[06:20] <robotgeek> Madpilot: i'm wondering what is the best way to do this
[08:15] <Burgundavia> hey robitaille
[08:16] <robitaille> Hi Burgundavia 
[08:28] <robotgeek> mdke: ping
[08:35] <Madpilot> hi all
[08:36] <Burgundavia> salut Madpilot
[08:37] <robotgeek> hey Madpilot 
[08:38] <robotgeek> Madpilot: can you take a look at the java section in kdg and see if you like it?
[08:39] <Madpilot> robotgeek, sure - maybe not tonight, though
[08:40] <robotgeek> Madpilot: it's a small section, i will commit the changes for you too :)
[08:40] <Madpilot> robotgeek, just a minute, then I'll have a loook
[08:48] <Madpilot> robotgeek, shouldn't the Java section be somewhere more conspicuious than "Misc. Tips"?
[08:48] <robotgeek> Madpilot: hmm, did you guys move it already? :)
[08:49] <Madpilot> in UDG it's in Internet, in with the other Firefox setup tips
[08:49] <robotgeek> Madpilot: no, it's in programming
[08:50] <Madpilot> gah, you're right - I'm behind the times too :P
[08:50] <Madpilot> there's a link to it from the Internet section though
[08:50] <robotgeek> Madpilot: yeah, i see that. I will do the same. 
[08:50] <robotgeek> but other than that, the content is fine?
[08:51] <Madpilot> Yes
[08:51] <robotgeek> cool, i'll move it and commit it
[08:51] <Madpilot> I'm going to steal your warning about what Java applies to for UDG
[08:52] <robotgeek> Madpilot: i was planning to copy over the java section to UDG and commit too
[08:52] <robotgeek> since you seemed to be in a hurry :)
[08:52] <Madpilot> sure, go ahead - thanks
[08:54] <robotgeek> i also updated the versions
[09:01] <robotgeek> Madpilot: Committed as revision 2574.
[09:02] <Madpilot> robotgeek, thanks
[09:02] <robotgeek> Madpilot: there are a couple of ppc things which i will be doing, hopefully
[09:02] <Madpilot> robotgeek, do you run PPC?
[09:02] <robotgeek> yes
[09:03] <robotgeek> hence the "help needed" sections on the guide, i can't install all that stuff even if i wanted to
[09:03] <Madpilot> anyone active on the docteam run AMD64, do you know?
[09:03] <robotgeek> nope, i know nalioth runs amd64
[09:07] <robotgeek> welcome tonyyarusso 
[09:07] <tonyyarusso> I have arrived.
[09:07] <Madpilot> hi tonyyarusso 
[09:08] <tonyyarusso> Madpilot: Hi.
[09:09] <Madpilot> tonyyarusso, there's a docteam mailing list as well, if you're interested in joining that
[09:10] <tonyyarusso> Madpilot: I may.  First I need to take a few minutes to get my e-mail under control.
[09:10] <tonyyarusso> My nautilus-list things are already somewhat annoying, and no longer relevant, so I should probably part with that, and maybe use a different account next time.
[09:11] <tonyyarusso> (Not a fan of when my gdesklet says 12 new messages and they're all mailing list)
[09:11] <robotgeek> +1 tonyyarusso 
[09:11] <tonyyarusso> What was that?
[09:12] <robotgeek> i used to get pissed off about those mails too :)
[09:12] <tonyyarusso> So are there some good little wiki things outlining good practice for things like documenting an installation experience, describing an OS, etc.?  A large portion of my hopeful intended audience is Windows users that I want to inform about alternatives, especially now that Vista is on the horizon.
[09:13] <tonyyarusso> robotgeek: I see.
[09:13] <Madpilot> tonyyarusso, see the /topic here for a bunch of good links that should get you started - quick questions here, longer questions to the ML
[09:13] <tonyyarusso> I joined initially to ask about selecting files, like the Windows Explorer behavior.
[09:13] <tonyyarusso> Madpilot: Gotcha.
[09:14] <tonyyarusso> The /topic says next meeting a week ago...
[09:15] <Madpilot> Not anymore, it doesn't :P
[09:26] <Burgundavia> Madpilot: see my followup to the disucss list
[09:27] <Madpilot> Burgundavia, on freegeek victoria, you mean? Sounds interesting, too bad ReStore can't participate 
[09:27] <tonyyarusso> Madpilot: What's the TBA about?
[09:27] <Madpilot> tonyyarusso, we don't have an exact date, but our meetings are always every two weeks - so right now it's just "sometime in the 3rd week of March"
[09:28] <tonyyarusso> Madpilot: I was told this coming Tuesday would have a meeting about possibly delaying 6.04.
[09:28] <Burgundavia> tonyyarusso: indeed it will
[09:28] <Madpilot> tonyyarusso, yeah, I read Mark Shuttleworth's email
[09:29] <tonyyarusso> Madpilot: So shouldn't that info be in that?
[09:29] <robotgeek> tonyyarusso: do you have a x86 machine and a kubuntu dapper iso?
[09:29] <Burgundavia> ah, crap Flight 5 made the front page of Digg and it is not even released
[09:29] <robotgeek> lol
[09:29] <Madpilot> tonyyarusso, probably - the announcement was only this morning, though
[09:29] <tonyyarusso> robotgeek: x86 with Ubuntu, ShipIt disks.
[09:30] <tonyyarusso> Madpilot: Point.
[09:30] <robotgeek> tonyyarusso: hmm okay
[09:30] <tonyyarusso> Actually, Danielle has my last disk now.  I guess I need Dapper soon to have a disk!
[09:30] <tonyyarusso> robotgeek: Why do you ask?
[09:31] <robotgeek> tonyyarusso: testing what i wrote, i am a ppc user. a full list of things is currently being emailed :)
[09:31] <tonyyarusso> robotgeek: ah.
[09:32] <Madpilot> robotgeek, send your list to the ML too - I've got Flight4 CDs of both Ubuntu & Kubuntu burned
[09:32] <robotgeek> Madpilot: yes, i am mailing the list, and point nalioth the url :)
[09:32] <Madpilot> cool
[09:37] <robotgeek> sent
[09:40] <tonyyarusso> Hey, if you haven't kept track in the past, can you check for a list of all of the wiki pages you have edited somehow?
[09:43] <Burgundavia> tonyyarusso: probably, but not easily
[09:43] <Burgundavia> tonyyarusso: there is "User contributions" button ala Wikipedia, if that is what you mean
[09:43] <tonyyarusso> Burgundavia: Is that user-tied or page-tied?
[09:44] <Burgundavia> tonyyarusso: in wikipedia?
[09:44] <tonyyarusso> Burgundavia: Either?
[09:44] <tonyyarusso> Whatever you think tells me what I need to know.
[09:45] <Burgundavia> mediaiwiki is per user as well as per page
[09:45] <Burgundavia> moin currenlty only does per page, unless there is a(nother, sigh) hidden feature
[09:46] <tonyyarusso> Hrm.  'k.
[11:12] <mdke> hiya
[11:12] <Madpilot> hi
[11:12] <jpatrick> hi
[11:19] <Madpilot> night all
[11:19] <jpatrick> night Madpilot 
[08:09] <mkde> does anyone know where the admonition icons we use came from? I need some slightly larger versions
[08:10] <mkde> ah hell
[08:11] <mkde> let's see how that looks
[10:51] <LaserJock> trappist: I hope something develops fom your init scripts thread in u-devel