asac | ha ... wikipedia uses ubuntu screenshot for firefox 3 :) | 00:39 |
---|---|---|
asac | http://en.wikipedia.org/wiki/Mozilla_Firefox | 00:39 |
Admiral_Chicago | nice | 00:49 |
fta | armin76, http://blog.mozilla.com/gen/2008/05/23/firefox-3-utf-8-support-in-location-bar/ | 01:31 |
=== asac_ is now known as asac | ||
asac | james_w: hey :) | 10:38 |
asac | i face a moderate tricky issue :) ... we have a debian/ only tree ... now i would like to merge that one on top of a full source upstream thing | 10:39 |
asac | technically that should work, but i think that bzr complains | 10:39 |
asac | technically ... e.g. just applying all commits on top of the upstream tree | 10:39 |
asac | james_w: any idea? | 10:39 |
asac | :) | 10:40 |
james_w | do you want to keep merging in future, or are you going to throw the debian/ only branch away after that? | 10:43 |
asac | james_w: is there an option for merging in future? | 10:46 |
james_w | actually, the way I would think of works in both cases I think | 10:47 |
james_w | merging in the future has a few issues I think, but it works. | 10:47 |
asac | james_w: my ears are wide open :) | 10:48 |
asac | give me insight! | 10:48 |
james_w | actually, do you version the "debian/" directory, or just it's contents? | 10:48 |
* asac looking | 10:48 | |
asac | james_w: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager | 10:49 |
asac | so debian is inside | 10:49 |
james_w | ah, so a plain merge should do what you want | 10:49 |
asac | (given that i migrate that branch to bzr) | 10:49 |
asac | james_w: can i do this in both directions? | 10:50 |
james_w | as the branches have no history in common then you will need to specify an explicit "merge base", which is the revision to use as a common ancestor. | 10:50 |
asac | e.g. merge upstream on debian ... or theother way around? | 10:50 |
asac | james_w: which revision is that? | 10:50 |
asac | 0? | 10:50 |
james_w | yup, you use 0, or rather 1. | 10:50 |
james_w | or rather 0, :-) | 10:51 |
asac | i am always confused ;) ... i know i get the initial checkin by bzr diff -c1 | 10:51 |
james_w | you use "merge -r 0..-1" | 10:51 |
asac | what kind of hack is that? | 10:51 |
asac | -1 ;) | 10:51 |
james_w | -1 means that last revision | 10:51 |
asac | ok so HEAD :) | 10:51 |
james_w | I'm not sure how it will do at two way merging. | 10:52 |
asac | james_w: is there alreay a way that bzr understands svn branching? | 10:53 |
asac | most likely not i guess | 10:53 |
james_w | you should be able to merge back in to the pkg-utopia one as it's tip revision is in the history of the resulting branch. | 10:53 |
asac | james_w: oh merge back into pkg-utopia ... hmm | 10:54 |
james_w | bzr-svn does know something about svn branches, but I don't know how reliable it is. | 10:54 |
asac | that would be great | 10:54 |
james_w | the merge would pull in all of the upstream code though. | 10:54 |
asac | james_w: yeah obviously | 10:54 |
james_w | I'm just guessing, but if you merge back, and then revert everything except debian/ before committing you will be able to merge debian/ backwards and forwards from then on, but I'm not sure. | 10:55 |
asac | james_w: ok. i think he would be more open to this if he sees all his commits in launchpad ... so i guess i should branch that svn version and then merge the full upstream tree on top of that, right? | 10:56 |
asac | (what a shame that launchpad doesnt show nested revisions) | 10:56 |
james_w | well, you could stick a copy of the pkg-utopia branch there as a mirror to show all the revisions. | 10:57 |
james_w | but that does sound reasonable. | 10:58 |
asac | thanks. ill see what i can do :) | 10:58 |
asac | lets hope that debian bzr is up-to-date enough to not stop the show :) | 10:58 |
asac | james_w: oh ... if i do merge -r 0..-1 ... wont all the subrevision be lost? | 10:59 |
asac | at least picking smal ranges always eliminated the subrevisions for me | 10:59 |
asac | e.g. bzr merge -r 2..5 => just one flat commit | 10:59 |
james_w | actually, I'm not sure. I thought it didn't, but maybe it does consider it a cherrypick. | 11:00 |
asac | james_w: let me test :) | 11:01 |
asac | first setup a mirror :) | 11:01 |
asac | ok ... so one cannot setup a mirrored branch from svn ... thats for sure | 11:03 |
asac | i guess i need a series | 11:04 |
asac | darn ... ill just do it manually | 11:04 |
asac | james_w: help :) | 11:16 |
asac | bzr merge -r0..-1 ../networkmanager.debian.svn/ | 11:16 |
asac | WARNING: the 'deb822' top-level module is *DEPRECATED*, please use 'debian_bundle.deb822' | 11:16 |
asac | bzr: ERROR: Repository KnitPackRepository('file:///tmp/network-manager/.bzr/repository/') is not compatible with repository KnitPackRepository('file:///tmp/networkmanager.debian.svn/.bzr/repository/') | 11:16 |
asac | /tmp/network-manager/ == lp:network-manager | 11:16 |
james_w | ah, bzr-svn creates rich-root-pack, your other branch is probably just pack-0.92 | 11:16 |
james_w | you will need to "upgrade --rich-root-pack" your other branch | 11:17 |
asac | ok ... so merge upstream on top of debian? | 11:17 |
asac | james_w: err | 11:17 |
asac | wait a second. both are svn branches | 11:17 |
asac | e.g. lp:network-manager == upstream svn | 11:17 |
asac | the other is the pkg-utopia thing | 11:17 |
james_w | but upstream is done by launchpad? | 11:17 |
asac | james_w: yes | 11:17 |
james_w | they don't use bzr-svn | 11:18 |
asac | can i do it the way they do it? :) | 11:18 |
asac | darn ... so i have to register a series ... and they will refuse to mirror that experimental branch ... i already see what is coming ;) | 11:19 |
asac | james_w: any idea if their sync tool is public? | 11:20 |
james_w | asac: no idea, sorry | 11:21 |
james_w | you might want to jump in to #launchpad to see about mirroring that branch | 11:21 |
asac | yeah ... just wanted to jump into #bzrlp :) | 11:21 |
asac | on canonical irc ... but lets try open means first | 11:21 |
asac | james_w: good. here i have another nifty topic :) ... i have upstream branch + topic branch + packaging branch (based on upstream branch) ... now i would like something like ./debian/rules bzr-topics-update :) | 11:58 |
asac | is there a cdbs helper already for something like this? | 11:58 |
asac | given that we have a patchsystem that is | 11:58 |
james_w | so you want to take the diff from upstream->topic and drop it in to debian/patches? | 11:59 |
asac | james_w: yeah. i want to regularly update a patch (and create it initially, but that can be done manually) | 11:59 |
james_w | I don't know of anything existing. | 11:59 |
asac | james_w: ok ... i think a cdbs helper that just looks at debian/bzr.topics with syntax: <patchname> <topicbranchref> would be good here. | 12:01 |
james_w | that could work | 12:02 |
asac | james_w: hmm but how to figure which upstream branch revision to use for the diff? | 12:02 |
asac | james_w: i think this boils down to a generic commadn that allows you to diff current head against last merged head :) | 12:03 |
asac | like bzr diff -r2772..2752.1.435 | 12:03 |
asac | e.g. 2772 == current head of topic brnach | 12:04 |
asac | 2752.1.435 == revision of latest merge i see in bzr log :) | 12:04 |
asac | given that we assume that thats an upstream branch :( | 12:04 |
asac | ok ... too hard task i guess for me. next topic ;) | 12:04 |
p3sho | Hi there! | 15:31 |
p3sho | is there any way to make Thunderbird not notify me about newly arrived Junk mail? | 15:31 |
asac | p3sho: good question. i dont think that such a feature exists | 16:09 |
asac | except if you say "delete junk immediatly" (maybe?) | 16:09 |
[reed] | asac: http://www.flickr.com/photos/lukasblakk/2588016297/ | 16:35 |
[reed] | :P | 16:35 |
asac | [reed]: hihi | 16:40 |
=== rzr is now known as RzR | ||
RzR | asac: hi , sorry w/ the delay I was busy w/ tuxguitar-1.0 | 16:49 |
RzR | asac: is it ok now ? | 17:05 |
asac | RzR: you still didnt sync with the ubuntu-dev branch | 17:09 |
RzR | I have to push it right | 17:09 |
asac | RzR: push what? | 17:10 |
RzR | hum I did it | 17:10 |
RzR | ok | 17:11 |
RzR | I missed something | 17:11 |
asac | RzR: you didnt merge it | 17:11 |
RzR | yesterday you said me to drop my branch | 17:11 |
asac | RzR: yeah | 17:11 |
asac | you didnt do that | 17:11 |
RzR | but I dont undestand why | 17:11 |
RzR | If I merge it | 17:11 |
RzR | it should be ok ? | 17:11 |
asac | not really | 17:11 |
RzR | I just merged to ubuntu-dev | 17:11 |
RzR | from | 17:12 |
RzR | not to | 17:12 |
RzR | if i dont drop it, it will be rejected then ? since there is a branch cross ? | 17:13 |
asac | no ... i just ask you to drop your branch so we dont have merges of merges and so on | 17:14 |
RzR | Ok I blindly trust you :) | 17:14 |
RzR | asac: ok I dropped my branch I'll create it again later i have to go | 17:20 |
fta | asac, i've implemented a generic build-system for xul applications | 18:53 |
fta | asac, i've tested it with fennec, seems ok: http://www.sofaraway.org/ubuntu/tmp/fennec.png | 18:54 |
fta | asac, the question is now, should we patch xulrunner so that xul apps stop shipping a full copy of xulrunner, like our firefox | 19:04 |
asac | fta: how do you want to patch xulrunner? | 19:06 |
fta | see what is specific for ff, and make it generic for all xul apps | 19:08 |
asac | not sure what you mean :) how did you solve the issues i mentioned? | 19:08 |
fta | depends if we want xulapps to be standalone or depends on xulrunner | 19:09 |
fta | now, i can build fennec just with: --with-libxul-sdk=$(DEBIAN_XUL_DEV) --enable-application=mobile without any patch | 19:10 |
fta | so i assume i can do it with prism too. and try songbird too | 19:11 |
asac | fta: so how is the build system maintained? | 19:11 |
asac | shipped in xulrunner-1.9-dev and how applied? | 19:12 |
fta | applied by mozilla-devscripts hooks | 19:13 |
fta | (cdbs hooks provided by mozilla-devscripts) | 19:13 |
asac | fta: is the build system derived from upstream one? | 19:17 |
fta | exact copy | 19:19 |
asac | so how would the xulrunner patch look like? | 19:22 |
asac | bug 236613 | 19:31 |
ubottu | Launchpad bug 236613 in firefox-3.0 "firefox 3 rc with prism extension crashes when download a file." [High,Invalid] https://launchpad.net/bugs/236613 | 19:31 |
asac | now also claims that our prism package crushes :) | 19:32 |
fta | prism extension = upstream xpi, not our package | 19:33 |
asac | fta: no read the last comment | 19:34 |
asac | he claims that our package crushes system :) | 19:34 |
RzR | asac: Ok I am back, I created the branch with the same name again, but it seems to be stuck on scan : https://code.edge.launchpad.net/~rzr/firefox-extensions/flashblock.ubuntu | 19:34 |
asac | http://launchpadlibrarian.net/15472047/gdb-firefox-3.0.txt | 19:36 |
fta | asac, donno, i'm using prism from hardy and intrepid every day, no problem | 19:36 |
asac | I'd say driver issue | 19:36 |
asac | dropping buggy_repeat caused instability for some | 19:36 |
asac | bug 214817 | 19:37 |
ubottu | Launchpad bug 214817 in firefox-3.0 "When I close a tab that has a Gmail page loaded, firefox crashes" [Undecided,Incomplete] https://launchpad.net/bugs/214817 | 19:37 |
RzR | Jazzva: hi, are you still on jabbin? | 19:54 |
fta | asac, as expected, the build system doesn't provide a make install target | 19:56 |
Jazzva | RzR: Planning to do it after exams... Would you like to give it a try? | 19:58 |
RzR | sure | 19:58 |
RzR | well i am bit buzy now | 19:59 |
RzR | but I'll find you a few time for you | 19:59 |
Jazzva | Well, go ahead if you want :). Just give me a notice if you start packaging it | 20:01 |
Jazzva | RzR ^ | 20:01 |
RzR | I'll do this On debian side | 20:01 |
RzR | If I have to do something on jabbin | 20:02 |
RzR | Jazzva: can I have a look at your .dsc ? | 20:06 |
Jazzva | RzR: For Jabbin? I don't have it. I started doing it last year, then it got lost when I formatted the drive. I haven't been working on it since then... | 20:08 |
RzR | ok | 20:08 |
RzR | if you can unassign yourself , I'll may take it If I am too bored ;) | 20:09 |
RzR | BTW, as reminder the mozilla metting is this sunday , I was about to forget it | 20:09 |
Jazzva | RzR: Can't you just reassign it if you decide to do it ;)? | 20:10 |
RzR | ok | 20:10 |
Jazzva | I would like to do it, if you don't start working on it. I would ask you before, of course... | 20:10 |
RzR | are there good alternatives to it ? | 20:11 |
Jazzva | Pidgin, if it would implement voice talk :)... | 20:12 |
RzR | there is a jiggle plugin | 20:12 |
RzR | under developpement at least | 20:12 |
Jazzva | Really? Cool. Didn't know that... | 20:14 |
asac | fta: shame ;) | 20:28 |
asac | fta: but well ... not a bug problem i guess ;) | 20:29 |
fta | asac, well, it's always the same story.. unix/packages-static | 20:51 |
fta | asac, problem is upstream usually doesn't want to maintain that | 21:20 |
fta | asac, http://paste.ubuntu.com/21663/ => that's what is produced by default now with just http://paste.ubuntu.com/21664/ and http://paste.ubuntu.com/21665/ but i didn't create removed-files and */packages-static | 21:29 |
fta | asac, the xul patch i mentioned earlier would be to get rid of the xulrunner dir | 21:30 |
fta | [reed], is fennec an active project ? | 21:36 |
[reed] | fta: yep, very active | 21:36 |
fta | [reed], in hg ? | 21:36 |
[reed] | first release is at the end of 2008 | 21:36 |
[reed] | yep | 21:36 |
fta | [reed], i don't see a lot of commits in there | 21:37 |
fta | 10 in a month | 21:37 |
[reed] | under mobile-browser? | 21:38 |
fta | yes | 21:38 |
[reed] | a lot of the work was happening in svn, but then it moved to hg | 21:38 |
[reed] | I think people have been busy lately | 21:38 |
fta | [reed], i expected to see that http://dougt.wordpress.com/2008/06/12/firefox-mobile-ui-proposal-aza-style/ | 21:47 |
[reed] | dunno | 21:47 |
[reed] | ask #mobile on moznet | 21:47 |
[reed] | I haven't been paying attention | 21:47 |
fta | http://upload.wikimedia.org/wikipedia/commons/2/25/Lesser_panda_standing.jpg | 21:48 |
RzR | asac: my branch is now resurected :) | 22:07 |
fta | [reed], if you're looking for something to watch, try The Middleman | 22:07 |
[reed] | k | 22:07 |
[reed] | thanks | 22:07 |
fta | watching the pilot, it's funny | 22:08 |
asac | RzR: ok. i still dont get why you claim that it fixes the crash you are closing without even being able to reproduce ;) | 22:36 |
asac | but i will drop that line from changelog | 22:36 |
RzR | asac: because this comment it not related to the original crash | 22:37 |
RzR | the guy talk about the whitelist option | 22:38 |
RzR | I am pretty sure even without flashblock the swf plugin crash his browser | 22:39 |
asac | ok. but then why close the bug in flashblock upload? | 22:39 |
Jazzva | asac: Just a question about merging from debian... Should we get debian version, resolve the conflicts, then add that to extensions .ubuntu branch? | 22:40 |
RzR | because this version is obsolete | 22:40 |
Jazzva | Since I'm gonna do few of them... | 22:40 |
RzR | so all its bug should be closed soon or later | 22:40 |
RzR | well I understand what you mean asac | 22:41 |
asac | yep | 22:42 |
asac | but not in upload | 22:42 |
RzR | the main reason I decided to close it , it was because this bug was a but confusing, I my last comment I invited them to open new bug on upcoming version | 22:42 |
asac | ill upload this now to intrepid | 22:42 |
RzR | ok | 22:42 |
asac | RzR: i agree that this bug should be closed. but not fixreleased in upload ... set it to invalid if the user cannot provide the required info anymore | 22:42 |
RzR | this makes sense | 22:43 |
RzR | I was too lazy | 22:43 |
RzR | shame on me :) | 22:44 |
RzR | anyway thanks for all asac , excuse me about all the process I am discovering ubuntu workflow everyday | 22:45 |
fta | asac, just got the permission from google to use their logos for prism webapps | 22:45 |
RzR | now bedtime ... I'll be back for the meeting | 22:45 |
=== RzR is now known as rZr | ||
asac | fta: permission granted to who? | 22:48 |
fta | to redistribute in ubuntu | 22:49 |
asac | hard to say if we want that | 22:49 |
asac | ill ask | 22:49 |
fta | that's what i've asked to google. permission to ship google icons within prism packages shipped in ubuntu | 22:50 |
asac | fta: if we want to claim an exception we need permission to distribute it in ubuntu and derivatives | 22:50 |
asac | otherwise it has to go to multiverse | 22:51 |
asac | but good to know that you retrieved an answer :) | 22:52 |
asac | how long did it take? | 22:52 |
fta | Date: Thu, 7 Feb 2008 13:59:14 -0800 | 22:52 |
asac | heh | 22:53 |
fta | i have no mouse cursor in fennec | 22:53 |
fta | am i supposed to run that within something ? | 22:54 |
fta | a mobile env ? | 22:54 |
asac | i dont think so | 22:54 |
asac | but who knows :) | 22:54 |
fta | hildon maybe | 22:54 |
asac | is there any binary module? | 22:54 |
fta | http://paste.ubuntu.com/21663/ | 22:55 |
asac | i doubt that they want hildon. maybe something else, but as i dont see any special binary components i wouldnt think that thats the case | 22:57 |
fta | they ship a debian dir as installer, it contains: fennec.links:/usr/share/applications/hildon/fennec.desktop etc/others-menu/0112_fennec.desktop | 22:58 |
fta | and a dbus service | 22:59 |
asac | which? | 22:59 |
fta | [D-BUS Service] | 23:00 |
fta | Name=org.mozilla.fennec | 23:00 |
fta | Exec=/usr/local/fennec/fennec | 23:00 |
asac | /usr/local/fennec/fennec starts the browser? | 23:01 |
asac | (fixed path obviously= | 23:01 |
asac | ) | 23:01 |
fta | it's their stuff, i didn't use that | 23:03 |
asac | they most likely develop for nokia atm | 23:04 |
asac | nokia has debian + hildon | 23:04 |
asac | but well ... i doubt that this is the problem | 23:04 |
fta | well, it was just a test bed for my xul app build system | 23:04 |
asac | wonder which window manager nokia uses | 23:04 |
asac | maybe matchbox? | 23:04 |
asac | fta: yeah. i dont think that we need a package now. we can package it with volunteers during the next open developer week ;) | 23:05 |
asac | session "packaging xul apps" :) | 23:05 |
asac | fta: try to use xephyr xserver + matchbox window manager | 23:06 |
asac | :) | 23:06 |
fta | someone asked me (and the ubuntu-mozillateam m-l) how to package a xul app today | 23:07 |
asac | fta: yeah ... lets get the build system app ... make it fail safe for beginners | 23:08 |
asac | document in wiki and point them to it | 23:08 |
asac | fta: mz mailing list? | 23:08 |
asac | strange ... didnt get the mail | 23:08 |
fta | ubuntu-mozillateam at lists.ubuntu.com | 23:08 |
fta | asac, where should i write that in the wiki ? | 23:10 |
asac | https://lists.ubuntu.com/archives/ubuntu-mozillateam/2008-June/thread.html | 23:10 |
asac | the mail did not go through | 23:10 |
asac | :) | 23:10 |
asac | anyway. | 23:10 |
asac | fta: https://wiki.ubuntu.com/MozillaTeam/XulApps equiv to Firefox3Extensions | 23:11 |
asac | and https://wiki.ubuntu.com/MozillaTeam/XulApps/Packaging with detailed how to | 23:11 |
asac | package | 23:11 |
fta | seems he wants to package this: http://code.google.com/p/aliwal/ | 23:11 |
asac | .dmg | 23:12 |
fta | so far, i used the full configure.in, meaning a lot of unnecessary build-deps | 23:16 |
fta | of course, each xul app could patch it as it's installed before the patch | 23:16 |
asac | not really inspiring :) | 23:17 |
fta | ? | 23:17 |
asac | to patch configure.in :) | 23:17 |
fta | what do you mean ? | 23:17 |
fta | yep, you have a better idea ? | 23:17 |
asac | wrong word ... not really nice ;) | 23:17 |
asac | not sure. i think the problem is the lack of modularization of configure.in | 23:19 |
asac | i started to do it once for the enigmail build system ... but back then configure.in was much dirtier than nowadays (though its still a heap of shit :)) | 23:19 |
asac | so maybe its worth taking a look | 23:19 |
asac | again | 23:19 |
asac | but before we are putting any serious work into this, we have to figure if configure.in is not dying soon :) | 23:20 |
fta | never read anything about that so far | 23:40 |
asac | bug 211212 | 23:42 |
ubottu | Launchpad bug 211212 in moblin-ui-framework "Network-manager process hangs after resume from S4" [Medium,Fix released] https://launchpad.net/bugs/211212 | 23:42 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!