| asac | Jazzva: i think so | 12:31 |
|---|---|---|
| asac | can find out tomorrow | 12:31 |
| asac | what size do other icons have | 12:31 |
| asac | ? | 12:31 |
| Jazzva | Well, the smallest is 32x32 | 12:32 |
| Jazzva | Others are mostly 128x128 | 12:33 |
| Jazzva | asac ^ | 12:33 |
| Jazzva | In xpm | 12:33 |
| Ubulette | asac, help :) | 12:35 |
| === cwong1 [i=chatzill@nat/intel/x-e9a5b786b6f70843] has joined #ubuntu-mozillateam | ||
| asac | Jazzva: then using 32x32 is ok | 12:36 |
| asac | Ubulette: how? | 12:36 |
| asac | :) | 12:36 |
| Ubulette | (cd ../../dist/firefox && tar -cvhf - .) | \ | 12:36 |
| Ubulette | (cd /src/firefox-granparadiso-3.0~alpha7/debian/tmp//usr/lib/firefox-granparadiso && tar -xf -) | 12:36 |
| Ubulette | cd: 2: can't cd to /src/firefox-granparadiso-3.0~alpha7/debian/tmp//usr/lib/firefox-granparadiso | 12:36 |
| Ubulette | this is were my build fails | 12:36 |
| Ubulette | thought the 1st line was supposed to create the missing dir.. it didn't | 12:37 |
| asac | yeah .. which probvably means that make install doesn't install things | 12:37 |
| Ubulette | oops | 12:37 |
| Ubulette | 1st line missing | 12:37 |
| asac | we do make install DESTDIR=debian/tmp/ | 12:37 |
| Ubulette | /src/firefox-granparadiso-3.0~alpha7/build-tree/mozilla/config/nsinstall -D /src/firefox-granparadiso-3.0~alpha7/debian/tmp//usr/lib/firefox-granparadiso | 12:37 |
| asac | Ubulette: what is in /src/firefox-granparadiso-3.0~alpha7/debian/tmp//usr/lib/ | 12:37 |
| asac | ? | 12:37 |
| Ubulette | nothing at that point. debian/tmp is still empty | 12:38 |
| Ubulette | nsinstall -D is supposed to create it just before the tar | tar | 12:38 |
| asac | well .. but the compile succeeded? | 12:38 |
| Ubulette | yep | 12:38 |
| asac | or is this right in the beginning? | 12:38 |
| asac | ok | 12:38 |
| Ubulette | nope, the end | 12:39 |
| Ubulette | it's make install | 12:39 |
| asac | have you tried to run make install DESTDIR=/tmp/testinstall | 12:39 |
| asac | and see if all is properly installed beneath /tmp/testinstall? | 12:39 |
| asac | e.g. you can run make install in build-tree/mozilla | 12:39 |
| Ubulette | yep. worked | 12:40 |
| asac | yes ... which is what i saw | 12:40 |
| asac | question is why does it fail if its run through debian/rules | 12:40 |
| asac | but not if manually | 12:40 |
| Ubulette | exactly | 12:40 |
| asac | i managed to run exactly the same command that debian/rules runs manually | 12:40 |
| asac | Ubulette: so it fails lik | 12:41 |
| asac | 00:37 < Ubulette> /src/firefox-granparadiso-3.0~alpha7/build-tree/mozilla/config/nsinstall -D /src/firefox-granparadiso-3.0~alpha7/debian/tmp//usr/lib/firefox-granparadiso | 12:41 |
| asac | ?? | 12:41 |
| asac | is that the first command run if you run make install manually? | 12:41 |
| Ubulette | this did nothing apparently but manually, it works fine | 12:41 |
| Ubulette | I can post my full logs | 12:41 |
| asac | the double / isn't a probloem, right? | 12:41 |
| asac | Ubulette: well ... i am as smart as you are ... i just know that i ran into the same problem | 12:42 |
| Ubulette | manually, the double / is not a problem | 12:42 |
| asac | and had no time to look into it | 12:42 |
| asac | it looks like its an environment thing | 12:42 |
| Ubulette | asac, you seems to master this whole mozilla maze. I don't :) | 12:42 |
| asac | if you can figure out what is different in environment when run through debian/rules compared to manually then you are a hero :) | 12:42 |
| Ubulette | well, env is the same, ie a very very limited chrooted bootstrap | 12:43 |
| asac | well ... but if env is the same and everything else is the same then we should see same result | 12:44 |
| Ubulette | :) | 12:44 |
| asac | but we don't ... which is why i guess that env is different | 12:44 |
| asac | as i don't see whatelse might be different | 12:44 |
| asac | Ubulette: oh | 12:45 |
| asac | Ubulette: pleasae try this: | 12:45 |
| asac | chose a different upstream version | 12:45 |
| asac | maybe its some path expansion thing and ~ confuses something | 12:45 |
| asac | (stupid guess ... but worth a try) | 12:46 |
| Jazzva | asac: I'm also making .desktop files, since none of these packages have one (I don't know why I expected they will (Oh, yeah... I wasn't looking forward to making a whole bunch of .desktops :)))... Hope that's ok with gnome-app-install. | 12:46 |
| asac | so maybe try if building with upstream version name firefox-granparadiso-3.0a7 helps | 12:46 |
| asac | Ubulette: i had some discussion with debian maintainer who had issues if upstream directory had a tilde in its name | 12:46 |
| asac | though i think it was unrelated to mozilla build system ... but who knows :) | 12:47 |
| asac | Jazzva: yes thats the idea | 12:47 |
| asac | Jazzva: create .desktop files | 12:47 |
| asac | inject .png | 12:47 |
| Jazzva | ...xpm :) | 12:47 |
| asac | Jazzva: and finally add Mime-Type: ... to those desktop files | 12:47 |
| asac | so we can search for firefox/thunderbird et al extensions by mime-type | 12:47 |
| asac | yeah .xpm is good as well | 12:48 |
| Jazzva | asac: As soon as I talk to g... (have nick in logfile) about Mime-Type :). | 12:48 |
| asac | i think good practice is to leave out file extension in desktop file | 12:48 |
| asac | glatzor | 12:48 |
| Ubulette | ok, i'll debug the hard way. | 12:48 |
| asac | Jazzva: if glatzor says that he hasn't hard-coded a mime-type so far, just let me know and I will give you one | 12:48 |
| asac | Ubulette: cool :) | 12:49 |
| asac | Ubulette: but how? | 12:49 |
| asac | Ubulette: the patch applied cleanly, right? | 12:49 |
| Ubulette | let's insert a strace in rules.mk | 12:49 |
| asac | the make install patch i mean | 12:49 |
| Ubulette | which patch ? | 12:49 |
| Jazzva | asac: Ok... Off for a while... Have fun debugging :). | 12:49 |
| asac | Jazzva: thanks | 12:49 |
| asac | :) | 12:50 |
| cwong1 | asac: I am having problem running the midbrowser built off of the WORKING branch. It takes a long long time before it comes up. And I see 2 tabs in the browser, one labeled with (Unttled) and the other is loading the home page. Do you have the same problem I do? | 12:50 |
| Ubulette | asac, I've created debian/patches/50_from_bugzilla_fix_make_install.patch which is bugzilla minus xulrunner patch | 12:50 |
| asac | ok | 12:50 |
| asac | cwong1: the two homepages are a feature | 12:51 |
| asac | cwong1: its called milestone feature ... and you get that when you upgrade | 12:51 |
| asac | cwong1: for taking long time before it comes up ... i don't see that | 12:51 |
| asac | cwong1: in my chroot it always takes a bunch of time because of high X latency i guess | 12:52 |
| cwong1 | asac: hmmmm I thought the damn thing was hung | 12:52 |
| asac | do you run in chroot? | 12:52 |
| cwong1 | asac: Yes. I am using the image that I created with image creator | 12:53 |
| asac | and xephyr? | 12:53 |
| cwong1 | asac: yes | 12:54 |
| asac | in general i don't see any reason why it would take longer to start up | 12:54 |
| asac | remember that working still has hildon window | 12:54 |
| asac | so maybe thats the difference | 12:54 |
| cwong1 | asac: I disabled that from nswindow.cpp | 12:54 |
| asac | ok | 12:54 |
| asac | how? | 12:54 |
| asac | patched reverse? | 12:55 |
| cwong1 | yes | 12:55 |
| asac | ok | 12:55 |
| asac | so what do you test? starting from dist/bin ? | 12:55 |
| cwong1 | btw, what is the "Utitle"page points to? | 12:55 |
| cwong1 | yes | 12:55 |
| cwong1 | I cd to dist/bin and enter ./midbrowser | 12:55 |
| asac | cwong1: are you sure it takes longer then previous midbrowser? | 12:55 |
| cwong1 | yes a lot longer. | 12:56 |
| cwong1 | hmm may be its because I dont have the proxy setup and it waited the page to time out | 12:56 |
| asac | well .. sounds reasonable :) | 12:56 |
| asac | cwong1: maybe compare startup time right after removing ~/.mozilla/midbrowser | 12:57 |
| cwong1 | ok I will play around with it and see.. thanks | 12:57 |
| asac | e.g. with fresh profile | 12:57 |
| asac | we can talk about the start pages on another day | 12:58 |
| cwong1 | yes | 12:58 |
| asac | for now get the menu assembled :) | 12:58 |
| cwong1 | I do see the toolbar on the bottom.. looks good. | 12:58 |
| cwong1 | yeap | 12:58 |
| asac | and strip what is currently excluded by localstore.rdf out of midbrowser.xul :) | 12:58 |
| cwong1 | will do | 12:58 |
| asac | for the milestone pages: | 12:59 |
| asac | everytime mozilla detects that you upgraded to another build it will try to display a release notes page | 12:59 |
| asac | in addition to homepage | 12:59 |
| cwong1 | ok didnt know that | 01:00 |
| asac | we have to discuss if we want that .... or what we want | 01:00 |
| asac | in ubuntu we have turned this feature completely off for firefox | 01:00 |
| asac | its a simple solution, but since we are real upstream we might want a bit more | 01:00 |
| cwong1 | that's what I was thinking. | 01:00 |
| cwong1 | disable it completely | 01:00 |
| asac | yeah ... but it requires a patch against upstream firefox | 01:01 |
| asac | which is not good | 01:01 |
| asac | better: setup a release notes page on moblin.org :) | 01:01 |
| asac | we can patch it for ubuntu package like we do for firefox | 01:01 |
| asac | ... if we want | 01:01 |
| cwong1 | we can decide on this when Bob comes back next week | 01:01 |
| asac | sure | 01:02 |
| asac | its not really pressing i hope | 01:02 |
| cwong1 | no | 01:02 |
| asac | after all its a simple thing to change | 01:02 |
| asac | just remember to keep it on radar | 01:02 |
| cwong1 | y | 01:02 |
| cwong1 | back to working on menu..:) | 01:02 |
| asac | cool :) | 01:02 |
| Ubulette | do'h, I have to recompile everything once again | 01:03 |
| asac | Ubulette: why? | 01:05 |
| asac | usually i just rerun dpkg-buildpackage -rfakeroot -nc | 01:05 |
| asac | to retry make install | 01:06 |
| asac | only | 01:06 |
| Ubulette | there's a clean at the beginning | 01:06 |
| Ubulette | no ? | 01:06 |
| asac | no | 01:06 |
| asac | dpkg-buildpackage -rfakeroot -nc | 01:06 |
| asac | will just clean your make install | 01:06 |
| asac | not the whole build | 01:06 |
| asac | e.g. debian/tmp debian/PACKAGNAME wil be cleaned | 01:06 |
| asac | and make install rerun | 01:06 |
| Ubulette | hmm | 01:07 |
| asac | just give it a try | 01:09 |
| asac | saves you 30-60 minutes | 01:09 |
| Ubulette | hmm, strace is interesting. | 01:12 |
| Ubulette | mkdir("/src/firefox-granparadiso-3.0~alpha7/debian/tmp", 0777) = 0 | 01:12 |
| Ubulette | stat64("/src/firefox-granparadiso-3.0~alpha7/debian/tmp", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 | 01:12 |
| Ubulette | it wants the dir in 777, it's created in 755, then nsinstall is lost | 01:13 |
| asac | well | 01:17 |
| asac | why would it get lost then? | 01:17 |
| asac | Ubulette: when you run make install DESTDIR=... manually | 01:17 |
| asac | is DESTDIR afterwards 777 ? | 01:18 |
| Ubulette | no | 01:18 |
| asac | so thats not the issue then | 01:18 |
| asac | Ubulette: try if make install DESTDIR=/tmp/test-1.0~4asda/ works | 01:19 |
| asac | maybe its indeed the tilde | 01:19 |
| asac | though i doubt that you would see any crazy expansion in bash | 01:20 |
| asac | but maybe in the new install:: rule in config/rules.mk | 01:20 |
| Ubulette | I don't have tilde anywhere | 01:21 |
| Ubulette | I build in /src | 01:21 |
| Ubulette | http://pastebin.mozilla.org/182412 | 01:22 |
| Ubulette | see by yourself | 01:22 |
| asac | Ubulette: e.g. /src/firefox-granparadiso-3.0~alpha7/debian/tmp//usr/lib/firefox-granparadiso | 01:24 |
| asac | there is tilde: | 01:24 |
| asac | adiso-3.0~alph | 01:24 |
| Ubulette | oh | 01:24 |
| asac | please test the make install above | 01:24 |
| asac | make install DESTDIR=/tmp/test-1.0~4asda/ | 01:24 |
| asac | and see if /tmp/test-1.0~4asda/ is empty afterwards | 01:24 |
| asac | or fails | 01:25 |
| Ubulette | bingo | 01:25 |
| Ubulette | fails | 01:25 |
| asac | yeah cool | 01:25 |
| asac | thats not nice ... but a direction | 01:25 |
| asac | ok so look in the patch | 01:25 |
| asac | the make_install one | 01:25 |
| asac | there should be some place where the DESTDIR gets expanded | 01:26 |
| Ubulette | reading... | 01:27 |
| asac | yes thats fine | 01:27 |
| asac | anyway ... iam sure there is some code that chokes on tilde in DESTDIR in https://bugzilla.mozilla.org/attachment.cgi?id=274304 | 01:27 |
| asac | Ubulette: maybe its NSINSTALL? | 01:29 |
| Ubulette | it's in C so no ~ expansion | 01:29 |
| asac | welll i guess it happens before | 01:30 |
| gnomefreak | asac: trunk is still FTBFS | 01:31 |
| gnomefreak | same spot too | 01:32 |
| gnomefreak | let me look at somehting | 01:32 |
| asac | Ubulette: maybe $(NSINSTALL) -D $(DESTDIR)$(installdir) need to be something like $(NSINSTALL) -D '$(DESTDIR)$(installdir)' | 01:33 |
| asac | ? | 01:33 |
| === gnomefreak bets debian/tpm is empty | ||
| asac | gnomefreak: yeah | 01:33 |
| asac | we are working on it as you may read :) | 01:33 |
| gnomefreak | yep empty | 01:33 |
| gnomefreak | ah ok | 01:33 |
| Ubulette | asac, nope as strace shows the cmd line is ok | 01:35 |
| Ubulette | ie not expanded at the ~ | 01:35 |
| asac | Ubulette: tmp is created ... but no dir below, right? | 01:36 |
| Ubulette | right | 01:36 |
| asac | do you see any attempt to create or stat a dir below? | 01:36 |
| asac | e.g. tmp/usr ? | 01:36 |
| asac | or tmp/usr/lib/firefox* ... directly? | 01:36 |
| Ubulette | no. see my pastebin above | 01:37 |
| gnomefreak | by the looks of the failure here it looks like what you have is it | 01:37 |
| Ubulette | gnomefreak, seems close now :) | 01:37 |
| gnomefreak | it does but still this one has been bothering me for a while since the output doesnt match the error (sortof) | 01:38 |
| asac | Ubulette: for me the strace looks like nsinstall fails to step down | 01:38 |
| gnomefreak | (cd /home/gnomefreak/firefox/trunk/debian/tmp//usr/lib/firefox-trunk && tar -xf -) | 01:38 |
| asac | Ubulette: e.g. it tries to mkdir for every level ... but always with just tmp | 01:38 |
| gnomefreak | other than that it doesnt really play in tmp | 01:39 |
| asac | Ubulette: does unix install -D ? | 01:39 |
| asac | support -D i mean | 01:39 |
| asac | if so ... try to replace NSINSTALL with SYSINSTALL in patch | 01:39 |
| gnomefreak | i can only go so far up but rm -f -rf ../../dist/xpt is where the trouble seemed to have started, after that it lists paths /bin/..... and some have errors/warnings than when thats done it fails | 01:41 |
| Ubulette | 2 secs, debugging nsinstall.c | 01:41 |
| gnomefreak | it has to doesnt it | 01:42 |
| gnomefreak | i see a -DD before the failure (a while before it) | 01:43 |
| gnomefreak | thought i saw a -D | 01:43 |
| asac | Ubulette: does nsinstall alone fail as well? e.g. just nsinstall -D /tmp/test~123123/usr/lib | 01:44 |
| Ubulette | in shell, nsinstall -D is okay, not through dpkg-buildpackage | 01:45 |
| asac | Ubulette: so ... not when run through make you mean | 01:46 |
| asac | e.g. how about a simple make file ... with just | 01:46 |
| asac | run: | 01:46 |
| asac | nsinstall -D /tmp/test-1.2~123/usr/lib ? | 01:46 |
| asac | does that work? | 01:46 |
| asac | i mean we had make install DESTDIR=... fail ... so te problem probably appears in combination with make | 01:47 |
| asac | i bet most likely with $(DESTDIR) expansion in make | 01:47 |
| asac | e.g. so above make snipped will work while | 01:47 |
| asac | run: | 01:47 |
| asac | nsinstall -D $(XYZ) | 01:48 |
| asac | will fail if run like | 01:48 |
| asac | make XYZ=/tmp/test+1.x~123xca/usr/lib | 01:48 |
| Ubulette | well, I don't think so. nsinstall -D is just a mkdirs which is a reccursive function calling mkdir.. and it seems clearly wrong | 01:48 |
| asac | ... if it doesn't happen in makefiles with the expansion above then i don't know | 01:49 |
| Ubulette | the call to mkdir in always debian/tmp instead of d/t/a d/t/a/b d/t/a/b/c etc. | 01:49 |
| asac | yeah | 01:49 |
| Ubulette | it's all wrong within the C code | 01:50 |
| asac | yeah the amount of mkdirs == depth of path below debian/ ? | 01:50 |
| Ubulette | yes | 01:50 |
| asac | but why would it break in make and not from shell? | 01:50 |
| asac | if its in C code? | 01:50 |
| asac | it has to be something expansion'ish | 01:51 |
| Ubulette | that's what I'm trying to find out | 01:51 |
| asac | well ... does the Makefile above fail on make run DESTDIR=... ? | 01:51 |
| asac | that would clearly help to evaluate | 01:51 |
| Jazzva | Back and stuff... Off to those .desktops | 01:53 |
| asac | Ubulette: what makes me feel scary is that mkdirs in nsinstall.c passes a non const char* down recursively | 01:54 |
| asac | and even modifies this within recursion: | 01:54 |
| asac | path[l - 2] = 0; | 01:54 |
| asac | might be right ... but looks hard to manage :) | 01:54 |
| asac | so it modifies the path ... passes modified path to mkdirs recursively and upon return it runs mkdir with the path it previously modified to pass down? | 01:55 |
| asac | that looks wierd | 01:55 |
| Ubulette | found it. It's the double / | 01:55 |
| asac | really? | 01:55 |
| asac | you see that in code? | 01:56 |
| asac | can you fix nsinstall.c ? | 01:56 |
| Ubulette | I'm working on it | 01:56 |
| asac | ok so you have to cut of trailing // before recursing | 01:56 |
| asac | ok | 01:57 |
| asac | atm it only strips leading double / | 01:57 |
| asac | Ubulette: good luck :) ... i am going to bed now. Let me know about your findings please ... i will read logs when i wake up | 02:11 |
| Ubulette | done. | 02:12 |
| Ubulette | it works now | 02:12 |
| asac | Ubulette: how? | 02:13 |
| asac | patch ;) ? | 02:13 |
| Ubulette | yep. 2 sec | 02:13 |
| asac | sure | 02:13 |
| Ubulette | how ? pastebin ? | 02:15 |
| asac | at best push a ready branch to launchpad :) | 02:16 |
| asac | but pastebin is ok as well | 02:16 |
| asac | at least let me take a look through pastebin | 02:16 |
| Ubulette | http://pastebin.mozilla.org/182420 | 02:16 |
| asac | ok so it was in-recursion modification? | 02:17 |
| asac | of path? | 02:17 |
| Ubulette | the idea is when the initial code see a //, it modify path, which is wrong for the inner mkdir | 02:17 |
| Ubulette | I just keep the oringinal path (opath) and free it later | 02:17 |
| asac | Ubulette: maybe the bug is in line 20 ? | 02:18 |
| asac | i mean is that needed? | 02:18 |
| Ubulette | yep | 02:18 |
| asac | it should be zero because of while before | 02:18 |
| asac | or because strend | 02:18 |
| asac | oh i see | 02:19 |
| asac | it does not restore all / before return | 02:19 |
| asac | ok | 02:19 |
| asac | ok thanks ... strdup looks like the more reasonable approach | 02:19 |
| asac | assuming that nsinstall does not try to minimize memory usage for real of course | 02:20 |
| Ubulette | should not be a problem. strdup does its own allocation | 02:20 |
| Ubulette | it's basically malloc + strncpy | 02:21 |
| asac | yeah | 02:21 |
| asac | anyway ... its not as efficient as not duplicating mem :) | 02:21 |
| asac | Ubulette: ok whats your lp id? | 02:21 |
| asac | and name + email? | 02:22 |
| Ubulette | ubulette | 02:22 |
| Ubulette | my lp account is uptodate (email, ssh key, etc) | 02:22 |
| asac | Ubulette: if you want you can push a paradiso alpha7 branch to launchpad | 02:23 |
| asac | otherwise i will prepare it tomorrow | 02:23 |
| Ubulette | never done that before. I'm used to package debs on my side :P | 02:23 |
| Ubulette | I've designed a buildbot | 02:23 |
| asac | https://launchpad.net/~ubulette | 02:24 |
| asac | is "page not found" | 02:24 |
| Ubulette | oops | 02:24 |
| Ubulette | https://bugs.launchpad.net/~fta+launchpad | 02:24 |
| Ubulette | it's based on my email | 02:24 |
| asac | don't see any email on that page | 02:25 |
| asac | anyway | 02:25 |
| asac | Ubulette: if you want to contribute on the long run, get used to bzr ... ok good night ;) | 02:25 |
| Ubulette | I'm used to cvs, svn, hg, git | 02:26 |
| Ubulette | why not bzr :) | 02:26 |
| asac | well then bzr should be easy | 02:26 |
| asac | just commit yuor changes locally | 02:26 |
| asac | and if ready push to sftp://$USER@bazaar.launchpad.net/~$USER/firefox/granparadiso | 02:26 |
| asac | bzr push URL | 02:27 |
| asac | ok night | 02:27 |
| Ubulette | ok, I'll think about it. good night | 02:27 |
| asac | ah ... start with my granparadiso branch of course | 02:27 |
| asac | https://code.launchpad.net/~mozillateam/firefox/granparadiso | 02:27 |
| Ubulette | btw, that patch, or something similar should go upstream | 02:31 |
| Ubulette | I guess mozilla/nsprpub/config/nsinstall.c has to be patched too. It's a different version than mozilla/config/nsinstall.c but has the same flaw. | 03:17 |
| Ubulette | I still need to review the *.install files as my debs are still broken. | 03:18 |
| Ubulette | Got tons of "Warning: package error or possible missing or unnecessary file" since the make install patch. Got to figure out what that means too. | 03:19 |
| Ubulette | tomorrow. Bed time now. | 03:19 |
| === Admiral_Chicago [n=FreddyM@adsl-68-72-81-177.dsl.chcgil.ameritech.net] has joined #ubuntu-mozillateam | ||
| gnomefreak | im off to bed finally, i will try to get on tomorrow but i have alot of work if my aunts pc is still failing to grab her email but we will see, iceape is done afaik let me know if you need anything else feel free to email me if im not here ill try to check email tomorrow. | 05:29 |
| hjmf | @schedule | 08:20 |
| ubotu | Schedule for Etc/UTC: 08 Aug 12:00: Edubuntu | 09 Aug 15:00: Ubuntu Development Team | 10 Aug 04:00: MOTU Team | 11 Aug 17:00: Xubuntu Developers | 14 Aug 15:00: Ubuntu Server Team meeting | 14 Aug 19:00: Technical Board | 08:20 |
| === hjmf is off | ||
| asac | Ubulette: can we make the patch more memory-sensitive by just removing the while that zeros double / ? | 12:19 |
| asac | Ubulette: e.g. without strdup? | 12:19 |
| asac | Ubulette: would be cool if you could commit your update to granparadiso-fsh as well as the nsinstall.c patch to bzr | 01:41 |
| Jazzva | asac: Is it ok to take a logo of a service for it's extension icon? (for example StumbleUpon's logo) | 02:25 |
| Jazzva | Also, do I need to have a Generic name field in .desktop for gnome-app-install? If I need, would "Firefox extension" be enough? | 02:26 |
| Ubulette | hi | 02:32 |
| Jazzva | morning :) (well, good afternoon) | 02:34 |
| Ubulette | asac, for the double / patch, Iet me see what I can think of. | 02:35 |
| asac | Jazzva: if the icon looks good and is not non-free then yes | 02:37 |
| Jazzva | asac: Ok, and if I cant find an icon should I leave it without it or use firefox logo? | 02:43 |
| asac | Ubulette: i have a fix for that already | 02:48 |
| asac | Ubulette: wait a sec | 02:48 |
| Ubulette | I have one too | 02:49 |
| asac | Ubulette: http://people.ubuntu.com/~asac/patches/fix_nsinstall_on_double_slash.patch | 02:49 |
| asac | Ubulette: please use bzr ... otherwise we will duplicate work | 02:50 |
| asac | Ubulette: ok i am pushing what i have so far to the mozillateam granparadiso branch | 02:54 |
| Ubulette | my guess is that the code you remove is useful for some platforms | 02:54 |
| Ubulette | not for linux/unix | 02:54 |
| asac | Ubulette: at best start with that one and commit your changes locally and then push it to bzr branch | 02:54 |
| asac | so i can merge it for release | 02:54 |
| asac | Ubulette: might be | 02:55 |
| === Ubulette is on the phone. brb | ||
| asac | Ubulette: however ... since the current code would break on any platform i doubt that the code was really tailored for needs of different platforms | 02:56 |
| asac | i think it was just ment to be smart ... minimizing memory + minimizing recursion | 02:56 |
| Ubulette | back | 03:11 |
| Ubulette | asac, http://pastebin.mozilla.org/182527 | 03:12 |
| Ubulette | that does the work and still removes trailing slashes to mkdir | 03:13 |
| asac | Ubulette: well | 03:17 |
| asac | i don't think this will fix the issue for us | 03:17 |
| asac | as it will still set / to zero further down the recursion | 03:17 |
| asac | if you want to remove trailing / you have to remember all positions and set them back to / after recursion | 03:17 |
| Ubulette | no. tested on my tree. I works as good as my strdup | 03:18 |
| asac | well it doesn't do anything as i see now | 03:18 |
| asac | it just fast-forwards to the last / | 03:18 |
| asac | ok | 03:18 |
| Ubulette | it does move backward | 03:18 |
| asac | yes of course | 03:18 |
| asac | ok | 03:19 |
| asac | Ubulette: ok please start with current mozillateam branch ... update the patch i currently have and then see how far we get | 03:19 |
| asac | afaict it should at least install all things | 03:19 |
| asac | sftp://asac@bazaar.launchpad.net/~mozillateam/firefox/granparadiso/ | 03:20 |
| asac | bzr branch https://code.launchpad.net/~mozillateam/firefox/granparadiso | 03:20 |
| asac | then go | 03:20 |
| asac | :) | 03:20 |
| asac | i would refrain from working on that branch then for today ;) | 03:20 |
| Ubulette | how do I start ? bzr co or bzr branch ? | 03:21 |
| asac | like above | 03:21 |
| asac | then you commit for each change like you do in cvs | 03:21 |
| asac | and when you are done you push it to your private branch in launchpad and let me know so i can merge it in release branch | 03:22 |
| asac | e.g. when done do | 03:22 |
| asac | bzr push sftp://ubulette@bazaar.launchpad.net/~ubulette/firefox/granparadiso/ | 03:22 |
| asac | Ubulette: there is an example on how to build midbrowser using bzr builddeb | 03:23 |
| asac | https://wiki.ubuntu.com/MozillaTeam/Build/Bzr?highlight=%28mozillateam%29%7C%28bzr%29 | 03:23 |
| asac | i think you can easily adapt that ;) | 03:23 |
| asac | otherwise you can build as usual ... just ensure that the tar.bz2 is in top level directory of branch when running dpkg-buildpackage -rfakeroot or whatever | 03:23 |
| asac | if you want to use bzr builddeb just make tarballs directory next to where you checked out the bzr branch and put the orig.tar.gz in there | 03:24 |
| asac | (like in wiki) | 03:24 |
| Ubulette | must my local bzr dir be fixed ? I mean, I work in very volatile chroots that gets erased very quickly | 03:25 |
| asac | would be a good idea to have it fixed | 03:25 |
| asac | you can pass --builder option to bzr builddeb | 03:26 |
| Ubulette | so I have to mount it into the chroot | 03:26 |
| asac | if you want to use pbuilder | 03:26 |
| Ubulette | no pbuilder | 03:26 |
| asac | i usually mount my home into chroot ... but i use stable chroots | 03:26 |
| asac | e.g. no pbuilder for me :) | 03:26 |
| asac | ok fine ... i like people that don't use pbuilder ;) | 03:27 |
| asac | at least for development | 03:27 |
| asac | do you need instructions on how to use quilt? | 03:27 |
| asac | e.g. to produce patches in debian/patches/ ? | 03:28 |
| Ubulette | yeah, maybe. I'm not very familiar with projects that starts with an packed source tarball | 03:29 |
| Ubulette | s/an/a | 03:29 |
| asac | well its like using quilt for not embeeded tarball | 03:30 |
| asac | just do a dpkg-buildpackage -rfakeroot ... and abort when patches are applied | 03:30 |
| asac | then you can go into build-area/mozilla | 03:30 |
| asac | and just use quilt | 03:30 |
| asac | e.g. quilt push -a (to apply all) | 03:30 |
| asac | quilt pop -a (to unapply all) | 03:30 |
| asac | quilt refresh --diffstat -U8 to update a patch (e.g. after modifying nsinstall.c) | 03:31 |
| asac | btw, i patches nspr nsinstall.c as well | 03:31 |
| asac | quilt needs some excersize ... but its damn good when working on huge code-bases like ffox | 03:34 |
| asac | compared to dpatch or even simple patch | 03:35 |
| asac | because you can just work in tree to produce/update patches | 03:35 |
| asac | no need top copy whole tree for each edit | 03:35 |
| Ubulette | asac, what's "bzr bd --merge ." for ? | 03:45 |
| asac | bzr bd == bzr builddeb | 03:47 |
| asac | --merge means that you want to merge your bzr tree with the orig.tar.gz | 03:47 |
| asac | e.g. we just have debian/ directory in bzr | 03:47 |
| Ubulette | ok | 03:48 |
| Ubulette | you said you committed the patch, right ? | 03:49 |
| Ubulette | I can't see it | 03:49 |
| asac | Ubulette: debian/patches/fix_nsinstall_on_double_slash.patch | 03:52 |
| Ubulette | not there | 03:52 |
| asac | well | 03:53 |
| asac | its not yet synched to http | 03:53 |
| asac | holy shit | 03:53 |
| Ubulette | there's a bzr:// ? | 03:53 |
| asac | let me check that with bzrlp guys | 03:53 |
| asac | no ssh | 03:53 |
| asac | but only if you have access | 03:53 |
| Ubulette | hmm | 03:54 |
| asac | ok pushing somewhere else | 03:57 |
| asac | takes a minute | 03:57 |
| asac | Ubulette: in 5 minutes you can branch from http://people.ubuntu.com/~asac/bzr/granparadiso/ | 03:58 |
| Ubulette | do I need to trash my branch or just branch yours on top of it ? | 04:00 |
| asac | no just pull mine on top | 04:00 |
| asac | actually you should now be able to just pull | 04:00 |
| asac | e.g. try bzr pull | 04:00 |
| asac | bzrlp guys synched it manually now | 04:00 |
| asac | Ubulette: ^^ | 04:01 |
| asac | ok i am grabbing some food ... the branch in launchpad should be up-to-date now ... it should be revision 35 | 04:01 |
| asac | (see bzr info ... or bzr log) | 04:01 |
| asac | if it still isn't then try to pull my branch on top of it | 04:01 |
| asac | in about 3-4 minutes i guess it should be ready | 04:02 |
| Ubulette | bzr pull worked. rev35, good | 04:04 |
| asac | yeah | 04:05 |
| asac | fine | 04:05 |
| asac | i am out for lunch then | 04:05 |
| Ubulette | well, let's build that once to see how it is compared to mine | 04:05 |
| asac | yes ... it should build iirc | 04:05 |
| Ubulette | should take me 45 min :( | 04:05 |
| asac | at least things get installed in debian/tmp | 04:05 |
| asac | Ubulette: use | 04:05 |
| asac | bzr bd --merge --dont-purge . | 04:05 |
| asac | if you want to use bzr bd | 04:05 |
| asac | then you can just work in build-area/firefox* | 04:06 |
| asac | as usual | 04:06 |
| asac | otherwise if build succeed the build tree gets wiped (e.g. without --dont-purge) | 04:06 |
| Ubulette | ok but I need to buiild it at least once right ? | 04:06 |
| asac | Ubulette: yes | 04:06 |
| Ubulette | ok, good. | 04:06 |
| asac | well you can abort right after patching if you want to modify patch right in front | 04:06 |
| asac | but i htink you want a full build anyways | 04:06 |
| Ubulette | yep. Glad I'm not already lost | 04:07 |
| Ubulette | :) | 04:07 |
| === asac hugs Ubulette :) | ||
| asac | ok lunch | 04:07 |
| Ubulette | bzr: ERROR: unknown command "bd" | 04:08 |
| Ubulette | lol | 04:08 |
| Jazzva | Ubulette: Have you installed bzr-builddeb :)? | 04:08 |
| Ubulette | no but I will | 04:09 |
| Jazzva | Ok... It will provide the bd :)... | 04:09 |
| Ubulette | done | 04:10 |
| Ubulette | thx | 04:10 |
| Jazzva | No prob... | 04:10 |
| Ubulette | bzr: ERROR: Unprintable exception DebianError: dict={'_preformatted_string': None}, fmt='A Debian packaging error occurred: %(message)s', error=KeyError('message',) | 04:17 |
| Ubulette | should I pass my key ? | 04:17 |
| Jazzva | Hmm... not sure. I didn't get that error. | 04:17 |
| Jazzva | Though I have my key set in bashrc... | 04:17 |
| Ubulette | where should I bzr bd from ? | 04:19 |
| Jazzva | From the source dir... | 04:19 |
| Jazzva | Just like the usual dpkg-buildpackage... | 04:19 |
| Ubulette | at that point, I only have the debian dir. | 04:19 |
| Jazzva | Uh-huh... have you tried to put the whole source dir along with debian/ and then bzr bd? | 04:20 |
| Ubulette | already have orig.tar.gz | 04:20 |
| Ubulette | I see. it's expecting a different structure. | 04:21 |
| Jazzva | As far as I know, you should have orig.tar.gz in tarballs/ and full source in <program-name>/. The bzr bd should be run from <program-name> | 04:21 |
| Jazzva | <program-name> | 04:21 |
| Jazzva | <program-name>/ | 04:21 |
| Jazzva | :) | 04:21 |
| Jazzva | tarballs/ and <program-name>/ need to be in the same dir | 04:22 |
| === gutsytester [n=gu@rgnb-4db09f75.pool.einsundeins.de] has joined #ubuntu-mozillateam | ||
| Jazzva | and the build will go on in build-area/ | 04:22 |
| Ubulette | wanted to be imaginative but it doesn't like it :0 | 04:24 |
| Ubulette | yep fixed. | 04:24 |
| Ubulette | it's building | 04:24 |
| Jazzva | Cool :)... | 04:25 |
| asac | ok i am back :) | 04:39 |
| asac | Ubulette: when you see not-parsable errors in bzr bd its usually a missing tarball | 04:39 |
| Ubulette | just wanted to organize my stuff differently. didn't like it. fixed | 04:41 |
| Ubulette | hmm, fix_make_install.patch is not the fix from buzilla right ? | 04:42 |
| Ubulette | bugzilla | 04:42 |
| Ubulette | mine is much bigger | 04:42 |
| Ubulette | and you still have fix_toolkit_xre_install.patch which is no longer necessary | 04:42 |
| Ubulette | why don't you "number" your patches like other projects ? | 04:45 |
| asac | Ubulette: its the fix from mozilla .. but adapted | 04:46 |
| asac | because there are patches that intersect with that one | 04:46 |
| asac | Ubulette: series file gives you order | 04:46 |
| asac | Ubulette: fix_tookit_xre_install.patch is different now | 04:47 |
| Ubulette | i know but I just find it easier to see numbers so I can easily track the changes. well, doesn't really matter | 04:47 |
| asac | Ubulette: its just needed so build doesn't fail | 04:47 |
| asac | Ubulette: to see the order just type: | 04:47 |
| asac | quilt series | 04:47 |
| Jazzva | asac: .desktops and icons are pretty much done. Just need to find glatzor and ask him about those Mime-Type's. | 04:47 |
| Jazzva | (and then to test-build) | 04:48 |
| asac | Jazzva: yes thanks | 04:48 |
| asac | Jazzva: let me try to figure out | 04:48 |
| asac | should be in latest gnome-app-install code | 04:48 |
| Jazzva | asac: No prob... Sorry it took two days to finish them... | 04:48 |
| asac | thats not a problem at all :) | 04:49 |
| asac | Jazzva: can you push your current work somewhere? | 04:49 |
| asac | e.g. to a private branch? | 04:49 |
| Jazzva | asac: Umm... Just to give it a final touch :). | 04:50 |
| asac | Jazzva: you can push now ... then push again when done :) | 04:50 |
| Jazzva | Should I commit one-by-one extension or can I do "bzr add * / bzr commit"? | 04:50 |
| Jazzva | give me a moment to also copy desktop files and update gnome-app-install... | 04:51 |
| asac | Jazzva: at best one by one | 04:52 |
| asac | e.g. in bundles | 04:52 |
| asac | extension desktop file + icon == one commit | 04:52 |
| Jazzva | Ok... That's what I thought :) | 04:52 |
| asac | then as last commit update changelog | 04:52 |
| asac | though you might leave changelog composing to release branch maintainer | 04:52 |
| asac | if you don't want to bother | 04:53 |
| Jazzva | Few questions... Do I need to leave "StartupWMClass=Firefox-bin"? | 04:53 |
| asac | no that entry can be dropped | 04:53 |
| asac | you have an example .desktop ? | 04:53 |
| asac | pastebin maybe? | 04:53 |
| Jazzva | Just a sec | 04:54 |
| Jazzva | http://paste.ubuntu-nl.org/33040/ | 04:55 |
| Jazzva | I wasn't sure about some fields... That's another thing that I was planning to see with glatzor | 04:56 |
| Jazzva | I don't think it needs the Terminal, X-MultipleArgs fields... | 04:56 |
| Jazzva | brb | 04:59 |
| asac | Jazzva: ok ... just try to get glatzor on line :) | 05:01 |
| asac | i think he is usually available in the evening (Central Europe) | 05:01 |
| Jazzva | asac: back | 05:03 |
| asac | yay | 05:03 |
| Jazzva | Well, I'll be going off in an hour or so and will be back by 9 (gmt+1) | 05:03 |
| Jazzva | Hope I'll catch him then :) | 05:03 |
| Jazzva | Saw the pastebin? | 05:03 |
| Jazzva | Mime-Type line isn't pasted correctly :)... I pasted it from nano... | 05:06 |
| Jazzva | A little more about file :). Name has the "<extension-name> extension for Firefox" format | 05:07 |
| Jazzva | Comment is usually pasted (and edited) from short Descritpion (apt-cache show) | 05:08 |
| Jazzva | GenericName is always "Firefox extension" | 05:08 |
| Ubulette | asac, build failed | 05:08 |
| Jazzva | (except for Ubuntu theme "GenericName=Firefox theme") | 05:08 |
| asac | Ubulette: probably in debhelper install right? | 05:09 |
| Jazzva | Icon is <extension-name>.xpm | 05:09 |
| asac | Ubulette: or how did it fail? | 05:09 |
| Ubulette | dh_install: firefox-granparadiso-dom-inspector missing files (debian/tmp/usr/lib/firefox-*/extensions/inspector@mozilla.org), aborting | 05:09 |
| Ubulette | make: *** [binary-install/firefox-granparadiso-dom-inspector] Error 1 | 05:09 |
| Ubulette | bzr: ERROR: The build failed. | 05:09 |
| asac | Ubulette: yes | 05:09 |
| Jazzva | And that's it | 05:09 |
| asac | Ubulette: the directory layout might have changed | 05:09 |
| asac | how does the structure look like below debian/tmp/ ? | 05:09 |
| asac | e.g. where is inspector@mozilla.org | 05:09 |
| asac | Ubulette: in worst caes inspector isn't installed at all anymore ... but take a look | 05:10 |
| Ubulette | debian/tmp/extensions/inspector@mozilla.org | 05:11 |
| asac | Jazzva: i think you just need Icon + Name + Comment + GenericName + Mime-Type ... but no guarantees | 05:11 |
| asac | Ubulette: wow | 05:11 |
| asac | well ... try to modify the firefox-granparadiso-dom-inspector.* files accordingly then | 05:11 |
| Ubulette | seems broken to me | 05:11 |
| asac | Ubulette: is inspector somewhere below build-tree/mozilla/dist/bin ? | 05:12 |
| Jazzva | asac: Ok... I'll remove the StartupWMClass field and push to my branch. Is that ok? | 05:12 |
| asac | Jazzva: remove as much as possible :) | 05:12 |
| asac | and yes ... push to your branch early :) | 05:12 |
| asac | you can later correct things anyway | 05:12 |
| Ubulette | there are tons of files directly under debian/tmp (ie not even in usr/bin usr/lib etc ..) | 05:13 |
| Jazzva | asac: Well, ok :)... *sends_empty | 05:13 |
| asac | Ubulette: can you paste a ls of debian/tmp ` | 05:13 |
| asac | ? | 05:13 |
| Jazzva | *sends_empty_desktop_files* ...there :D... | 05:13 |
| Jazzva | Just kidding :). | 05:13 |
| asac | hehe | 05:13 |
| asac | Ubulette: you said that my fix_install patch is much smaller then what you had? | 05:14 |
| asac | maybe thatst the culprit ... i mean i merged things in, but maybe i forgot to refresh some files to the patch | 05:14 |
| Ubulette | http://www.sofaraway.org/tmp/list.txt | 05:16 |
| asac | Ubulette: ok we have to redo the patch | 05:16 |
| Ubulette | that's a find ..../debian/tmp | 05:16 |
| asac | i apparently have forgotten lots of files | 05:16 |
| asac | i can do that if you want | 05:17 |
| Ubulette | I can try mine | 05:17 |
| asac | yeah ... might not apply though | 05:17 |
| Ubulette | well, it will hurt granparadiso-fsh | 05:17 |
| asac | as it intersects with other patches | 05:18 |
| Ubulette | only this one | 05:18 |
| asac | welll ... then adapt your patch | 05:18 |
| Ubulette | in my tree, i apply 50_from_bugzilla_fix_make_install.patch 1st, then an updated version of granparadiso-fsh, then no-have-stdint-h-ftbfs.patch and ftbfs-with-branding-dir | 05:19 |
| Ubulette | but I also have a dh_install error | 05:20 |
| asac | Ubulette: ok i have an updated patch | 05:21 |
| asac | Ubulette: http://people.ubuntu.com/~asac/patches/fix_make_install.patch | 05:23 |
| asac | Ubulette: i think if you unapply the current ... then apply this and run dpkg-buildpackage -rfakeroot -nc | 05:24 |
| asac | you should be able to try incremental | 05:24 |
| asac | i pushed it mozilleteam branch as well ... though i have no idea if it got synched | 05:25 |
| asac | oh yes ... it synched | 05:25 |
| asac | so just bzr pull | 05:25 |
| asac | should bring you | 05:25 |
| Jazzva | asac: One more thing: should I run update-menu script before every commit, or can I run it just at the end? (the first one seems more logical to me) | 05:28 |
| Ubulette | can I mix bzr db and dpkg-buildpackage ? seems they don't use the same dir (../build-area vs build-tree) | 05:29 |
| asac | Jazzva: i have no idea about the package ... if you need to update some file on each change ... please commit the modified file in a separate commit | 05:29 |
| asac | Ubulette: don't get confused :) | 05:30 |
| asac | Ubulette: bzr bd will create a merged build tree in build-area | 05:30 |
| asac | dpkg-buildpackage will create a build-tree inside the build-tree during build | 05:30 |
| Ubulette | oh | 05:30 |
| Jazzva | asac: Hmm, I think I mixed something :D... I forgot that is a script that does bzr add for me (and some other updates) | 05:30 |
| asac | if you work in build-area/ .... be sure that you pushed back your changes to your bzr tree before you run bzr bd next time | 05:31 |
| asac | as bzr bd will wipe the previous tree in build-area | 05:31 |
| asac | ... unless you provide some optino (see bzr help bd) | 05:31 |
| asac | Jazzva: i have no idea what your problem is :) ... as long as you haven't published (pushed) you can do bzr uncommit | 05:32 |
| asac | to undo commits | 05:32 |
| asac | the modifications will be kept as modified files if you uncommit | 05:32 |
| Jazzva | asac: Thanks, I think I sorted it out :) | 05:32 |
| asac | ok | 05:32 |
| Jazzva | asac: There is a script that will see if there is a new menu-data available, fetch it, then apply it and after that apply all changes that were published online... Which I don't need currently, so I won't run that script :) | 05:33 |
| asac | Jazzva: gnome-voice-control_0.2-0ubuntu1_source.changes is NEW | 05:33 |
| asac | now waiting ftp-master approval | 05:33 |
| asac | Jazzva: yeah | 05:33 |
| Ubulette | asac, so now, I should just work in build-area/firefox-granparadiso-3.0~alpha7/{build-tree/mozilla,debian}, right ? | 05:33 |
| asac | unless you need to update something in bzr yes | 05:34 |
| Jazzva | asac: Weee :D | 05:34 |
| asac | Ubulette: if you are done there you copy all changes to your bzr tree and commit | 05:34 |
| Jazzva | asac: Hmm, that package is in revu too, but I can't access it in the last day or two :/... Can you nuke it (if you can access it)? | 05:34 |
| asac | Jazzva: i cannot nuke things in revu | 05:35 |
| asac | i think its ajmitch | 05:35 |
| Jazzva | asac: Ok, I'll say to him later... Thanks :) | 05:35 |
| asac | Jazzva: doesn't matter much noch that its in official | 05:35 |
| Jazzva | noch? | 05:35 |
| Jazzva | now? :) | 05:35 |
| asac | yes typo | 05:36 |
| asac | much noch | 05:36 |
| asac | :) | 05:36 |
| Jazzva | Well, I suppose it doesn't, but I thought just not to make mess on REVU :)... | 05:36 |
| asac | Jazzva: you have url? | 05:36 |
| asac | then i can comment that its uploaded | 05:36 |
| Jazzva | Just a sec to find it | 05:36 |
| Jazzva | asac: http://revu.tauware.de/details.py?upid=6336 | 05:37 |
| Jazzva | asac: But I still can't access revu :/ (though www.tauware.de is accessible) | 05:38 |
| asac | well ... appears to be down then :) | 05:38 |
| Ubulette | damn quilt. keeps saying no patches applied but they all are | 05:38 |
| asac | quilt applied ? | 05:39 |
| asac | is empty? | 05:39 |
| asac | you have to be in build-tree/mozilla | 05:39 |
| asac | when running quilt | 05:39 |
| Ubulette | ahhh | 05:41 |
| Ubulette | :) | 05:41 |
| asac | just play around a bit | 05:41 |
| asac | remember that you have to tell quilt that it should track some file changes with quilt add path/to/file/you/want/to/edit | 05:41 |
| asac | before you modify | 05:41 |
| Ubulette | how to I do that ? | 05:41 |
| asac | unless the file is already in the patch that is currently on top | 05:41 |
| asac | Ubulette: read above :) | 05:41 |
| asac | quilt add path/to/file/you/want/to/edit | 05:42 |
| Ubulette | ok | 05:42 |
| asac | that will make the file be tracked in the patch that is currently on top | 05:42 |
| asac | e.g. quilt top | 05:42 |
| asac | will show you which one is currently on top | 05:42 |
| asac | if you want a new patch: | 05:42 |
| asac | quilt new name-of-new-patch | 05:42 |
| asac | quilt add path/to/file/you/want/in/patch | 05:42 |
| asac | then edit file | 05:42 |
| asac | then | 05:42 |
| asac | quilt refresh --diffstat- U8 | 05:42 |
| asac | quilt refresh --diffstat -U8 | 05:42 |
| asac | to get the diff into the new patch | 05:42 |
| asac | you can look at the result before refreshing with | 05:43 |
| asac | quilt diff | 05:43 |
| Ubulette | ok. I need to get used to that before I do something useful | 05:43 |
| asac | well ... just doing should do the trick in a few minutes i guess :) | 05:43 |
| Ubulette | yep | 05:44 |
| Ubulette | to patch several files, i just have to new, add all those files separately, then edit and refresh, right ? | 05:45 |
| asac | yes | 05:50 |
| asac | Ubulette: but if its about a thing another patch tries to tackle then just update that patch | 05:50 |
| asac | e.g. pop/push until the patch you want to modify is on top | 05:51 |
| asac | then add all files you want in that patch (in addition to what is already tracked there) ... and then refresh | 05:51 |
| asac | if done test with quilt pop -a; quilt push -a if everything still applies cleanly | 05:51 |
| asac | then done | 05:52 |
| Ubulette | ok, got it. thx | 05:53 |
| asac | if you want to earn bonus points, then document the patch at the top of the patchfile (e.g. before the diffstat) :) | 05:54 |
| asac | actually I should do that with all patches ... but often i am too lazy :/ | 05:55 |
| asac | which is no excuse of course | 05:55 |
| asac | granparadiso patches are not that important to document ... but firefox main package needs higher standards because we regularaly have to submit patches to upstreawm to be allowed to use their trademark | 05:57 |
| asac | most firefox patches should be documented though ... but someone should go through ... refresh themm ... and document those that lack documentation ;) | 05:58 |
| Ubulette | and to add an existing patch file ? | 05:58 |
| asac | quilt new HOWEVERYOUWANTTONAMEIT | 05:59 |
| Jazzva | asac: mozilla-ctxextensions have desc "Context Menu extensions for Iceweasel". Should I switch it to Firefox? | 05:59 |
| asac | then quilt fold -p <striplevel> < /tmp/existing.patch | 05:59 |
| asac | Ubulette: ^^ | 05:59 |
| asac | quilt fold is the keyword | 05:59 |
| asac | it will add files automatically | 05:59 |
| Ubulette | ok | 05:59 |
| asac | but only if the patch applies cleanly | 05:59 |
| asac | otherwise it will rollback | 05:59 |
| asac | but you need to call refresh after fold still iirc | 06:00 |
| Jazzva | have/has | 06:00 |
| asac | Jazzva: use Firefox/Iceweasel everywhere please | 06:00 |
| asac | Jazzva: we will push app-install-data to debian asap | 06:00 |
| Jazzva | Umm... everywhere? So, uncommit everything :)? | 06:00 |
| asac | Jazzva: no you can do that in a second update | 06:00 |
| Jazzva | I'll start from the original branch and change it :) | 06:01 |
| asac | its not that important ... but if you are at it maybe use the combo | 06:01 |
| asac | Jazzva: you can also just commit a new revision | 06:01 |
| Jazzva | Easier that way... and less revisions :). | 06:01 |
| asac | e.g. change files then commit them on top | 06:01 |
| asac | Jazzva: i like that attitude | 06:01 |
| asac | Jazzva: i try to be anal about getting distinct/complete patches before release as well | 06:01 |
| Jazzva | asac: So do I :)... | 06:01 |
| asac | at least get them as distinct/complete as possible for each release | 06:01 |
| asac | Jazzva: cool ... like that :) | 06:02 |
| Jazzva | asac: Thanks :) | 06:02 |
| Ubulette | asac, just tried with your new version of fix_make_install.patch, it applies but refresh fails | 06:03 |
| asac | Ubulette: he? | 06:03 |
| Ubulette | Warning: trailing whitespace in line 394 of toolkit/mozapps/installer/packager.mk | 06:03 |
| asac | thats not a problem | 06:03 |
| asac | its just a warning | 06:03 |
| Ubulette | oh | 06:03 |
| asac | Ubulette: if you want to fix that you can pass --strip-trailing-whitespace as well | 06:03 |
| asac | e.g. quilt refresh --diffstat -U8 --strip-trailing-whitespace | 06:03 |
| asac | but i usually don't do that as it doesn't hurt | 06:03 |
| Ubulette | cool | 06:04 |
| asac | its just a hint that the file is not really clean ... because trailing whitespaces are evil (TM) :) | 06:04 |
| asac | it shows that people don't care for code layout ;) | 06:04 |
| Ubulette | need to keep track of all that. I have the memory of a golden fish | 06:04 |
| asac | Ubulette: yeah | 06:05 |
| asac | Ubulette: but i think we have already done all cases | 06:05 |
| asac | Ubulette: and since you use it already it should be engraved into your brainform pretty quickly | 06:05 |
| Jazzva | asac: One more thing... To rename GenericName from "Firefox ext/theme/whatever" to "Firefox/Iceweasel ..."? | 06:05 |
| asac | Ubulette: you can always use quilt COMMAND --help | 06:05 |
| asac | to get brief help on the command you are interested in | 06:05 |
| asac | Jazzva: hmm | 06:06 |
| asac | Jazzva: example? | 06:06 |
| asac | Jazzva: but in general yes | 06:06 |
| Jazzva | Name=Greasemonkey .... for Firefox/Iceweasel | 06:06 |
| Jazzva | ... | 06:06 |
| Jazzva | GenericName=Firefox/Iceweasel extension | 06:06 |
| Jazzva | asac ^ | 06:06 |
| asac | well ... sounds too generic i would say | 06:06 |
| Jazzva | Lol... What do you suggest? :) | 06:07 |
| asac | but if XXXX extension is the way to go for generic name then its fine to do it the way you propose | 06:07 |
| asac | Jazzva: no idea | 06:07 |
| asac | i have no idea about the policy of GenericName | 06:07 |
| Jazzva | Well, I've just applied the pattern I saw before... | 06:08 |
| Jazzva | Example: | 06:08 |
| asac | e.g. what info should be expressed | 06:08 |
| Jazzva | Name=Firefox web browser | 06:08 |
| Jazzva | GenericName=Web broser | 06:08 |
| asac | yes ... note how "web browser" describes the purpose | 06:08 |
| asac | Firefox extension is equivalent to Firefox application | 06:08 |
| asac | imo | 06:08 |
| Jazzva | Hmm... | 06:08 |
| asac | yes ... but extension ~ application | 06:08 |
| Jazzva | Well, I don' have an idea right now... To send this update now and then overwrite it when some idea pops? | 06:09 |
| asac | GenericName=Firefox/Iceweasel user-scripts | 06:09 |
| asac | GenericName=Firefox/Iceweasel user-script extension | 06:09 |
| asac | maybe that | 06:09 |
| Jazzva | Hmm... cool :D | 06:09 |
| asac | no idea | 06:09 |
| Jazzva | Sound nice... Will use it :) | 06:09 |
| asac | Jazzva: don't get stuck on this .... just go ahead like youz think ... if there are complains we can fix them later | 06:10 |
| Jazzva | Ok | 06:10 |
| asac | its just important that we get this data up asap | 06:10 |
| asac | :) | 06:10 |
| asac | which doesn't mean now ... but within a few days at least | 06:10 |
| Jazzva | Will be done :) | 06:10 |
| Jazzva | BTW, Firefox and Thunderbird don't have an icon in menu-data/icons/ dir. Should I add them later? | 06:11 |
| asac | well lno idea if they are special cases | 06:11 |
| asac | but in gnome-app-install you see an icon? | 06:11 |
| Jazzva | That's why I ask... | 06:11 |
| asac | if not we sould add it | 06:11 |
| Jazzva | dunno... didn't try it. Will try that tonight | 06:11 |
| asac | please look if firefox has an icon in gnome-app-install | 06:11 |
| asac | otherwise we should add it | 06:12 |
| Jazzva | Ok :)... | 06:12 |
| asac | but probably in a different branch ... so glatzor can just review your branch for "extensions" | 06:12 |
| asac | only | 06:12 |
| Jazzva | Ok | 06:12 |
| Jazzva | different brach - ubuntu.icons? | 06:12 |
| Ubulette | talking about icons, grandpardiso icon is the blue planet alone, without the fox, is that expected ? | 06:12 |
| asac | Ubulette: yes ... thats agreed with mofo | 06:13 |
| asac | Ubulette: we use "official" granpardiso branding | 06:13 |
| asac | which is that blue icon | 06:13 |
| asac | on trunk we should go back to minefield branding (the bomb) once we have a build for trunk again | 06:14 |
| asac | Ubulette: mozilla just ships stable branches with fox branding ... they distribute granparadiso with blue one as well | 06:15 |
| Ubulette | hmm. ok | 06:15 |
| Ubulette | asac, rebuild fails with your new patch | 06:17 |
| Ubulette | very begining | 06:17 |
| Ubulette | Makefile:85: *** target file `install' has both : and :: entries. Stop. | 06:17 |
| Ubulette | make[1] : Leaving directory `/src/bzr/build-area/firefox-granparadiso-3.0~alpha7/build-tree/mozilla' | 06:17 |
| asac | Ubulette: do we add an install:: target in some of our patches for top-level Makefile.in? | 06:18 |
| asac | hmmm | 06:19 |
| asac | Ubulette: in fix_make_install patch i remove install:: in Makefile.in | 06:19 |
| Ubulette | in mozilla/toolkit/mozapps/installer/packager.mk | 06:20 |
| asac | do you see an install:: in top level Makefile.in left? | 06:20 |
| Ubulette | it's an include | 06:20 |
| asac | so top-level includes packager.mk? | 06:21 |
| Ubulette | yep | 06:21 |
| Ubulette | hmm | 06:21 |
| Ubulette | no | 06:21 |
| asac | i don't see that include in top-level | 06:21 |
| asac | let me start the build ... and see if it fails that quick here too | 06:22 |
| Ubulette | ix:~/bzr/build-area/firefox-granparadiso-3.0~alpha7/build-tree/mozilla$ make | 06:22 |
| Ubulette | Makefile:85: *** target file `install' has both : and :: entries. Stop. | 06:22 |
| asac | Ubulette: for me its building | 06:22 |
| asac | at least its currently building | 06:23 |
| asac | currently in js/ tree | 06:23 |
| asac | Ubulette: what did you change? | 06:23 |
| Ubulette | nothing. | 06:23 |
| Ubulette | just replaced your patch, pop -a, push -a | 06:23 |
| Ubulette | fine | 06:23 |
| asac | hmm | 06:23 |
| asac | for me rev 36 from mozillateam branch builds happily | 06:24 |
| asac | can you see if you have a diff? against taht? | 06:24 |
| Ubulette | I clearly have an install:: at line 85 of build-tree/mozilla/Makefile | 06:24 |
| asac | well Makefile is not important ... do you see that in Makefile.in ? | 06:25 |
| asac | in the end its important ... but it doesn't help to track | 06:25 |
| asac | Ubulette: you must be missing something | 06:25 |
| asac | please try rev36 from bzur | 06:25 |
| asac | i have no install: in Makefile | 06:25 |
| asac | Ubulette: you might need to recreate them | 06:26 |
| asac | have you rerun config.status ? | 06:26 |
| Ubulette | no | 06:26 |
| asac | try to run ./config.status in top-level and see if install:: goes away | 06:26 |
| asac | usually it should happen automatically if Makefile.in is touched ... but who knows | 06:26 |
| asac | if you don't see install:: in Makefile.in then its worth a try | 06:26 |
| Ubulette | worked | 06:27 |
| asac | good | 06:27 |
| asac | i think that should be enough to build incremental again then | 06:28 |
| Ubulette | now build fails here: | 06:28 |
| Ubulette | dh_install: firefox-granparadiso missing files (debian/tmp/usr/lib/firefox-*/firefox-granparadiso-bin), aborting | 06:28 |
| Ubulette | make: *** [binary-install/firefox-granparadiso] Error 1 | 06:28 |
| Ubulette | that's where I was yesterday in my tree | 06:28 |
| Ubulette | :) | 06:28 |
| asac | Ubulette: do you still see the garbage directly beneah debian/tmp ? | 06:29 |
| Ubulette | no. everything is under debian/tmp/usr | 06:29 |
| asac | ok | 06:30 |
| asac | is there a -bin file in debian/tmp/usr/lib/firefox-*/ | 06:30 |
| asac | how is it called? | 06:30 |
| === asac guesses that we have to fix packager.mk in grandparadiso-fsh like fashion | ||
| Ubulette | -rwxr-xr-x 1 bbot bbot 3959 Aug 8 15:07 firefox-granparadiso* | 06:30 |
| Ubulette | -rwxr-xr-x 1 bbot bbot 57600 Aug 8 15:07 firefox-granparadiso-bin* | 06:30 |
| asac | so "debian/tmp/usr/lib/firefox-*/firefox-granparadiso-bin" exists? | 06:31 |
| Ubulette | no, it's in dist, no debian/tmp | 06:31 |
| asac | please look like above | 06:31 |
| asac | 18:30 < asac> is there a -bin file in debian/tmp/usr/lib/firefox-*/ | 06:32 |
| asac | 18:30 < asac> how is it called? | 06:32 |
| Jazzva | asac: To update changelog with dch -i? I've added all extensions I had... Still have three Thunderbird's to finish (I forgot that (oops)). | 06:32 |
| Ubulette | no bin | 06:32 |
| asac | Ubulette: what is in that dir? | 06:32 |
| asac | Ubulette: ok ... i am pretty sure we have to fix packager.mk | 06:32 |
| asac | Ubulette: please look in granparadiso-fsh patch | 06:33 |
| asac | quilt pop until its on top | 06:33 |
| asac | then add packager.mk | 06:33 |
| asac | and edit it accordingly | 06:33 |
| asac | search for usages of $(MOZ_APP_NAME) and make | 06:33 |
| asac | $(MOZ_APP_NAME)-granparadiso out of it | 06:33 |
| Jazzva | asac: I'll add those for Thunderbird tonight... I'll have to go after push. Oh, and should I push to sftp://jazzva@bazaar.launchpad.net/~jazzva/app-install-data/ubuntu-firefox-ext? | 06:34 |
| Ubulette | asac, http://pastebin.mozilla.org/182562 | 06:34 |
| asac | e.g. just replace like s/\$(MOZ_APP_NAME)/$(MOZ_APP_NAME)-granparadiso/g | 06:34 |
| asac | Ubulette: yes looks like i expected | 06:34 |
| asac | fix packager.mk and all will be good | 06:34 |
| asac | but otherwise it looks fine | 06:34 |
| asac | (ignoring -dev package for now) | 06:34 |
| asac | Jazzva: how is the original branch named? | 06:35 |
| asac | use the same branch name and add suffix: ".mozilla-extensions" | 06:35 |
| Ubulette | asac, should I pop "at" or above ? | 06:35 |
| asac | Ubulette: pop at | 06:35 |
| asac | and refresh that patch | 06:35 |
| asac | it belongs in that patch | 06:35 |
| asac | e.g. the packager.mk diff | 06:36 |
| asac | Ubulette: just look with quilt top | 06:36 |
| asac | if its currently on top before you add/edit/refresh | 06:36 |
| Jazzva | asac: ubuntu... Ok. Will do that. What about changelog :)? "dch -i"? | 06:36 |
| asac | Ubulette: oh ... i notice that this will make things difficult | 06:36 |
| asac | as make_install_ patch probably touches that file heavily as well | 06:36 |
| Ubulette | but if I add there, is it an incremental patch or the same patch ? | 06:36 |
| asac | either update that patch as well | 06:37 |
| asac | or just create a new one on top | 06:37 |
| asac | (sorry for confusion) | 06:37 |
| asac | Ubulette: its the same patch | 06:37 |
| asac | Ubulette: i want to have patches on per-feature | 06:37 |
| asac | if you want a new patch directly on top of patch X ... just pop to patch X ... then quilt new et al | 06:37 |
| asac | but thats not what we need here | 06:37 |
| Ubulette | here, you want an updated granparadiso-fsh or an additionnal patch just after granparadiso-fsh ? | 06:38 |
| asac | Ubulette: either update granparadiso-fsh (and in turn fix make install patch as well) ... or just add a completely new patch on top of everything | 06:39 |
| asac | the former is preferred | 06:39 |
| Ubulette | ok, got it | 06:40 |
| asac | Ubulette: if you want you can also try to get granparadiso-fsh patch on top of make install | 06:40 |
| asac | that would prepare the patch for easy replacement by upstream | 06:40 |
| asac | e.g. if upstream applies the patch we just need to drop the make install patch and granparadiso-fsh will just apply | 06:40 |
| Ubulette | maybe later :) | 06:40 |
| asac | yeah | 06:40 |
| asac | have fun ... and thanks a lot ... i guess after this you will be almost a master of quilt :) | 06:41 |
| Ubulette | lol | 06:41 |
| Ubulette | grep -c MOZ_APP_NAME toolkit/mozapps/installer/packager.mk | 06:41 |
| Ubulette | 0 | 06:41 |
| asac | Ubulette: you have to quilt push -a | 06:42 |
| asac | so in the end you can either flip patches and then update granparadiso | 06:42 |
| asac | or add a new patch | 06:42 |
| asac | :) | 06:42 |
| asac | i guess we want a new patch | 06:42 |
| asac | i can do the flippage when integrating the changes | 06:42 |
| Ubulette | ok, 2 matches after push -a. I understand now | 06:43 |
| asac | Ubulette: i understand better now | 06:45 |
| asac | Ubulette: maybe just fix the make-install patch itself | 06:45 |
| asac | i did that for a few occurrences but apparently missed some | 06:45 |
| asac | e.g. just search for MOZ_APP_NAME in there and append -granparadiso | 06:45 |
| Ubulette | but that will mix fixes and features | 06:46 |
| Ubulette | better reorder 1st | 06:46 |
| asac | right | 06:47 |
| asac | buzt then make it right | 06:47 |
| asac | and drop -granparadiso from that patch completely | 06:47 |
| asac | but since its on top of granparadiso-fsh patch you won't get rid of it | 06:47 |
| asac | so in the end you have to flip | 06:47 |
| asac | e.g. use pristine upstream make install patch | 06:48 |
| asac | Ubulette: maybe we should try to use MOZ_APP_NAME=firefox-granparadiso | 06:48 |
| asac | to get rid of all this craziness | 06:48 |
| asac | want to try? | 06:48 |
| Ubulette | yes | 06:48 |
| asac | e.g. drop granparadiso-fsh patch | 06:48 |
| asac | use pristine upstream make install patch | 06:49 |
| asac | then fix configure.in | 06:49 |
| asac | and use firefox-granparadiso there | 06:49 |
| asac | ... and see how far you get :) | 06:49 |
| asac | hmm MOZ_APP_NAME is not defined in configure.in anymore | 06:50 |
| asac | probably came with new toolkit improvements | 06:50 |
| Ubulette | seems better to apply upstream fix-makeinstall 1st, then no-have-stdint-h-ftbfs.patch and ftbfs-with-branding-dir | 06:50 |
| Ubulette | ie drop granparadiso-fsh and fix_toolkit_xre_install.patch | 06:51 |
| Jazzva | Is this right: bzr push sftp://jazzva@bazzar.launchpad.net/~jazzva/app-install-data/ubuntu.mozilla-extensions ? Since there is still no output *sighs*... Is it because of 500 and something revisions? :) | 06:52 |
| asac | Ubulette: fix_toolkit patch is still needed | 06:52 |
| asac | or wait | 06:52 |
| asac | maybe not | 06:52 |
| asac | however its not bad to have as its a syntax error in some makefile | 06:52 |
| asac | Jazzva: you should have used bzr+ssh: instead of sftp: | 06:53 |
| asac | should be a hell lot faster | 06:53 |
| asac | Jazzva: if you abort you need to pass --overwrite --use-existing-dir | 06:53 |
| Ubulette | fix_toolkit is supposed to be fixed by upstream patchn no ? | 06:53 |
| asac | is guess | 06:53 |
| asac | (or something like that) | 06:53 |
| asac | Ubulette: well through upstream patch it becomes unused code | 06:53 |
| asac | however the code has a syntax error | 06:53 |
| asac | so i updated fix_toolkit to drop the unused code | 06:53 |
| Jazzva | asac: Thanks... | 06:54 |
| asac | should be submitted upstream | 06:54 |
| asac | Ubulette: i will update the upstream bug where the initial patch lived | 06:54 |
| Jazzva | *sighs* connect to host bazzar.launchpad.net port 22: Connection timed out | 06:54 |
| asac | typo? | 06:54 |
| asac | bazzar? | 06:54 |
| asac | => bazaar | 06:54 |
| Jazzva | Oh... right :)... Didn't notice it. | 06:54 |
| asac | Jazzva: use bzr+ssh anyway | 06:55 |
| asac | you need gutsy though | 06:55 |
| asac | i think with 0.15 bzr it doesn't work | 06:55 |
| asac | if you don't have it go for sftp: | 06:55 |
| Jazzva | How? To replace it with sftp *unsure*? | 06:55 |
| Jazzva | Heh :D | 06:55 |
| asac | he? | 06:55 |
| asac | just use sftp | 06:55 |
| asac | ;) | 06:55 |
| Jazzva | Hmm, it's asking for a pass.. Maybe it works :) | 06:55 |
| asac | Ubulette: we have to find where MOZ_APP_NAME is defined in new build-system | 06:55 |
| Ubulette | asac, I can just use my own patch for make install. It's the one commit in trunk | 06:56 |
| asac | Ubulette: previously it was in configure.in ... but that is not the case for toolkit applications anymore | 06:56 |
| Jazzva | asac: not working :)... sftp it is | 06:56 |
| asac | Ubulette: feel free | 06:56 |
| asac | Ubulette: but please keep the toolkit install patch for now | 06:56 |
| Ubulette | ok | 06:56 |
| asac | so it won't vanish from my trree | 06:56 |
| asac | Jazzva: well not working is not really a detailed summary of what happens i would say | 06:57 |
| Jazzva | asac: Hmm this is what I got :/... ERROR: Permission denied: '/~jazzva/app-install-data/ubuntu.mozilla-extensions': [Errno 13] Directories directly under a user directory must be named after a product name registered in Launchpad <https://launchpad.net/>. | 06:57 |
| Jazzva | With sftp... | 06:58 |
| asac | Ubulette: ok | 06:59 |
| asac | Ubulette: fix the MOZ_APP_NAME in browser/confvars.sh | 06:59 |
| asac | Ubulette: and remind me to remember that its in that file ... i already knew about that ;) | 06:59 |
| asac | Ubulette: maybe replace granparadiso-fsh with that diff | 07:00 |
| asac | or do a new one: granparadiso_moz_app_name .) | 07:00 |
| asac | ok doing something else now :) ... hope you find your way ;) | 07:01 |
| Jazzva | asasc: Bad link again.. Fixed it :). | 07:02 |
| Jazzva | Ok, I've gotta go. I'll leave bzr to finish pushing. Should be uploaded in 10 minutes or so (I hope)... Have fun :). | 07:07 |
| Ubulette | asac, I'm now here: | 07:17 |
| Ubulette | $ quilt series | 07:17 |
| Ubulette | from_bugzilla_fix_make_install.patch | 07:17 |
| Ubulette | fix_nsinstall_on_double_slash.patch | 07:17 |
| Ubulette | fix_toolkit_xre_install.patch | 07:17 |
| Ubulette | no-have-stdint-h-ftbfs.patch | 07:17 |
| Ubulette | ftbfs-with-branding-dir | 07:17 |
| Ubulette | just granparadiso left | 07:17 |
| === cwong1 [i=chatzill@nat/intel/x-1250008a132c4388] has joined #ubuntu-mozillateam | ||
| asac | Ubulette: ok please rename (quilt rename --help) ... from_bugzilla_fix_make_install -> bzXXXXXX_fix_make_install | 07:20 |
| asac | XXXXXX == bug id in bugzilla | 07:21 |
| Ubulette | ok | 07:21 |
| asac | Ubulette: ok for granparadiso add a new patch | 07:21 |
| asac | that patches confvars.sh | 07:21 |
| asac | browser/confvars.sh | 07:21 |
| asac | and then hope that all works out well | 07:21 |
| Ubulette | already done | 07:22 |
| asac | ah | 07:22 |
| asac | in which patch? | 07:22 |
| asac | thought granparadiso was left :) | 07:22 |
| Ubulette | a new granparadiso-fsh | 07:22 |
| asac | well ... then just respin and see if it breaks | 07:22 |
| asac | i guess you need a full respin unless you want to think about what to do ;) | 07:22 |
| Ubulette | just looking for the bug id | 07:22 |
| asac | Ubulette: yeah ... name it granparadiso-appname or seomthing | 07:23 |
| asac | its not fsh anymore afterall | 07:23 |
| Ubulette | 389673 | 07:23 |
| asac | fsh == file system hierarchy | 07:23 |
| asac | mozilla bug 389673 | 07:23 |
| ubotu | Mozilla bug 389673 in Build Config "Fix "make install" to copy from dist/ rather than recursive makefile traversal" [Normal,Resolved: fixed] http://bugzilla.mozilla.org/show_bug.cgi?id=389673 | 07:23 |
| asac | yes | 07:23 |
| asac | maybe document attachment id in patch | 07:23 |
| asac | (to do it like best-practices) :) | 07:23 |
| Ubulette | $ quilt series | 07:24 |
| Ubulette | bz389673_fix_make_install.patch | 07:24 |
| Ubulette | fix_nsinstall_on_double_slash.patch | 07:24 |
| Ubulette | fix_toolkit_xre_install.patch | 07:24 |
| Ubulette | no-have-stdint-h-ftbfs.patch | 07:24 |
| Ubulette | ftbfs-with-branding-dir | 07:24 |
| asac | Ubulette: maybe consider to refresh your make install patcvh to get U8 and diffstat ... as this is the format i would like to see everywhere | 07:24 |
| Ubulette | granparadiso-appname | 07:24 |
| asac | ok | 07:24 |
| asac | looks good | 07:24 |
| Ubulette | I did | 07:24 |
| Ubulette | it's all fresh with diffstat | 07:25 |
| asac | in a perfect world you would have split up these things in multiple commits | 07:25 |
| asac | but since you are done ... well one commmit might work | 07:25 |
| Ubulette | let's compile 1st | 07:25 |
| asac | usually if you rename a file in bzr you use bzr mv file_src file_target | 07:25 |
| asac | yeah | 07:25 |
| asac | right you can still do it:) | 07:25 |
| asac | but in the end i don't care much | 07:26 |
| asac | most importantly i can merge it with my tree ;) | 07:26 |
| Ubulette | dh_install: firefox-granparadiso missing files (debian/tmp/usr/lib/firefox-*/firefox-granparadiso-bin), aborting | 07:26 |
| Ubulette | damn | 07:26 |
| Ubulette | same, no -bin in lib | 07:27 |
| Ubulette | hmm.. need a config.status | 07:28 |
| asac | huh? you do incremental build? | 07:29 |
| asac | that is likely to fail | 07:29 |
| asac | you need at least a reconfigure | 07:29 |
| asac | Ubulette: i guess you should do a dpkg-buildpackage -rfakeroot -b | 07:30 |
| asac | e.g. clean rebuild | 07:30 |
| asac | otherwise you might try to remove config.log (??) | 07:30 |
| asac | then run fakeroot ./debian/rules binary | 07:30 |
| asac | but keep your eyes open that autoconf2.13 is actually run if you do this | 07:30 |
| Ubulette | just for the record; logs say Warning: package error or possible missing or unnecessary file: bin/firefox-bin (packages-static, 45). | 07:31 |
| Ubulette | that will rebuild everything so it's another 45min | 07:32 |
| Ubulette | asac, thanks for quilt, that's really handy | 07:37 |
| asac | np | 07:37 |
| asac | Ubulette: what does spit out the message above? | 07:37 |
| Ubulette | /usr/bin/perl -I../../xpinstall/packager -e 'use Packager; Packager::Copy( "../../dist", "../../dist/firefox", "packages-static", "unix", 1, 0, 1);' | 07:39 |
| Ubulette | while in mozilla/browser/installer | 07:39 |
| asac | does it happen on clean build? | 07:39 |
| asac | or just before? | 07:39 |
| asac | e.g. in dirty build tree? | 07:39 |
| Ubulette | don't know yet. it's in make install | 07:40 |
| Ubulette | i'm still compiling | 07:40 |
| asac | hmm | 07:40 |
| asac | lets see | 07:40 |
| asac | what happens:) | 07:41 |
| Ubulette | do you want me to commit several steps ? | 07:42 |
| asac | well ... since you probably cannot do steps that work ... i guess one large commit, but well documented what is done with each file is better | 07:43 |
| asac | if you see any steps you might separate with a buildable tree, feel free to go that way | 07:43 |
| Ubulette | how do I comment with bzr ? | 07:44 |
| asac | if you run bzr commit (without any options) | 07:46 |
| asac | it will open your $EDITOR | 07:46 |
| asac | i have emacs ... i think default is vi? | 07:46 |
| asac | no idea | 07:46 |
| asac | Ubulette: usually i do a bzr diff > /tmp/somefile | 07:46 |
| asac | then i open that as well and go through the diff to not miss to document changes | 07:47 |
| Ubulette | ok | 07:48 |
| === asac [n=asac@debian/developer/asac] has joined #ubuntu-mozillateam | ||
| asac | ok i got reconnected ... so i lost messages of last 10 min or so | 07:54 |
| Ubulette | missed nothing | 07:55 |
| Ubulette | asac, for nsinstall, do we keep your patch or mine (http://pastebin.mozilla.org/182527) ? | 07:58 |
| Ubulette | mine seems closer to the inital idea of pruning trailling slashes for mkdir | 07:59 |
| Ubulette | oh, and yours invokes mkdir of the same thing as many times as the number of slashes | 08:03 |
| asac | Ubulette: well ... if yours work ... then take that | 08:03 |
| Ubulette | I'm not trying to place mine :) just do the right thing | 08:04 |
| asac | no really ... i think yours is ok | 08:04 |
| Ubulette | lunch time, brb | 08:06 |
| Ubulette | back | 08:41 |
| Ubulette | hm, it failed once again | 08:42 |
| Ubulette | -bin is okay now | 08:42 |
| Ubulette | oh, firefox-granparadiso.install is wrong. fixed | 08:43 |
| Ubulette | now it fails with: dh_install: firefox-granparadiso missing files (debian/tmp/usr/lib/firefox-*/plugins/libunixprintplugin.so), aborting | 08:43 |
| Ubulette | it's in dist but not in debian/tmp | 08:44 |
| Ubulette | asac, any idea ? | 08:45 |
| asac | is there no libunixprint* ? | 08:47 |
| asac | in tmp/usr/lib ... ? | 08:47 |
| asac | if not ... is there one in dist/bin/plugins ? | 08:48 |
| Ubulette | it's in dist but not in debian/tmp | 08:48 |
| Ubulette | ix:~/bzr/build-area/firefox-granparadiso-3.0~alpha7$ ls -l build-tree/mozilla/dist/bin/plugins | 08:49 |
| Ubulette | total 8 | 08:49 |
| Ubulette | lrwxrwxrwx 1 bbot bbot 61 Aug 8 18:14 libnullplugin.so -> ../../../modules/plugin/samples/default/unix/libnullplugin.so | 08:49 |
| Ubulette | lrwxrwxrwx 1 bbot bbot 66 Aug 8 18:14 libunixprintplugin.so -> ../../../modules/plugin/samples/unixprinting/libunixprintplugin.so | 08:49 |
| asac | Ubulette: is libnullplugin.so installed? | 08:59 |
| asac | in tmp ? | 08:59 |
| Ubulette | yes | 09:01 |
| asac | well thats a bit strange ... but lets not bother for that atm | 09:01 |
| asac | Ubulette: maybe make .install more generic | 09:01 |
| asac | just install what is in plugins/ | 09:02 |
| asac | not specific .so | 09:02 |
| Ubulette | ok | 09:02 |
| === Starting logfile irclogs/ubuntu-mozillateam.log | ||
| === ubuntulog [i=ubuntulo@ubuntu/bot/ubuntulog] has joined #ubuntu-mozillateam | ||
| === Topic for #ubuntu-mozillateam: 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 | | ||
| === Topic (#ubuntu-mozillateam): set by Admiral_Chicago at Sun Jun 24 10:33:47 2007 | ||
| (asac/#ubuntu-mozillateam) welcome back ubuntulog | 11:43 | |
| Ubulette | bzr push failed | 11:50 |
| Ubulette | sftp | 11:50 |
| Ubulette | Unable to import paramiko (required for sftp support): No module named paramiko | 11:50 |
| Ubulette | python-paramiko ? | 11:51 |
| Ubulette | ok | 11:51 |
| Ubulette | I need an ssh key for that... | 11:54 |
| Ubulette | or what ? | 11:54 |
| Jazzva | Is there any way to extract contents of xpi file? | 11:58 |
| Ubulette | unzip | 11:58 |
| Jazzva | Ok :) | 11:58 |
| Ubulette | got it, my ssh key is not working from the chroot. | 12:04 |
| Ubulette | [Errno 13] Branches must be inside a person or team directory. | 12:09 |
| asac | where are you trying to push to? | 12:10 |
| Ubulette | sftp://fta+launchpad@bazaar.launchpad.net/~fta+lauchpad/firefox/granparadiso | 12:10 |
| Ubulette | that's supposed to be my name | 12:10 |
| asac | welll ... who knows | 12:11 |
| Ubulette | bzr: ERROR: Permission denied: '/~fta+lauchpad': [Errno 13] Branches must be inside a person or team directory. | 12:11 |
| asac | maybe launpad chokes on '+' | 12:11 |
| Jazzva | launchpa | 12:11 |
| Ubulette | :) | 12:11 |
| asac | maybe url encode it | 12:11 |
| Jazzva | It seems like you're missing an "n" in launch in that error | 12:11 |
| asac | right | 12:11 |
| === Jazzva remembers the "bazzar" thing :D | ||
| Ubulette | good | 12:11 |
| Ubulette | fetching.. | 12:12 |
| asac | Ubulette: if you are on gutsy better use bzr+ssh:// | 12:12 |
| asac | well .. then keep it going | 12:12 |
| Ubulette | damn slow | 12:12 |
| asac | fetching means that server is fetching ... so you are pushing ;) | 12:12 |
| asac | well there is full source tarball somewhere in history of that branch | 12:12 |
| Ubulette | I guess so... dsl upload | 12:13 |
| Ubulette | slooooooow | 12:13 |
| asac | ... happily only on initial push | 12:13 |
| Ubulette | should have done that from the office | 12:17 |
| Ubulette | not from home | 12:17 |
| asac | well ... most of the times it finishes ;) | 12:17 |
| asac | at some point | 12:17 |
| Ubulette | lol, email is wrong | 12:20 |
| Ubulette | https://code.launchpad.net/~fta+launchpad/firefox/granparadiso | 12:20 |
| Ubulette | anyway to change that ? | 12:21 |
| Ubulette | I commited in my chroot as buildbot user :P | 12:21 |
| Ubulette | bzr whoami | 12:24 |
| Ubulette | woow.. emails are public on LP | 12:25 |
| Ubulette | not good for my spam rate | 12:25 |
| Jazzva | They're not... You can see them only when you're logged in. | 12:25 |
| asac | Ubulette: you need to set your email with bzr config | 12:26 |
| asac | maybe uncommit + commit again | 12:26 |
| asac | and push with --overwrite | 12:26 |
| asac | to wipe the bad email history | 12:26 |
| asac | Ubulette: my ~/.bazaar/bazaar.conf | 12:26 |
| asac | has | 12:26 |
| asac | [DEFAULT] | 12:26 |
| asac | email = Alexander Sack <asac@jwsdot.com> | 12:26 |
| Ubulette | bzr whoami did just that | 12:28 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!