[00:04] 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] 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. === GeertJohan|afk is now known as GeertJohan [11:36] cjwatson: about fsl, if it builds fine, it should be ok :). Was just a fix to make it build again. [11:36] OK, I'll double-check and sync if it works, thanks [12:03] dupondje: Looks fine. Synced. [12:06] good :) [14:17] hi everybody... I am trying to merge bluemaa, but I have some questions about it.. [14:17] wtf. [14:18] "Dear Mr. Fuchs" *nibbles on Laney* [14:18] Why do people assume male gender? [14:18] Serious problems with Mr. Fuchs [14:18] Of course. [14:18] 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] Laney: The mail is even in German. I'm puzzled. :) [14:19] i just address people as "SIR OR MADAM" when talking about IRC individuals [14:19] unless I know someone : [14:19] P [14:19] alo21: Why do you think you have to merge them? [14:19] Hi $nick, works [14:19] "you there" [14:19] TheLordOfTime: Do it the other way round. :) [14:19] Laney: true, but :P [14:19] Rhonda, are series files important to apply patches? [14:20] alo21: You have to figure out what goes in what by examining the package [14:20] See: merges aren't a good place to get started [14:20] alo21: Of course, because they define which patches will get applied? [14:20] alo21: merges really aren't a good place to get started [14:21] Rhonda, so.. as I told in my debian/patches folder I have two series file [14:21] Right. And depending on the distribution you build on, either the one or the other will get used. [14:21] Laney, tumbleweed I've just made practise with sync, and I would like to do something a little bit difficult [14:22] Is there a German language ubuntu-users list? [14:22] ubuntu-de@lists.ubuntu.com [14:22] 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] Rhonda, does it means that I can delete series.DEBIAN file? [14:23] it's not technically an equivalent of ubuntu-users but should be good enough [14:23] Laney: Thanks. [14:23] alo21: No, you shouldn't. That would be an unnecessary change. [14:24] tumbleweed, ok... I think blueman is a worth-merge.. and it can't be dropped. Am I right? [14:25] Rhonda, Do I have to check which debian's patches are useful in Ubuntu too? [14:25] 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] series.$distro is certainly a dpkg thing too [14:26] that's vendor.series [14:26] ah [14:28] alo21: They should already be in series.UBUNTU I would expect. [14:28] 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] Alright, forget my comments then, Laney knows better. :) [14:29] Rhonda, not all of them...in patches folder there are 3 .patch file and 7 patches without .patch extension [14:29] I imagine throwing in a VCS when you're already confused isn't the most helpful thing in the world [14:30] alo21: The extension doesn't mean much for patch files, to be honest. [14:30] Rhonda, series.UBUNTU tracks only .patch files, and series.DEBIAN the rest [14:33] what should I do? [14:34] 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] geser, ok... I have another question too... [14:35] 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] ok... thanks [15:03] bdrung: tumbleweed: Care to look at https://code.launchpad.net/~ursinha/ubuntu-dev-tools/fix_getBinaryPackage/+merge/159076 ? === GeertJohan is now known as GeertJohan|afk [15:09] oh right I had seen that [18:29] ${word%%[*} should strip the string "sda1[1]" down to just the "sda1" part shouldn't it? [18:31] psusi: my bash agrees (word="sda1[1]"; echo ${word%%[*} -> sda1) [18:32] hrm... that is odd.. because it isn't working in os-prober [18:32] wait... shit... looks like this may be a bloody bash vs. dash issue [18:32] is os-prober run by bash? or only sh? [18:33] the shbang line is /bin/sh, so that's dash these days iirc [18:33] yes [18:34] word="sda1[1]"; echo ${word%%\[*} works in dash [18:34] (and bash) [18:42] psusi: ^^ [18:44] 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 [18:44] bug 905607 in os-prober (Ubuntu) "software raid component drives erroneously detected" [Medium,Triaged] https://launchpad.net/bugs/905607