[01:17] pull the two or pull and merge ? === asac_ [n=asac@debian/developer/asac] has joined #ubuntu-mozillateam [01:25] wow i got reconnected :( [01:25] asac, you lost me [01:25] sorry [01:25] pull the two or pull and merge ? [01:26] well there are probably multiple ways ... what i did is certainly not the best: [01:26] 00:53 < asac> mkdir firefox [01:26] 00:53 < asac> cd firefox [01:26] 00:53 < asac> git init-db [01:26] 00:53 < asac> git pull git://double.co.nz/git/firefox.git refs/heads/master:firefox [01:26] 00:54 < asac> git pull git://double.co.nz/git/video.git refs/heads/master:video [01:26] that I did [01:26] git checkout -f [01:27] (to clean the messed master branch) [01:27] 01:04 < asac> git checkout video [01:27] 01:04 < asac> git merge firefox [01:27] 01:04 < asac> cd mozilla [01:27] 01:04 < asac> autoconf2.13 [01:27] 01:04 < asac> cd .. [01:27] 01:04 < asac> git add mozilla/configure [01:27] 01:04 < asac> git commit -m "merge latest firefox" [01:27] then you can diff as above [01:29] after co -f, you co video just there ?? [01:29] yes ... i switch to the video branch [01:29] oooohhhhh [01:29] i see now [01:29] then i mege the firefox branch onto the video branch [01:29] actually you can leave this ... as apparently the repo is configured to merge automatically to master [01:30] so without checkout -f you probably just need [01:30] 1:25 < asac_> 01:04 < asac> cd mozilla [01:30] 01:25 < asac_> 01:04 < asac> autoconf2.13 [01:30] 01:25 < asac_> 01:04 < asac> cd .. [01:30] 01:25 < asac_> 01:04 < asac> git add mozilla/configure [01:30] 01:25 < asac_> 01:04 < asac> git commit -m "merge latest firefox" [01:30] but then diff firefox..master [01:30] of course [01:30] the merge removed plenty of files [01:30] and leave the video branch alone [01:31] yes then they have been removed from firefox branch? [01:31] since the last merge he did? [01:32] are there any new files in that merge? [01:33] hmm a bit strange [01:33] maybe just go the second option [01:33] the automerge on master doesn't do that [01:35] but looks sane [01:36] in firefox branch [01:36] mozilla/gfx/src/os2 [01:36] is gone === xtknight_ [n=xtknight@c-68-43-122-211.hsd1.mi.comcast.net] has joined #ubuntu-mozillateam [01:37] automerge on master is of course the other direction ... e.g. merge video on firefox ... but we want firefox on video :) ... so deleting those files is right [01:38] ok [01:38] thx [01:38] i hate this automerge feature [01:38] whatever that is [01:39] i mean it does create a master branch even though i never told him to do that [01:40] i think his workflow is: [01:40] git clone git://double.co.nz/git/video.git [01:40] then to merge just [01:40] cd video [01:40] git pull git://double.co.nz/git/firefox.git [01:41] and resolve conflict on master branch [01:45] yeah thats how he probably does it :) ... no idea though how he does the diff then [02:05] asac: hi... fyi the menu comes up without the menubar now.. [02:10] cwong1: the same menu, but in a popup? [02:11] asac: Yes, I simply put the whole thing in a menupopup. I am working on the new layout. However, there is one minor problem and that is I can make the menu popup at pos other than (0, 0). [02:11] s/can/cannot/ [02:11] why? [02:12] you certainly found the showPopup call, right? [02:12] the hildon menu shows up at x=20, y=0 [02:12] I tried setting the x and y and didn't work [02:13] I also try the moveTo method and didn't work. [02:13] Btw, Matt Z will send you 1 of the Samsung Q1 and You should get it in 1.5 wk [02:14] k [02:17] asac: By rearranging the menu item, things doesn't work quite right. Does the position of the menu make any different? === Admiral_Chicago [n=FreddyM@ubuntu/member/admiral-chicago] has joined #ubuntu-mozillateam [02:24] cwong1: i don't understand this question [02:24] for the 0,0 coordinates ... maybe we have to provide an anchor [02:24] element [02:25] (currently its just null) [02:25] 02:15 < cwong1> asac: By rearranging the menu item, things doesn't work quite right. [02:25] any example? [02:25] what you rearrange? [02:25] and what is wrong then? [02:26] I put the newNavigatorTab as the first element in my popup [02:26] When I select that menu, a new tab window comes up. I then go to the url bar and enter an url and the content shows up in the first tab not the new tab [02:28] hmm [02:28] does ctrl-t still work? [02:28] I disabled that [02:28] to open new tab instead of pressing the menu item? [02:28] I'll put it back and see if that help. I doubt it [02:29] cwong1: can you please try small steps? e.g. just change the element ... if that works well remove key bindings et al? [02:29] would be helpful to track down what breaks this [02:29] cwong1: i don't think it will help [02:29] cwong1: i just think that we should isolate the testcase [02:29] ok [02:29] cwong1: maybe its something completely unrelated [02:30] e.g. first step ... move whole menu to popup ... verify if it still works ... then flip order ...still works ... and so on [02:30] I will come up with a small test case and send to you. [02:30] I did the first step and they worked [02:31] cwong1: ok send me first step ... i will flip entries then and will see [02:31] maybe try on your own :) [02:31] i am now off ... sorry for being not bright but its really late here ;) [02:31] @time berlin ;) [02:31] @time berlin [02:31] Current time in Europe/Berlin: September 13 2007, 02:31:56 - Next meeting: Desktop Team Development in 11 hours 28 minutes [02:32] Chat with u tomorrow then [02:35] what timezone are you in? [02:35] @time newyork [02:35] pst [02:35] http://ubotu.ubuntu-nl.org/timezones.html [02:35] @time America/Chicago [02:35] Current time in America/Chicago: September 12 2007, 19:35:55 - Next meeting: Desktop Team Development in 11 hours 24 minutes [02:35] ? [02:36] oh [02:36] ost [02:36] pst [02:36] @time America/Los_Angeles [02:36] ? [02:36] Current time in America/Los_Angeles: September 12 2007, 17:36:22 - Next meeting: Desktop Team Development in 11 hours 23 minutes [02:36] @time America/Los_anglees [02:36] yeah ok [02:36] i know then ;) [02:37] @time [02:37] Current time in Etc/UTC: September 13 2007, 00:37:17 - Next meeting: Desktop Team Development in 11 hours 22 minutes [02:37] US/Pacific [02:37] @time US/Pacific [02:37] Current time in US/Pacific: September 12 2007, 17:37:22 - Next meeting: Desktop Team Development in 11 hours 22 minutes [02:38] ok cu === mertiki [n=zxz@modemcable023.30-56-74.mc.videotron.ca] has joined #ubuntu-mozillateam [02:41] asac : are-you here? === Paddy_EIRE [n=patrick@89.240.241.231] has joined #ubuntu-mozillateam [03:09] asac: It also appears that helix-player also FTBFS on all arches, but for a different reason. I'm looking into that now. === Paddy_EIRE [n=patrick@89.240.241.231] has joined #ubuntu-mozillateam === xtknight [n=xtknight@c-68-43-122-211.hsd1.mi.comcast.net] has joined #ubuntu-mozillateam [04:56] asac: classpath merged from debian built successfully. === xtknight [n=xtknight@c-68-43-122-211.hsd1.mi.comcast.net] has joined #ubuntu-mozillateam === hjmf is doing less triaging work because of the new py-lp-bugs api === hjmf needs free time to fix all the scripts :) [08:01] I didn't know that I had that ammount of scripts until I've begun to fix them :) === fuoco [n=gad@87.69.68.130.cable.012.net.il] has joined #ubuntu-mozillateam [08:42] Ubulette: here ? [09:40] hjmf: yeah :) ... i know what you mean :) [09:41] TheMuso: thats good news. [09:47] fuoco ? [10:18] bug 125187 [10:18] Launchpad bug 125187 in flashplugin-nonfree "flashplugin-nonfree never installs plugin due to md5sum mismatch (dup-of: 125986)" [Undecided,New] https://launchpad.net/bugs/125187 [10:18] Launchpad bug 125986 in flashplugin-nonfree "[MASTER] No flash after update of flashplugin-nonfree" [Undecided,Fix released] https://launchpad.net/bugs/125986 [10:24] Ubulette: yeah, nothing much, i'm still building coz i had another dependency missing... [10:24] :) === DarkMageZ [n=richard@ppp121-44-83-240.lns10.syd6.internode.on.net] has joined #ubuntu-mozillateam === DarkMageZ [n=richard@ppp121-44-83-240.lns10.syd6.internode.on.net] has joined #ubuntu-mozillateam [12:47] asac: looks like your midbrowser changes to flash are borked [12:47] yeah [12:47] paran: there? [12:47] update-alternatives errors [12:48] i got pm last night about it [12:48] the person is away atm [12:49] let me see if i can pull up error (i closed his pm) [12:49] i know about that error [12:49] ah ok [12:50] ok i pmed him to let him know [01:16] gnomefreak: ubuntu10 uploaded [01:17] should fix a bunch of issues [01:17] ff? [01:21] or flash? [01:30] flash [01:31] gnomefreak: any idea how i can subscribe to package uploads in launchpad? [01:31] e.g. without being the maintainer? [01:34] asac: not off hand ill look wheni get home [01:34] bbl dr app [01:41] paran: because the last flashplugin was broken i had to upload now :) .. i included the --remove-all hack for now [01:41] paran: maybe take a look [01:41] paran: version is 9.0.48.0.0ubuntu10 [01:42] paran: sorry if that washs aways any work you already have done [01:42] paran: we should now do proper testing and add the same thing to gnash i think ;) [01:52] asac: no work, I was planning to do this after work today [01:52] asac: did you include the fix to install the correct alternative on amd64? === bluekuja [n=andrea@ubuntu/member/bluekuja] has joined #ubuntu-mozillateam === gnomefreak [n=gnomefre@ubuntu/member/gnomefreak] has joined #ubuntu-mozillateam [01:57] ok now im gone ;) [01:58] asac: heya [01:58] news for those packages? [01:59] hjmf, you there? [02:11] asac: ping me when back [02:27] bluekuja: yes TheMuso is working on classpath ... and wanted to look at helix as well [02:28] paran: yes i hope flashplugin-nonfree is now fixed ;) [02:28] paran: tests appreciated though [02:28] asac: need some infos [02:28] like need to change something in particular into dput.cf? [02:29] or is default ok? [02:29] for what? [02:29] to upload to ubuntu? [02:29] yup [02:29] not that i know [02:29] dput ubuntu package*source.changes [02:29] should work [02:29] ok [02:30] bluekuja: maybe sponsor the sunbird locales ;) [02:30] asac: yep, bug link? [02:30] asac: dont want to miss, if the previous version is 0.1.15-0ubuntu1 [02:30] next will be [02:30] 0.1.15-0ubuntu2 [02:30] I'm checking thousand times [02:30] everything [02:31] also easy stuff [02:31] lol [02:31] yeah [02:31] I did an error on this [02:31] so checking [02:31] bluekuja: if you build 0ubuntu1 you probably have to build with -S -sa [02:31] so you forcefully include the orig.tar.gz [02:31] asac: I need to build 0.1.15-0ubuntu2 [02:31] dpkg-buildpackage with do that automatically only if version is -1 ... hasn't been adapted for ubuntu [02:31] yeah ... thats -S -si ;) [02:32] or just -S [02:32] i guess [02:32] yup [02:32] bug 130807 [02:32] Launchpad bug 130807 in lightning-sunbird "sunbird langpacks doesn't exist yet" [Medium,Confirmed] https://launchpad.net/bugs/130807 [02:34] asac: is it new? [02:35] yes ... look at revu [02:35] it has an exception [02:36] asac: so can be uploaded also if it's on freeze? [02:37] yes ... http://revu.tauware.de/details.py?upid=211 [02:37] scott@kitterman.com : "New package exception is approved. Also asac gave the package an upcheck." [02:37] asac: ok [02:38] I finish two things [02:38] and im there [02:38] sure [02:41] asac: helix is beyond me... It FTBFS since at least feisty. [02:42] Its something C++ related, which I am not knowledgable enough to fix. [02:51] asac: I get a unknown-architecture lpia [02:51] on lintian [02:51] of course that arch is not on debian [02:51] can I leave it? [02:52] TheMuso, ? [02:53] bluekuja: helix-player doesn't build due to something wrong in the C++ source code. [02:53] TheMuso, nono [02:54] one of my packages [02:54] :) [02:54] I was just answering about lpia arch [02:54] bluekuja: Yes I'd leave it. [02:55] as Debian doesn't have lpia yet. [02:55] yup, I think it gonna be recognized [02:55] by lp [02:55] without problems [02:55] TheMuso: ok thanks [02:56] TheMuso: can you upload the classpath merge to revu? [02:56] bluekuja: lpia is a new architecture ... so you can safely ignore lintian warnings [02:57] asac: ok thanks [02:57] TheMuso: and open a FTBFS bug against classpath (if not yet submitted) ... so we can document UVFe exception for it [02:59] bluekuja: where does lintian complain about lpia? [02:59] bluekuja: do you list that architecture explicitly somewhere? [02:59] asac: at the end of debuid [02:59] *debuild [02:59] asac: yup [02:59] in build logs? [02:59] or on your local run? [02:59] asac: need to restrict archs on my ximp package [02:59] cause bad build system [02:59] asac: local run [02:59] of debuild [03:00] bluekuja: lpia is i386 ... it should definitly work [03:00] yup === bluekuja is uploading his first package [03:00] yeah ;) === bluekuja crosses his fingers [03:00] usually not much can go wrong :) [03:01] yeah :) [03:01] checked everything [03:01] either its uploaded to right place or it will just be rejected [03:01] which isn't that bad :) [03:01] :) [03:01] yes ... of course, you can make packaging mistakes :) [03:01] yeah [03:01] but I just restricted [03:01] the arch [03:01] nothing more [03:19] how? [03:29] @time pacific [03:29] Current time in Canada/Pacific: September 13 2007, 06:30:00 - Next meeting: IRC Council in 3 days [03:30] @time los_angeles [03:30] Current time in America/Los_Angeles: September 13 2007, 06:30:20 - Next meeting: IRC Council in 3 days [03:41] Could not find compatible GRE between version 1.9a8pre and 1.9a8pre. [03:41] this means i have no xulrunner? [03:47] can i import profile into trunk ? [03:52] fuoco: you need xulrunner [03:53] installed [03:53] look in /etc/gre.d/ [03:53] what is there? [03:54] yeah i installed it, it wasn't pulled by apt [03:56] any idea why scrolling with the mouse goes back/forth in history? [04:21] this is very annoying [04:32] hmm [04:32] maybe ffox3 now implements 7 mouse button approach? [04:32] e.g. like on windows where you have mous buttons to go back and forth?` [04:32] and somehow the mousewheel is mapped to that? [04:32] fuoco: ? === Crippy-Boy [n=DrLebows@77-100-204-84.cable.ubr04.blac.blueyonder.co.uk] has joined #ubuntu-mozillateam [04:47] Hey === Crippy-Boy [n=DrLebows@77-100-204-84.cable.ubr04.blac.blueyonder.co.uk] has left #ubuntu-mozillateam ["Leaving"] [04:54] asac: yes that is possible, how can i get rid of that? [04:54] no idea ... change your xorg.conf? [04:56] i have nothing in xorg.conf about mouse buttons [05:04] asac: do you know how i get my profile into 'trunk'? [05:04] which profile? [05:04] asac: settings, bookmarks etc... [05:06] which? [05:06] your ffox 2 should be auto migrated [05:06] on first startup [05:08] asac: that's what i thought but it didn't happen [05:09] ask Ubulette :) [05:19] ok i fixed the scrolling problem in about:config [05:20] now i'll wait for Ubulette to ask him about the profile :) === jeromeg [n=jerome@gra94-2-82-66-142-60.fbx.proxad.net] has joined #ubuntu-mozillateam [05:38] asac: why does ubufox need apturl? [05:42] gnomefreak: answered on -devel [05:42] i see [05:42] .win 123 [05:56] asac: you will like this one [05:57] urgent can any one help me [05:57] thanks [05:57] asac: https://bugs.edge.launchpad.net/ubuntu/+source/gnash/+bug/139344 [05:57] Launchpad bug 139344 in gnash "how to link static files in gnash" [Undecided,New] [05:59] !ppsa [05:59] Sorry, I don't know anything about ppsa - try searching on http://ubotu.ubuntu-nl.org/factoids.cgi [05:59] !ppsa [05:59] !ppa [05:59] With Launchpad's Personal Package Archives (PPA), you can build and publish binary Ubuntu packages for multiple architectures simply by uploading an Ubuntu source package to Launchpad. See https://help.launchpad.net/PPAQuickStart. === cwong1 [i=chatzill@nat/intel/x-7118155c5dfe5eb7] has joined #ubuntu-mozillateam [06:26] cwong1: you mention that the popup doesn't have the hildon theme? thats strange ... at least the popups from the menubar had the same theme for me [06:26] (last time i looked) [06:27] or is it just a tiny difference ... which i don't see because my eyes are not made for this kind of eye-candy stuff ;) [06:27] ? [06:27] asac: the font and the ">" doen't look the same as other hildon apps [06:27] ok [06:27] asac: the bg and fg colors are fine [06:27] border is right as well, right? [06:27] yes [06:27] your status report sounded like it doesn't use the theme at all [06:28] ok [06:28] looks that way [06:28] well ... looks that way would be grey ;) [06:29] fonts i don't know ... the other thing should be just a different element used i guess === jeromeg [n=jerome@gra94-2-82-66-142-60.fbx.proxad.net] has joined #ubuntu-mozillateam [06:41] asac: sunbird-locales are missing orig file [06:42] bluekuja: no [06:42] bluekuja: the orig is in first upload [06:42] just click on the first revision submitted to revu [06:42] there you can get the orig [06:42] asac: oh ok thanks [06:42] :) [06:42] np [06:43] did you first upload(s) succeed? [06:43] asac: yup :) [06:43] great ... enjoy the feeling ;) [06:43] e.g. "accepted ..." mails :) [06:44] lol [06:44] yeah [06:44] that's something great! [06:49] asac: to sign other ppl [06:49] packages [06:49] it's debuild -k [06:49] right? [06:50] i use dpkg-buildpackage -rfakeroot -S -si -kasac@debian.org :) [06:50] so yes [06:50] -kemailORkeyid [06:50] perfect [06:52] asac: original source NOT included) is ok then? [06:52] use -sa [06:52] you need original source on first upload [06:52] for each upstream version [06:53] asac: was a bug fix [06:53] so -si it's ok [06:53] asac: is normal that in source.changes file [06:53] I dont see Closes: [06:53] anymore [06:53] no [06:53] for LP: #bug [06:53] if you have (LP: #buid) you should see it [06:53] yeah [06:53] right [06:53] lets see [06:54] maybe a syntax problem [06:54] yup [06:54] the guy forget [06:54] the : [06:54] ;) [06:55] right ;) [06:55] just add it if its just a second of work :) [06:56] (as you teached me a while back) [06:57] yup [06:57] adding and pushing [06:59] bluekuja: is sunbird locales uploaded already? [06:59] asac: next on the list [06:59] :) [06:59] cool [06:59] just building this [07:03] asac: why (0.5-0ubuntu2)? [07:04] doesn't matter ... just be sure that both versions are included in changes [07:04] or merge the changelog and use ubuntu1 [07:04] ok gonna merge [07:05] fine === asac has no idea if there is any fruitful content at all in changelog ;) [07:05] :) [07:06] should be more or less only: initial upload of locales for sunbird 0.5 :) [07:06] ^^ [07:40] off for a while [07:45] k === Paddy_EIRE [n=patrick@78.144.81.237] has joined #ubuntu-mozillateam [07:56] asac: is the package ok? [07:56] e.g packaging side [07:56] changelog is * initial release [07:56] * fixed wrong FETCHADDRESS in rules file [07:56] * converted control file to utf8 [07:56] * update-xpi still not fixed [07:56] * removed Danish xpi file which has problems with sunbird 0.5 [07:56] is it ok? [07:58] hi [07:58] heya [08:04] asac: tell me when back [08:04] upload is ready [08:04] need to ask you about changelog === Ubulette_ [n=Ubulette@APuteaux-153-1-63-200.w82-124.abo.wanadoo.fr] has joined #ubuntu-mozillateam === Ubulette_ is now known as Ubulette === Paddy_EIRE [n=patrick@78.144.81.237] has joined #ubuntu-mozillateam [10:07]