=== fredix [n=fredix@210.67.97-84.rev.gaoland.net] has joined #ubuntu-motu === Czessi_ [n=Czessi@dslb-084-059-005-008.pools.arcor-ip.net] has left #ubuntu-motu ["Kopete] === Kyral_ [n=kyral@ubuntu/member/kyral] has joined #ubuntu-motu [12:09] lucas: ok finished building the debian source in dapper [12:10] it builds but still has the -t issue [12:10] so going for a merge? [12:10] yep [12:10] ;) [12:10] what do I do? [12:10] file the bug in debian now, so you can include its number in the changelog without waiting [12:10] hmm ok [12:10] I shall first see if there's a but in LP ? [12:11] in the BTS [12:11] yes but I should first find the ubuntu bug, no? [12:11] (and LP, too, but the bug number in LP was probably mentionned in the ubuntu patch) [12:11] yes [12:11] also, when you have a debian bug number, attach it to the LP bug [12:11] (if you find one) === Kyral_ [n=kyral@ubuntu/member/kyral] has joined #ubuntu-motu [12:12] malone #1213 [12:12] Malone bug 1213: "wesnoth option -t does not work (error: "Unknown scenario: 'test'")" Fix req. for: wesnoth (Ubuntu), Severity: Minor, Assigned to: MOTU, Status: Fixed http://launchpad.net/bugs/1213 [12:12] thank you Ubugtu [12:12] :) [12:13] so you see, if Benjamin Montgomery had reported the bug to debian, it would have saved you a lot of time [12:13] oops [12:13] the bug was reported to debian [12:13] shame on the DD [12:14] I don't see it on the Debian BTS [12:14] :s [12:14] I'm on http://bugs.debian.org/cgi-bin/pkgreport.cgi?which=pkg&data=wesnoth&archive=no&version=&dist=unstable [12:14] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=337834 [12:15] Debian bug 337834: "missing test scenario file" Package: wesnoth-data, Version: wesnoth-data/1.0.1-1., Severity: minor, Maintainer: Isaac Clerencia http://bugs.debian.org/337834 [12:15] filed against wesnoth-data [12:15] oh it's on wesnoth-data that's why [12:15] ;) [12:15] the BTS makes a distinction between binary packages and source packages [12:15] hehe [12:15] ok [12:15] so what do I do if it was reported already? [12:15] shout on isaac on IRC ? ;) [12:16] http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=wesnoth for the src package [12:16] ok [12:16] you can try that [12:16] haha ok [12:18] I'm wondering [12:18] what? [12:18] it would probably better to use a wildcard, no ? [12:18] debian/tmp/usr/share/games/wesnoth/data/* [12:18] or something [12:18] hmm maybe === lucas has to check the .install file syntax [12:18] unless there are things not to be installed [12:18] * is fine in a .install [12:18] it works [12:19] it could be debian/tmp/usr/share/games/wesnoth/data/*.cfg [12:19] unless isaac meant to not install all of them [12:19] willingly [12:20] worth checking [12:21] listing the files like that is very error-prone [12:21] yes [12:21] very likely to miss one [12:23] hmm [12:23] he's not answering [12:23] :s [12:23] lucas: ok, since this was reported on both LP and D BTS already I guess I shall just go on with merging? [12:24] yes [12:24] but in the changelog, mention as much info as possible [12:24] :-) [12:24] very important [12:24] note that I'll be the second mergers reactivating this bug [12:24] the bug was reported in Debian by benjamin [12:24] yes, this sucks [12:24] so its an old bug we have to merge each time [12:24] the debian maintainer is not helpful [12:25] buxy wouldn't be happy ;) [12:25] he's not helpful to debian users either ;) [12:25] I talked with buxy yesterday [12:25] that was funny [12:25] funny ? [12:25] because I thought I wanted to talk to Raphael Hertzog [12:25] because he's a french guy involved in Debian and I thought he could advice me about some stuff [12:25] ah :) [12:25] so I searched for his nick on freenode [12:26] and found out that he was buxy [12:26] hehe [12:26] and that we had just had a conversation 2 hours before [12:26] where do you know him from ? [12:26] ;) [12:26] that's funny ;) [12:26] we had a conversation with him here yesterday [12:26] you were here [12:26] ;) [12:26] yeah, but I mean, before [12:26] iirc [12:26] apart from that well he's quite famous [12:27] you were at RMLL last year ? [12:27] he gave a good talk about Debian QA [12:27] I have a project on alioth that had to go through him [12:27] no [12:27] the only deb conf I went to was in spain, in may [12:27] a debian-custom conf [12:27] go this year :-) [12:27] where I met mark, presenting edubuntu [12:27] lucas: where is it this year? [12:27] well [12:27] I haven't got money lucas [12:27] RMLL is Rencontres Mondiales du Logiciel Libre [12:27] if I had a job I would go maybe [12:27] azeem: Nancy [12:27] east of france [12:28] ah, Dijon was PITA to get at [12:28] ok [12:28] will you be there lucas ? [12:28] lucas: are you going to Paris in the end of the month? [12:28] Nancy shouldn't be much better ;) [12:28] to the Solution Linux salon ? [12:28] I'll be in RMLL [12:28] bah [12:28] (probably) [12:28] not in SL ? [12:28] I won't go to solutions linux === jsgotangco [n=jsg@210.4.38.43] has joined #ubuntu-motu [12:28] when is RMLL? [12:28] I might go to FOSDEM === SEJeff [n=SEJeff@12-203-76-59.client.insightBB.com] has joined #ubuntu-motu [12:29] FOSDEM? [12:29] beginning of july, probably [12:29] ok [12:29] I'll see then [12:29] now to merge this #@ bug [12:29] ;) [12:30] what shall I do ? [12:30] merge the debian/changelog first ? [12:30] yes [12:30] lucas: shall I take the debian/changelog from MoM, put my name on it and describe my merge ? [12:30] and add an entry [12:31] yes [12:31] this is what I'll do [12:31] take the ubuntu one [12:31] then use dch to add an entry [12:31] I'll take the debian source, put the MoM debian/changelog in it, change the last entry to add my changes [12:31] and make the changes [12:31] is that fine? [12:32] no, you have to add an entry, not change it [12:32] the result is the same as ubuntu changelog + dch I guess [12:32] I'm pretty sure its' the same but ok [12:32] so I take the debian source [12:32] no, you need to keep the old ubuntu entry [12:32] put the ubuntu debian/changelog in it [12:32] and dch [12:32] basically, at the end, you get a changelog with 2 ubuntuX entries [12:32] lucas: the MoM changelog has the ubuntu entries [12:33] huh? [12:33] yup I know [12:33] (and the rest of it) [12:33] well, do it [12:33] why? [12:33] I'm sure it'll be fine [12:33] do what you think ;) [12:33] no no wait [12:33] you get: [12:33] 1.1-1ubuntu1 [12:33] 1.1-1 [12:33] ... [12:33] yes [12:33] 1.0.2-1ubuntu1 [12:33] so there's just one ubuntu entry [12:33] 1.0.2-1 [12:33] etc [12:33] in the end [12:33] to add [12:34] well [12:34] :() [12:34] :-) [12:34] I mean [12:34] if I take the ubuntu changelog, it'll miss the new debian version [12:34] which is required [12:34] since I'm merging [12:34] just cook something that works ;) [12:34] the mom changelog on the other hand has both debian and ubuntu changes [12:34] ok [12:34] I'll do that :) [12:35] I'll get the source again, since I built it and don't want to check if it's very very clean ;) [12:35] when you say "mom changelog", I don't know which one you mean [12:35] I mean the one I get when I extract the mom source package [12:36] oh [12:36] dpkg-source -x package-1ubuntu1.dsc [12:36] I never use it [12:36] provided by mom [12:36] there's a changelog in this one [12:36] made by mom === jonshea [n=jshea@Continuity.TuckNT.dartmouth.edu] has joined #ubuntu-motu [12:36] why? [12:36] ok, you can do that [12:36] it contains both debian and ubuntu changes [12:36] merged [12:36] well I dunno ;) [12:36] so it's complete [12:36] I'll show you [12:37] there's probably a lot of ways to reach the same point, anyway [12:37] this is what it contains : http://ubuntu.pastebin.com/492591 [12:37] (the changelog generated by mom) [12:38] seems to me that I just have to either replace the mom entry by mine manually [12:38] or remove it and dch [12:38] no? [12:38] isn't dch able to update it instead ? [12:39] I'm not a dch guru === Czessi_ [n=Czessi@dslb-084-059-005-008.pools.arcor-ip.net] has joined #ubuntu-motu [12:39] hmm [12:39] raphink: just use MoM's changelog and edit it [12:39] hehe [12:39] nm [12:40] LaserJock: ok that's what I thought :) [12:40] but use dch [12:40] I think dch -a or dch -e does what you want [12:41] dch -a is right === ajmitch never uses dch [12:41] why use dch ? [12:41] I can change it manually [12:41] ajmitch: why not? [12:41] putting my name, email add and date is not that hard ;) [12:41] LaserJock: because I never have the need? [12:41] raphink: dch -a is easier for me [12:41] for you ;) [12:41] ajmitch: you do it all by hand? [12:42] no, I use emacs with its debian-changelog-mode [12:42] which may use dch behind the scenes [12:42] oh ok [12:42] I do it all by hand :) [12:42] ajmitch: ahh, ok. I don't use emacs that much anymore [12:42] and I'm happy so far:) [12:42] it's faster for me to use emacs than dch [12:43] I wonder if vim has something similar? [12:43] possibly [12:43] dch uses vim properly [12:44] it opens a new line starting with * after the heading and before the byline thingy [12:44] lucas: [12:44] * Resynchronise with Debian. [12:44] - Restore scenario-test.cfg for -t switch [12:44] (Closes: Malone #1213) [12:44] Malone bug 1213: "wesnoth option -t does not work (error: "Unknown scenario: 'test'")" Fix req. for: wesnoth (Ubuntu), Severity: Minor, Assigned to: MOTU, Status: Fixed http://launchpad.net/bugs/1213 [12:44] I just put it again [12:44] add the debian bug # === Kyral [n=kyral@ubuntu/member/kyral] has joined #ubuntu-motu [12:44] ok [12:44] how do I name it ? [12:45] Debian bug: # ... [12:45] ? [12:45] yes, for example [12:45] also, I would add [12:45] whee bug reporting time [12:45] ok [12:45] gnome-schedule [12:45] "in debian/wesnoth-data.install" [12:45] somewhere [12:45] * Resynchronise with Debian. [12:45] the more info you put now [12:45] - Restore scenario-test.cfg for -t switch [12:45] (Closes: Malone #1213 & Debian bug #337834) [12:45] Malone bug 1213: "wesnoth option -t does not work (error: "Unknown scenario: 'test'")" Fix req. for: wesnoth (Ubuntu), Severity: Minor, Assigned to: MOTU, Status: Fixed http://launchpad.net/bugs/1213 [12:45] Debian bug 337834: "missing test scenario file" Package: wesnoth-data, Version: wesnoth-data/1.0.1-1., Severity: minor, Maintainer: Isaac Clerencia http://bugs.debian.org/337834 [12:45] like that? [12:46] ok [12:46] the less time you spend next time [12:46] yes [12:46] - Restore scenario-test.cfg for -t switch in debian/wesnoth-data.install === JohnnyMast [n=rave@cpc2-cosh5-5-0-cust84.cos2.cable.ntl.com] has joined #ubuntu-motu [12:46] actually it doesn't really closes the debian bug [12:47] just add "see debian bug #337834" [12:47] Debian bug 337834: "missing test scenario file" Package: wesnoth-data, Version: wesnoth-data/1.0.1-1., Severity: minor, Maintainer: Isaac Clerencia http://bugs.debian.org/337834 [12:47] ok [12:48] * Resynchronise with Debian. [12:48] - Restore scenario-test.cfg in debian/wesnoth-data.install so that -t switch [12:48] will work. [12:48] (Closes: Malone #1213 ; see Debian bug #337834) [12:48] Malone bug 1213: "wesnoth option -t does not work (error: "Unknown scenario: 'test'")" Fix req. for: wesnoth (Ubuntu), Severity: Minor, Assigned to: MOTU, Status: Fixed http://launchpad.net/bugs/1213 [12:48] Debian bug 337834: "missing test scenario file" Package: wesnoth-data, Version: wesnoth-data/1.0.1-1., Severity: minor, Maintainer: Isaac Clerencia http://bugs.debian.org/337834 [12:48] lucas: fine for you? [12:48] perfect [12:49] ;) [12:49] now do I patch or change manually? [12:49] now, don't forget to change debian/wesnoth-data.install [12:49] it's just one line to patch so I guess I can do it manually ;) [12:49] you can change manually I'd say ;) [12:49] hehe [12:49] then rebuild, then test [12:50] done [12:50] ok rebuilding then :) [12:50] debuild -S -sa [12:51] then with the pbuilder [12:51] I guess ;) === raphink prefers to ask stupid questions the first time to not ask them too late ;) [12:52] no problem :-) [12:52] yes, both, or just pbuilder [12:52] just pbuilder is enough imo [12:52] what we are doing here is the canonical way [12:52] if it builds in pbuilder, it builds in my trashy system [12:52] ;) [12:52] there might be some shortcuts you can take for some packages [12:53] when you are very sure about your changes [12:53] yes I guess [12:53] well I always prefer to check my work [12:53] I check the work of others on REVU through these steps [12:53] so I wouldn't be honest not checking it the same way for my own packages ;) [12:53] :-) [12:53] + this is quality assurance [12:54] and I prefer to spend time checking before uploading [12:54] than correcting bugs afterwards, when you don't remember what you did [12:54] ;) [12:54] because I'm lazy ;) [12:54] hi raphink, how is your merge coming? [12:55] and lazy people work better to not have to work again [12:55] seth_k|lappy: almost done I think [12:55] it's rebuilding [12:55] seth_k|lappy: but it's a 43MB source so it takes some time to build ;) [12:55] haha yes [12:56] my flat is freezing [12:56] :s [12:56] or well I'm freezing in my flat rather [12:56] :s [12:56] hehe === seth_k|lappy hugs nafallo for merging in the new mysql-query-browser [12:57] now my life can continue [12:57] hehe === raphink needs to upgrade his shelf [01:00] Error : shelf too small for all trousers and pull-overs [01:00] is that a stack overflow error? [01:01] :P [01:01] yes it seems [01:01] :( [01:01] I shall not use extended pull-overs === raphink suspected his new trousers are floating points ones === raphink thinks he should go to bed soon === raphink is still waiting for wesnoth to build === psusi [n=phreak@103.202.33.65.cfl.res.rr.com] has joined #ubuntu-motu [01:15] lucas: package built in pbuilder, installed, tested [01:15] working :) [01:15] now to find a MOTU to upload it? [01:16] no, put the debdiff in the bug report, and assign to motureviewers [01:16] maybe lpbugs does that for you [01:16] $ debdiff wesnoth_1.1-1.dsc wesnoth_1.1-1ubuntu1.dsc [01:16] ? === lucas never remembers exactly what lpbugs does [01:16] yes [01:16] ues [01:16] yes [01:16] :) [01:16] is there anyone around who can fix up my gpg key to have access to upload to revu? [01:17] so I just [01:17] ./lpbugs.py -u -b -p [01:18] and it will ask me to join the debdiff ? [01:18] psusi: siretart or sistpoty, but they are both away [01:18] never used that ;) [01:18] maybe you must attach the debdiff manually [01:18] ok [01:19] blast... [01:19] I'll see what it tells me [01:19] psusi: ajmitch can do it too [01:20] http://tiber.tauware.de/~lucas/versions/ [01:20] finished === ajmitch can? [01:20] slomo, is he around? [01:20] that answered my question, but made it pointless ;) [01:20] ajmitch: i thought you were in the tiber admin team? ;) [01:20] yeah I am [01:20] I can add users to revu [01:20] if needed === psusi sent in his gpg key for revu access the other day... could use some help [01:21] ok... I sent in the email the other day like the wiki said to... do you need me to send it to you now? [01:21] sure, I'll take a look [01:23] psusi: please upload your key to a keyserver [01:24] do I check the patch box if I attach a debdiff ? [01:24] yes [01:24] ok :) [01:24] logical, but yet I prefer to ask [01:24] well that dapper upgrade was successful [01:25] ok... I think I just uploaded it to ubuntu's keyserver [01:27] not there yet === trulux [n=lorenzo@unaffiliated/trulux] has joined #ubuntu-motu [01:27] lucas: merge done ? :) [01:28] gpg --send-keys --keyserver keyserver.ubuntu.com < that's all I need to do right? [01:28] it seems to complete really fast [01:28] with no output [01:28] returned 0 though [01:28] raphink: looks like :) congratulations :-) [01:29] lucas: I have to mark it as pending upload now? [01:29] yes, and assign it to motureviewers [01:29] manually? [01:30] done :) [01:31] if lpbugs didn't do it for you, yes [01:32] and now I need to try it really [01:32] anybody wants to test wesnoth on a 1vs1 with me ? [01:32] hehe [01:34] I never played [01:34] and it's a bit late [01:34] it's a nice game :) [01:34] don't you want a short game ? ;) [01:34] hehe [01:34] ah, you aren't finished yet [01:35] put the merge on your wiki homepage [01:35] (see mine) [01:35] done lucas ;) [01:35] ah [01:35] 10 minutes ago [01:35] psusi: gpg --keyserver keyserver.ubuntu.com --send-keys 8b3e5ee2 [01:35] I didn't check [01:35] http://wiki.ubuntu.com/RaphaelPinson [01:35] I always keep my wikipage up-to-date [01:36] ajmitch, aha... that looks like it did something [01:36] et wesnoth a dchire lucas :) [01:37] I should try some day [01:37] ok [01:37] haha [01:37] we're 7 players on the wesnoth 1.1 server [01:37] bad thing about updating ;) [01:38] raphink, did lucas walk you through merging in this channel? === seth_k|lappy will read the log if so to find out best way to do it [01:38] yes seth_k|lappy [01:38] :) [01:38] grood [01:39] very grood [01:39] sorry [01:39] I meant vey grood ;) [01:39]