[12:27] it should basically be your prefs entry [12:27] you see that? [12:27] yes [12:27] i know the bad part but how do i fix it [12:28] take care that you changelog entry for mt9 ends up on top [12:28] it is on top [12:28] it the conflict [12:28] show me the conflict section please [12:28] yeah [12:28] mt9 [12:28] yes show it please [12:28] pastebin? [12:28] i will try to explain [12:28] yes of course [12:28] the whole conflict [12:29] oh crap [12:30] http://gnomefreak.pastebin.ca/562814 [12:30] didnt look any further tha the ======= line [12:30] but way down there is >>>>> merge source [12:30] can you add a bit more context below the MERGE SOURCE [12:30] you don'tneed to if things are proper below that [12:31] ok its pretty simple [12:31] in the TREE section is what you changed [12:31] right [12:31] and in the MERGE SOURCE is what changed in the same place in mozillateam branch [12:31] so thats a conflict and bzr doesn't know what to do [12:31] k [12:32] (which is obvious, because there are multiple ways this could be ment to be [12:32] option a: [12:32] - your change is a change that has never been released, so document it in a changelog entry on top of all [12:32] option b: [12:33] - your change was initially done on top of 1.1.1-something ... so put your changelog entry in there [12:33] e.g. below the first 1.1.2-1 entry [12:33] above 1.1.1+u2-0ubuntu1 or below itr [12:34] above mt8 im assuming [12:34] if you put it above ... then you need to use a higher version than the latest [12:34] 1.1.2.dfsg1-2 is latest [12:34] otherwise you just need to put your changelog entry in the proper place [12:35] e.g. above mt8 [12:35] its in proper place do i remove all the === and >>> lines? [12:35] yes if its in proper place you remove them [12:36] ok now do i commit [12:36] what version did you choose? [12:36] i added it above mt8 [12:36] ah ok [12:37] you say [12:37] bzr resolved [12:37] ... bzr should detect that the file has been resolved [12:37] does it work? [12:37] yep [12:37] good [12:37] then please show me the bzr diff debian/changelog [12:37] just to verify :) [12:39] http://gnomefreak.pastebin.ca/562844 [12:40] yes looks good. well done [12:40] not yet [12:40] more conflicts? [12:40] i have uncommited changes :( [12:40] yes [12:40] you have to commit with a message that explains what you did in merge [12:40] e.g. merging up to revision XXX from mozillateam branch [12:41] what do i commit? debian dir? [12:41] + resolved conflict in changelog by doing bla bla bla [12:41] gnomefreak: all [12:41] you have to commit all at once now [12:41] otherwise you won't commit the pending merges [12:41] properly [12:41] how do i do it all at once? [12:41] you should see the pending merges with bzr status at the moment [12:41] gnomefreak: just bzr commit [12:42] ah [12:42] without any file [12:42] gnomefreak: Note: usually you shouldn't do that ... just for merges [12:42] remember to explain in log message how you resolved the conflict [12:42] then you can push [12:42] ah ok i will let me seee if i can do this god i hope it works === bluekuja [n=andrea@ubuntu/member/bluekuja] has joined #ubuntu-mozillateam [12:43] gnomefreak: just try to reflect what you did [12:43] gnomefreak: :) [12:43] you resolved the conflict of the merges manually [12:43] now you commit the merge [12:45] if you have done that, let me know so i can merge your changes to mozillateam branch for release [12:45] im about to push [12:46] yeah :) [12:46] brb smoke while it pushes [12:48] gnomefreak: have you looked at your name in bzr changelog? [12:48] you should set your name and email properly [12:48] gnomefreak: you can set your EMAIL environment in .bashrc [12:50] no i didnt i thought it was @ubuntu.com [12:51] @gutsy [12:51] what do i add? i lost it from last time i had it set [12:52] export EMAIL=gnomefreak@ubuntu.com [12:52] oops it was waiting for my passphrase [12:52] in $HOME/.bashrc [12:53] ok its added [12:53] push done? [12:53] yes but Lp hasnt updated yet [12:53] gnomefreak: can you prepare an orig.tar.gz? [12:54] sure but will be a while i need to grab upstream source i dont htink i have it atm [12:54] http://pastebin.mozilla.org/87560 [12:54] look how nice it merged :) [12:54] yay thank you :) [12:55] would be great if you can push the orig [12:55] just use the current upstreawm version on top [12:55] i will bump it and rename the orig accordinlgy [12:55] once i have the orig, I will push it (given that binaries are in) :) [12:55] push orig to where? [12:56] gnomefreak: you messed things up [12:56] look at the patch [12:56] it contains loads of garbage [12:56] can you fix that as well? [12:57] i guess only the changes of first patch in that file are needed [12:57] what do you mean? let me look at this [12:57] yes look into it [12:57] i think the first 10 lines is what you want [12:57] the rest you don't [12:57] about 2380 lines of garbage [12:58] why the hell did it do that [12:58] gnomefreak: because you operated on a borked orig.tar.gz :) [12:58] you had all.js~ inside it [12:58] aehm ... i mean you edited inside dpatch-edit-patch [12:58] yes [12:58] and somehoe managed to keep the vi backup file [12:59] when you exited [12:59] oh [12:59] didnt know i did that [12:59] just remove everything in that patch that affects all.js~ [12:59] gnomefreak: yeah ... its important to look into the result :) [12:59] ... next time :-P [12:59] just remove it with editor [12:59] commit the updated prefs patch [12:59] and push [12:59] do i need to use dpatch or can i do it by opening patch in editor [12:59] ah ok [12:59] you can edit by editor [01:00] i think all from line 21 downwards can go [01:00] +pref("browser.toolbars.showbutton.go", false); [01:00] + [01:00] is that really what you want? [01:00] i mean "false" ? [01:01] so you disable the go button? [01:01] no i want it true [01:01] let me look at this :( [01:01] sob [01:01] can i edit that too while in here [01:02] you can ... but remember that editing patches directly is advanced :) [01:02] only edit dpatches if you have a clean tree [01:02] otherwis debian/rules clean will fail to unapply [01:02] are you looking at patch atm [01:02] but i think you know that [01:02] yesw [01:02] i have a clean tree now :) [01:02] yeah [01:02] then edit the patch directly [01:02] if you are sure that you want true [01:02] ok the diff -urNad ubuntu-1.1.x~/modules/libpref/src/init/all.js~ ubuntu-1.1.x/modules/libpref/src/init/all.js~ [01:03] i think those are lines 20 21 [01:03] do i want them? [01:03] you don't want the all.js~ patch [01:04] look at it [01:04] thats about 2000 lines of garbage [01:04] i can end patch with pref("browser.helperApps.neverAsk.openFile", "");? [01:04] all removed [01:04] yes ... why not? [01:04] its where the all.js patch ends atm anyway [01:05] wasnt sure if i could [01:05] all from all.js~ is a second patch [01:05] just keep a final newline below [01:05] e.g. one return at the end [01:05] ah [01:05] after that line [01:05] it doesn't matter [01:05] but otherwise patch will always complain that the patch doesn't have newline [01:05] theres one there [01:05] :) [01:05] yes then fine [01:06] if you are done the file should have a total line cound of 20 [01:06] :) [01:06] yep empty line == 20 [01:06] right [01:06] looks good then [01:06] remember to change to true [01:06] then commit [01:06] with a sane message :) [01:06] ok commit this [01:07] like remove all.js~ garbage from patch + [01:07] make showbutton pref effective by setting pref 'PREFNAME' to true [01:07] :) [01:07] let me know if you pushed so i can merge it here [01:08] ... and you can push the orig.tar.gz to your youmortals account i guess :) [01:08] just let me know where i can grab it so i can prepare the build tomorrow morning [01:09] ok give me a few and i should have tar done within an hour i hope [01:09] gnomefreak: ok ... first push please [01:09] so i can intervene while i am awake :) [01:09] push bzr i mean :) [01:10] i have to finish typing and thinking first [01:11] yeah ... keep your time [01:11] better do it right once [01:11] then wrong multiple time :) [01:11] am i gonna have to do anything now? since i edited the patch? [01:12] or just clean than build orig [01:12] about 23 minutes left on source download [01:13] gnomefreak: you have to commit the patch [01:13] and push it [01:13] read above about what a sane commit message might contain :) [01:13] 01:07 < asac> like remove all.js~ garbage from patch + [01:13] 01:07 < asac> make showbutton pref effective by setting pref 'PREFNAME' to true [01:13] no i got that far [01:13] ah ok ... you pushed? [01:13] im talking locally since i edited patch by hand anything i need to do before build orig? [01:14] its pushing now [01:14] its pushed [01:14] ok [01:14] looks better [01:14] much better :) [01:14] :) [01:14] you got it already? [01:15] so maybe its only LP that is slow as garbage [01:16] yes [01:16] launchpad webpage updates in batches [01:16] http mirror should be almost instant [01:16] gnomefreak: ok ... you don't need to do anything special [01:17] just build the orig for the version currenlty in changelog [01:17] i will rename as i bump it on mozillateam branch [01:17] ok thats easy enough [01:17] once i have done that you merge from mozillateam branch and do mt changes on top of that again [01:17] i will post the orig. so you can wget it when done [01:17] gnomefreak: thats great [01:17] maybe i will wake up tonight so i can pull and test [01:18] otherwise i will do this first thing in the morning [01:18] first thing in morning for you is middle of night for me [01:19] https://code.launchpad.net/~mozillateam/iceape/ubuntu-1.1.x [01:19] gnomefreak: yeah ... you don't need to be awake [01:19] :) [01:20] 3 minutes ago was more like 15 wasnt it? [01:20] http://pastebin.mozilla.org/87568 [01:20] oh god i have to update feisty repo [01:21] in lp you don't see all sub checkins [01:21] but they are visible in bzr log [01:21] e.g. thats what you see in pastebin [01:21] just for education [01:21] ah [01:22] now you are just gnomefreak@ubuntu.com [01:22] yep saw that :) thank you for that line [01:22] maybe you need to set EMAIL="John ... " ? [01:22] not bad idea [01:22] actually i don't konw what it works for me :) [01:23] export NAME="Alexander Sack" [01:23] export DEBEMAIL="asac@ubuntu.com" [01:23] thats what i have explicitly set [01:23] anyway, thats not asac@jwsdot.com ... which apparently is used by bzr [01:23] hmm [01:23] maybe its in my user account settings properly [01:24] dunno [01:24] i have debmail debfullname also [01:24] gnomefreak: look at man bzr [01:24] at the bottom there are other env variables [01:24] and PATH=~/bin:$PATH [01:25] he? [01:25] in man bzr ? [01:25] gnomefreak: PATH has nothing to do with email :) [01:26] yeah i know i dont ever remember seeing it though [01:31] ah [01:31] source download finished? [01:31] yeah im extracting it [01:31] cool [01:31] let me have a smoke [01:31] than i have to move shit and build :) [01:31] ah ... you don't have to move shit :) [01:31] you could extract somewhere in /tmp/ [01:31] then copy shit :) [01:31] at least it will not bring you a mozilla/ directory :) [01:31] just remember to remove empty mozilla/ dir if you do this in bzr tree [01:43] after mozilla dir is empty i can remove it [01:43] not in bzr [01:45] he? [01:45] if its empty you can definilty remove it [01:45] yes [01:45] you should [01:45] ah ok [01:45] at least if you did this in bzr branched directory :) [01:46] its building im gonna grab a bite to eat since dinner was a few hours ago and ill uplaod asap [01:46] take about an hour to upload === smm83 [n=shane@12-216-188-54.client.mchsi.com] has joined #ubuntu-mozillateam [01:47] gnomefreak: thanks [01:47] i will be in bed soon [01:47] @now berlin [01:47] Current time in Europe/Berlin: June 13 2007, 01:47:57 - Next meeting: Edubuntu in 12 hours 12 minutes [01:48] :) [01:48] uploading now [01:48] got to start at 8:30 or something tomorrow [01:48] gnomefreak: does the tarball look sane? [01:48] e.g. size [01:48] layout [01:48] hold a minute ill give you main page were it will end up [01:49] 40.5 MB [01:49] can you give me the first too console pages of tar tzf /path/to/orig.tar.gz ? [01:49] or the last two :) [01:49] then i can sleep better :) [01:50] ill pastebin what i show in terminal when its done [01:50] ok ... just need a few lines out of it [01:51] not complete [01:53] about 40 minutes on upload and <1 minute for pastebin [01:54] http://gnomefreak.pastebin.ca/562987 500+ lines :( [01:54] asac: when its done you can get it http://gnomefreak.youmortals.com/iceape_1.1.2.dfsg1.orig.tar.gz [01:55] about 40 minutes or so [02:08] wow ... we are below 600 bugs in firefox [02:09] but i fear that is just temporarily the case ... crash report season has not yet begun for gutsy [02:09] and apport is probably going to be turned on soon :/ [02:10] iceape 1.1.1 has no bugs :) [02:11] wish list and enigail maybe [02:11] btw where do you have the reply-to-list extension for tbird 2.0? [02:12] iceape is not yet in :) [02:13] don't worry, we will soon get our share of bugs for iceape :-P [02:13] i don't hbave that extension [02:13] its somewhere on the net [02:13] look at my blog [02:13] there should be a link [02:14] http://www.asoftsite.org/s9y/archives/114-thunderbird-+-reply-to-list-...-here-it-comes.html [02:14] http://open.nit.ca/wiki/index.php?page=ReplyToListThunderbirdExtension [02:16] http://alumnit.ca/wiki/attachments/replytolist-0.2.0.xpi [02:16] hard to find with eyes wide shut :) [02:16] ok i am asleep now [02:16] cu tomorrow [02:17] night === ..[topic/#ubuntu-mozillateam:gnomefreak] : Home of Ubuntu Mozilla Team - https://wiki.ubuntu.com/MozillaTeam | Bug Triagers please read: https://wiki.ubuntu.com/MozillaTeam/Bugs/ | Firefox trunk package source : https://code.launchpad.net/~asac/firefox/trunk | Mailing List: ubuntu-mozillateam@lists.ubuntu.com | Next meeting is June 21, 2007 1800UTC in #ubuntu-meeting. [02:37] asac: its done you can grab it from http://gnomefreak.youmortals.com/iceape_1.1.2.dfsg1.orig.tar.gz [02:40] I dont think this one works. was replytolist-0.2.0.xpi for 1.5.0.x or 2.0.0.x? it doesnt seem to work but will play with it a bit more === gnomefreak gone for tonight maybe try to build 1.1.2 for feisty tomorrow === DarkMageZ [n=richard@ppp167-203.lns4.syd6.internode.on.net] has joined #ubuntu-mozillateam === DarkMageZ [n=richard@ppp167-203.lns4.syd6.internode.on.net] has joined #ubuntu-mozillateam === poningru [n=poningru@ip72-209-70-78.ga.at.cox.net] has joined #ubuntu-mozillateam === Admiral_Chicago_ [n=freddy@adsl-68-255-111-125.dsl.chcgil.ameritech.net] has joined #ubuntu-mozillateam === Admiral_Chicago [n=freddy@adsl-69-209-76-160.dsl.chcgil.ameritech.net] has joined #ubuntu-mozillateam [07:59] ok for the next 4+ hours only easy questions will be answered its wayyyyyyyyyyy to early [08:01] can i see my window partitio on linux? [08:01] ...just kidding [08:06] :) === gnomefreak more awake than i thought i would be after smoke [08:09] i messed around with irssi too much, lost my config file... [08:09] asac: you updated mozillateam iceape branch? [08:09] Admiral_Chicago: hope you had backup of it [08:09] nope... [08:09] hehe, it needed to be cleaned out anyways...its okay [08:10] if you need a sample on ei can post mine [08:10] can i see your autocmd line, I'm trying to do a /nicklist screen after X seconds. [08:10] and I couldn't figure that out. [08:11] ok let me find it [08:11] autosendcmd = "/umode +wQ;/quote capab identify-msg;/nicklist screen;wait -freenode 100000"; [08:12] whats all the umode stuff? [08:12] my line looks like this... [08:12] autosendcmd = "/^quote nickserv identify password"; [08:13] user mode? [08:13] i dont remember what they do :( its been a year + [08:13] okay thats fine... [08:14] autosendcmd = "/^quote nickserv identify password;/nicklist screen"; ? [08:14] iirc they are to add umodes before joining channels because i had a problem anything over 20 channels would not join and i wasnt identifing in time [08:14] for screen+irssi [08:14] but i dont use screen anymore [08:15] would that line be okay? [08:15] should be [08:16] not sure why the ^ though [08:16] it was what I was given, has always worked [08:25] asac: whats the -2 for in 1.1.2.dfsg1-2? im working on a version for feisty atm and im not sure if a # is > dfsg1 === Admiral_Chicago_ [n=freddy@adsl-68-255-109-184.dsl.chcgil.ameritech.net] has joined #ubuntu-mozillateam === Admiral_1hicago [n=FreddyM@adsl-68-255-109-184.dsl.chcgil.ameritech.net] has joined #ubuntu-mozillateam [08:35] this damn reply to list exdtension isnt frigging working [08:35] thunderbird? [08:36] yes [08:36] 2.0 [08:36] hehe, known bug... [08:36] no its been fixed [08:36] we patched it already [08:36] really? [08:36] yes long time [08:37] i don't touch thunderbird too much, i'm much more familiar with FX than TB [08:37] brb [08:40] support for it seemed to die in final release :( === Admiral_1hicago [n=FreddyM@adsl-68-255-110-41.dsl.chcgil.ameritech.net] has joined #ubuntu-mozillateam [09:00] gnomefreak: you appear to have a bad memory :) [09:00] gnomefreak: i wold you that -2 was a glitch on my behalf :) [09:01] i could have told you that [09:01] thats right :( [09:01] anyway ... versions are just versions ... nothing really important :) [09:01] do you have a version in mind? [09:01] so -2 is as good as -1 [09:01] i want to be less than yours [09:01] ah [09:01] let me look [09:02] is tarball up? [09:02] yes [09:02] i gave you link above === asac grabbing [09:03] http://gnomefreak.youmortals.com/iceape_1.1.2.dfsg1.orig.tar.gz [09:03] yeah ... got it [09:03] do you want to use a lower tarball version (before -) or a lower ubuntu/debian revision (after -)? === tonyy [n=anthony@ubuntu/member/tonyyarusso] has joined #ubuntu-mozillateam [09:04] lower ubuntu version so i can build for feisty repo [09:04] iceape_1.1.2.dfsg1+u1-1 will be the gutsy tarball i guess [09:04] aeh [09:05] iceape_1.1.2.dfsg1+u1-0ubuntu1 will be the gutsy tarball i guess [09:05] so use [09:05] iceape_1.1.2.dfsg1+u1-0ubuntu1~mt1 [09:05] k that looks good to me, i was mainly concered about the dfsg part of it [09:05] but let me first push my revision [09:06] to bzr [09:06] then you should merge that changelog to your branch [09:06] k [09:06] and add yours on top [09:06] otherwise you will have a conflict :) [09:06] (if you like resolving them you can go right ahead ) :) [09:06] merge to my branch than pull from there [09:07] ?* [09:08] gnomefreak: merge from mozillateam branch to your local branch [09:09]