joeleskomicahg: I remove proposal from lp:seamonkey and proposed against mozillateam/seamonkey.oneiric02:17
joeleskomicahg: I hope that is what you meant. I would be happy to test on oneiric and there are others that would as well.02:18
micahgjoelesko: um, that's not what I meant I don't think, I meant a second merge proposal for oneiric, is that what you did?02:18
joeleskoI don't think so. I proposed against lp:~mozillateam/seamonkey/seamonkey.oneiric02:19
joeleskoThat is the only branch I saw with oneiric.02:19
joeleskoSorry, I'm still a little confused about the work flow.02:19
micahgjoelesko: right, we need one against .head to go into precise, then one to go into oneiric, can you repropose the branch for precise (let's make sure it builds), then we can push to oneiric?02:20
micahgjoelesko: sorry for the confusion02:21
joeleskoSo do I just update the change log for precise? I haven't tested that yet, although I don't think there will be issues.02:21
micahgjoelesko: yeah, that's where the update needs to go first (and I can do that tonight)02:21
joeleskomicahg: great. I'll take care of it right now.02:22
micahgjoelesko: thanks02:22
micahgkeffie_jayx: great!  what type of stuff can you help with?  (bugs, testing, packaging)?02:22
joeleskomicahg: submitted proposal against .head for precise. I also built package for precise and uploaded to my ppa.02:33
joeleskomicahg: do I need to test on precise first before change can go to oneiric?02:34
micahgjoelesko: no, I don't think so, if oneiric tests out ok, I'm fine pushing even if precise if broken w/the same codebase (but we're trying to not leave the devel release broke this cycle, so if it is broke, we should try to fix it)02:37
joeleskomicahg: ok. It's already building on i386. Last time it took like 2 days to build. I think something was wrong with launchpad builder in November02:39
joeleskomicahg: 2.5 builds on karmic through precise06:39
joeleskomicahg: let me know when you want it tested.06:39
micahgjoelesko: karmic has been dead for 6 months :)06:39
joeleskomint people asked for karmic06:40
micahgjoelesko: well, their Desktop isn't getting security updates anymore, idk why they'd care about an updated browser06:40
micahgunless the mint people are patching CVEs for karmic :)06:40
joeleskomicahg: I don't know either. Since launchpad was still able to build it, I submitted it.06:41
joeleskoI should say mint users.06:41
joeleskoThat was a mod I put in the rules to check if version was less than 10.10, not to use the new asm instructions.06:43
joeleskoI was suprised to see that seamonkey did build and when I tested it, it worked.06:43
joeleskoI'll create my precise test vm tonight to try SM on it.06:46
micahgok, is that patch included in the precise merge or in a local folder?06:48
joeleskoIt's part of the rules file. http://bazaar.launchpad.net/~joe-nationnet/seamonkey/seamonkey-beta/revision/26606:50
joeleskomicahg: When you get a chance, can you create the beta branch?06:51
micahgjoelesko: yeah, sorry, thought I did that06:51
joeleskomicahg: Let me know when it's done and I can propose my beta branch. The beta has all the seperate commits like you requested.06:53
micahgok, I'll push a branch after I merge the precise chnge06:54
joeleskogreat. thanks06:54
micahgjoelesko: does the beta branch have the individual commits for the precise stuff as well?07:14
micahgI notice your 3 commits in the .head merge look all very large07:14
joeleskoExcept for the last 2 where I changed from UNRELEASED to oneiric and precise07:15
micahgthat should really stay UNRELEASED until you're sure no changes need to be made :)07:15
micahgI'll just roll them back07:15
joeleskoThe 2 last commits were small.07:15
micahgok, let me push the beta branch then so we can keep the history07:18
micahgjoelesko: lp:~mozillateam/seamonkey/seamonkey-beta.head07:20
joeleskoI proposed my beta to beta.head07:24
joeleskomicahg: In order to build the release, the config/branch.mk file will need to be updated in order to pull from release channel instead of the beta channel.07:27
joeleskoWasn't sure how you normally handle that. I did it after the beta merge into the dev branch.07:27
micahgok, that was your second to last commit in the release branch, right?07:27
micahgjoelesko: well, it shouldn't be in future diffs, so the first merge, I usually manually back it out with a comment, then it shouldn't show up anymore07:28
joeleskooh, duh.. how do I do the blush character...07:29
* micahg doesn't remember...07:31
micahgpidgin made these things easier07:31
joeleskoI always like simple solutions. Thanks micahg07:31
joeleskoSo should I cancel the propose on the .head branch? It's really all in the beta.07:33
micahgjoelesko: sure, that's fine07:36
joeleskomicahg: this is starting to make sense. I like how you had me do the atomic commits on the beta and didn't want them to get lost with the .head merge07:37
joeleskoI thought the entire changelog needed to be in each atomic commit for the .head release07:38
micahgnope :), individual commits make it easier to cherry pick and revert07:38
joeleskomicahg: agree. I thought that is what you wanted.07:40
joeleskoI cancelled the propose on the .head release. Tomorrow, I'll start on 2.6b07:41
micahgjoelesko: ok, sounds good07:42
joeleskomicahg: so can I pretty much just stay on the beta and you and handle the merge to the .head release till I have a better understanding of hoe you do it?07:43
micahgjoelesko: let's coordinate the weekend before release (Dec 18 or so) if that's ok, I'd prefer to hand that off to you as well :)07:43
joeleskoOk, I'm up for that. I'll be on holiday so my schedule will be open07:45
micahgcool, thanks07:46
micahgjoelesko: BTW, you might want to set DEBFULLNAME in ~/.bashrc so it shows up in your changelog07:47
joeleskothank you. Updated DEBFULLNAME07:48
micahgjoelesko: BTW, in bazaar.launchpad.net/~joe-nationnet/seamonkey/seamonkey-beta/revision/266 I think you meant 10.04, not 11.04, but I'm rolling that revision back as we shouldn't be taking patches for karmic (encouraging people to run unsecure operating systems is not something Mozilla does, nor should we)07:53
joeleskomicahg: I'm always happy to comply with that request. Just when someone asks and if it's a minor change and does not affect other releases, I'll put it in.07:56
joeleskoThe beauty of open source.07:56
micahgheh :), I'd just like to keep it out of our team branches, if you want to do it for your own PPA, that's your call :)07:57
joeleskoWell, on one of my systems I'm stuck on maverick till unity or gnome-shell gets a little better. Dual monitors and xpdf being totally broken is keeping it there08:01
micahgjoelesko: that's fine, maverick is supported until April08:01
micahgboth unity and gnome-shell in oneiric should be pretty solid08:02
* joelesko shivers and not just because it's cold :)08:02
joeleskoI do like both of them, just some issues with dual monitors and nvidia. Didn't like something with the layout and couldn't find a way to fix. gnome-shell was making some headway on it. Not sure about unity.08:04
micahgjoelesko: you should also watch out for commits like this: http://bazaar.launchpad.net/~joe-nationnet/seamonkey/seamonkey-beta/revision/259, I usually do "clean up changelog" commits separately, so that fixes can be cherry picked (at least I think I do :))08:05
micahgjoelesko: http://bazaar.launchpad.net/~joe-nationnet/seamonkey/seamonkey-beta/revision/261 seems wrong, Firefox needed the second patch that you dropped still to built on powerpc I believe08:14
micahgjoelesko: would you want to fix these issues before I merge?08:18
joeleskoI checked 261 against the upstream version and those patches were applied.08:30
joeleskoAgree on 259. I was getting used to new method of handling code.08:34
joeleskomicahg: How do you cherry pick commit in bzr?08:36
micahgbzr diff -c REVNO08:36
micahgjoelesko: http://hg.mozilla.org/mozilla-central/rev/5847fed34267 and http://hg.mozilla.org/releases/mozilla-release/file/463b6cbdef7c/js/src/Makefile.in#l439, were you thinking on the 2.6 beta?08:41
micahgthat patch landed in 9/2.608:41
joeleskoI am almost positive when I looked at the source code of 2.5, those patches were already applied. If you try and apply them, you will see the build fails because they were applied.08:43
micahgjoelesko: right, that doesn't mean that they're necessarily applied upstream (unless it tells you that it's a reverse diff)08:43
joeleskoI believe that is what you get.08:44
micahghmm, did you have the correct 2.5 tarball?  could you have pulled a 2.6 beta by accident?08:44
joeleskoI pulled the tarball 3 times. Unless something is wrong with the python code08:45
micahgthat could be :), chrisccoulson has made a lot of changes to improve that code since your initial import (one of the reasons I'm not ready to backport this yet :))08:50
joeleskook. Going to get some zz's08:53
micahgjoelesko: ok, so, should we try again tomorrow evening or do you have another branch ready?08:55
chrisccoulsonjoelesko, the work you're putting in to keeping seamonkey alive on ubuntu is greatly appreciated btw :)09:53
micahgI'll second that :)09:55
=== m_conley_away is now known as m_conley
joeleskochrisccoulson: micahg said you made changes to the python downloader scripts. Where is the best place to look at them. The ones in SM seem like they have a problem.14:28
joeleskoI compared the release tar against the python checkout script and they are indeed different, not sure what would be causing that.14:29
joeleskomicahg:  chrisccoulson: Since I never plan to do nightlies, can I just pull the source tars from the mozilla repo?14:31
chrisccoulsonhi joelesko17:54
joeleskochrisccoulson: hi17:54
chrisccoulsonthe problem with using the upstream tarball is that you still need a script to strip some files from it (eg, windows executables, pyc files etc)17:55
chrisccoulsonand you also lose the ability to build translations too17:55
chrisccoulsonwhat differences are you finding?17:55
joeleskochrisccoulson: there seems to be a problem with the way the package is built. micahg told me of an issue last night and when I checked he was correct17:56
joeleskoI did a diff against the original tar and the one that was generated and some files were pulled from the tip instead of the tag17:57
chrisccoulsonyeah, i know why :)17:58
joeleskomicahg said you changed the python scripts. What do I need to do to fix the seamonkey create-tarball?17:59
joeleskoyou know why! That's great, this project is so confusing on where they pull all the code from.18:00
chrisccoulsonjoelesko, http://bazaar.launchpad.net/~mozillateam/thunderbird/thunderbird-trunk.head/revision/457?remember=455&compare_revid=45518:01
joeleskono way. thanks!! That's where I messed up. I put an update -r after the do_exec.18:04
joeleskochrisccoulson:  I'll fix the beta branch and try again. Thanks for the help18:06
chrisccoulsonyou're welcome :)18:07
micahgchrisccoulson: is there any problem taking this extra hunk in the KDE patch on beta? https://bugs.launchpad.net/ubuntu/+source/firefox/+bug/885836/+attachment/2621902/+files/firefox_kde_savefile.patch18:53
ubot2Launchpad bug 885836 in opensuse "firefox-kde-support breaks right click > save image as..." [Medium,Confirmed]18:53
chrisccoulsonmicahg, well, i don't really care too much about that patch, and i'm probably just going to drop it for precise anyway18:54
chrisccoulsoni don't particularly want to support that for 5 years18:54
micahgchrisccoulson: ok, could you please guide debfx on what he needs to do (if this is in the realm of possibility) to get this upstream18:55
micahgchrisccoulson: also, it a functionality regression for natty upgraders, the problem is, I don't want to take the patch without beta coverage for the security update (since this is supposed to be where our major regression testing is happening)18:56
micahgchrisccoulson: I definitely agree about not wanting to carry it for 5 years18:57
chrisccoulsong'ah, nightly sucks at the moment18:59
chrisccoulsonlet's see if a restart fixes the constant stutters19:06
chrisccoulsonhah, 220MB with 20 tabs open19:08
chrisccoulsonbeta that chrome!19:08
FernandoMiguel14972       732990           20        60854K         1.2G       491.2M          1.2G       491.2M       fernando        fernando         6%       chrome19:13
FernandoMiguelone tab olny19:13
FernandoMiguelBrowser Private Proportional19:15
FernandoMiguelpick one LOL19:16
micahgchrisccoulson: so, can I merge the KDE fix for now to all the branches and we'll worry about whether or not to leave it on in precise later?19:25
micahgchrisccoulson: also, I'm commit‌ting http://launchpadlibrarian.net/86490977/firefox_9.0~b4%2Bbuild1-0ubuntu1_9.0~b4%2Bbuild1-0ubuntu2.diff.gz to the beta branch, do you want me to make the debian/control change anywhere else?19:27
chrisccoulsonsigh, i didn't even realize that had been uploaded19:31
chrisccoulsonit need to go to lp:firefox first19:31
chrisccoulsonall changes do, else they will disappear on the 20th :)19:32
micahgchrisccoulson: right, well, I just pushed to beta to keep the upload history19:32
micahgI can push to lp:firefox and aurora as well19:32
micahgwe probably need a similar change for thunderbird I'm guessing unless it already has the dep19:32
debfxchrisccoulson: *sigh* you don't think your intention to drop the kde integration patches might be worth sharing with kubuntu?19:35
micahgchrisccoulson: do you have any uncommitted changes on trunk?  I was going to push the locales fix19:40
* micahg just realized he did it wrong...19:40
chrisccoulsonmicahg, probably not :)20:11
chrisccoulsondebfx, will you help keep this patch unbroken on the nightly builds?20:11
micahgunpushed I mean (last entry I have is Nov 29)20:11
chrisccoulsonmicahg, yeah, that's the last one. the branch basically takes care of itself now ;)20:11
micahgchrisccoulson: ok, I'll push to trunk, aurora, and beta20:12
micahgok, firefox should be cleaned up for the locales thing now20:22
micahgchrisccoulson: when I get back later, I'll commit a fix for the latest powerpc failure for precise (I won't upload)21:28
micahgchrisccoulson: BTW, is it worth trying to get these build failure fixes on aurora, or can we carry the patch for 6 more weeks?21:31
=== m_conley is now known as m_conley_away

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!