[00:04] <TheMuso> And at this point, there is no point merging with 1.0.27-2, because its just a changelog entry and a re-upload to unstable, so doesn't bring anything in thats needed over 1.0.27-1.
[00:05] <TheMuso> And ALSA is one of those things hwere we have to tread carefully. As it is we haven't put out a wider call for testing yet because there are some important bugs that still need addressing that could be an issue for some.
[11:36] <dupondje> cjwatson: about fsl, if it builds fine, it should be ok :). Was just a fix to make it build again.
[11:36] <cjwatson> OK, I'll double-check and sync if it works, thanks
[12:03] <cjwatson> dupondje: Looks fine.  Synced.
[12:06] <dupondje> good :)
[14:17] <alo21> hi everybody... I am trying to merge bluemaa, but I have some questions about it..
[14:17] <Rhonda> wtf.
[14:18] <Rhonda> "Dear Mr. Fuchs"  *nibbles on Laney*
[14:18] <Rhonda> Why do people assume male gender?
[14:18] <Laney> Serious problems with Mr. Fuchs
[14:18] <Rhonda> Of course.
[14:18] <alo21> there is series.DEBIAN and series.UBUNTU in my debian/patches folder. the first now track only some patches, the second one others.... my question is: have to merge both files in one?
[14:19] <Rhonda> Laney: The mail is even in German.  I'm puzzled. :)
[14:19] <TheLordOfTime> i just address people as "SIR OR MADAM" when talking about IRC individuals
[14:19] <TheLordOfTime> unless I know someone :
[14:19] <TheLordOfTime> P
[14:19] <Rhonda> alo21: Why do you think you have to merge them?
[14:19] <Laney> Hi $nick, works
[14:19] <tumbleweed> "you there"
[14:19] <Rhonda> TheLordOfTime: Do it the other way round. :)
[14:19] <TheLordOfTime> Laney:  true, but :P
[14:19] <alo21> Rhonda, are series files important to apply patches?
[14:20] <Laney> alo21: You have to figure out what goes in what by examining the package
[14:20] <Laney> See: merges aren't a good place to get started
[14:20] <Rhonda> alo21: Of course, because they define which patches will get applied?
[14:20] <tumbleweed> alo21: merges really aren't a good place to get started
[14:21] <alo21> Rhonda, so.. as I told in my debian/patches folder I have two series file
[14:21] <Rhonda> Right.  And depending on the distribution you build on, either the one or the other will get used.
[14:21] <alo21> Laney, tumbleweed I've just made practise with sync, and I would like to do something a little bit difficult
[14:22] <Rhonda> Is there a German language ubuntu-users list?
[14:22] <Laney> ubuntu-de@lists.ubuntu.com
[14:22] <tumbleweed> merges and syncs are the same thing, really. You need to figure out whether a merge or a sync is the right thing to do, and that can be quite hard
[14:23] <alo21> Rhonda, does it means that I can delete series.DEBIAN file?
[14:23] <Laney> it's not technically an equivalent of ubuntu-users but should be good enough
[14:23] <Rhonda> Laney: Thanks.
[14:23] <Rhonda> alo21: No, you shouldn't.  That would be an unnecessary change.
[14:24] <alo21> tumbleweed, ok... I think blueman is a worth-merge.. and it can't be dropped. Am I right?
[14:25] <alo21> Rhonda, Do I have to check which debian's patches are useful in Ubuntu too?
[14:25] <geser> Rhonda: isn't series.DEBIAN and series.UBUNTU from the bzr merge where bzr couldn't automatically resolve the conflict and let the user do it?
[14:25] <tumbleweed> series.$distro is certainly a dpkg thing too
[14:26] <Laney> that's vendor.series
[14:26] <tumbleweed> ah
[14:28] <Rhonda> alo21: They should already be in series.UBUNTU I would expect.
[14:28] <Rhonda> geser: Oh, no clue about that part.  I thought they are this new fangled quilt v3 source format series files for each distribution?
[14:29] <Rhonda> Alright, forget my comments then, Laney knows better. :)
[14:29] <alo21> Rhonda, not all of them...in patches folder there are 3 .patch file and 7 patches without .patch extension
[14:29] <Laney> I imagine throwing in a VCS when you're already confused isn't the most helpful thing in the world
[14:30] <Rhonda> alo21: The extension doesn't mean much for patch files, to be honest.
[14:30] <alo21> Rhonda, series.UBUNTU tracks only .patch files, and series.DEBIAN the rest
[14:33] <alo21> what should I do?
[14:34] <geser> without knowing the package you try to merge: this sounds like the patches got renamed and bzr doesn't know how to resolve the conflict
[14:34] <alo21> geser, ok... I have another question too...
[14:35] <geser> I would suggest you first try to figure out what changed in the Debian branch (like renamed files) to better understand how the merge should like like
[14:36] <alo21> ok... thanks
[15:03] <Laney> bdrung: tumbleweed: Care to look at https://code.launchpad.net/~ursinha/ubuntu-dev-tools/fix_getBinaryPackage/+merge/159076 ?
[15:09] <tumbleweed> oh right I had seen that
[18:29] <psusi> ${word%%[*} should strip the string "sda1[1]" down to just the "sda1" part shouldn't it?
[18:31] <geser> psusi: my bash agrees (word="sda1[1]"; echo ${word%%[*} -> sda1)
[18:32] <psusi> hrm... that is odd.. because it isn't working in os-prober
[18:32] <psusi> wait... shit... looks like this may be a bloody bash vs. dash issue
[18:32] <geser> is os-prober run by bash? or only sh?
[18:33] <psusi> the shbang line is /bin/sh, so that's dash these days iirc
[18:33] <geser> yes
[18:34] <geser> word="sda1[1]"; echo ${word%%\[*} works in dash
[18:34] <geser> (and bash)
[18:42] <geser> psusi: ^^
[18:44] <psusi> cjwatson: could you take a look at bug #905607?  Simple missing escape character in os-prober causes it to fail to skip probing raid component devices when using dash