| asac | if you have no configs the natural layout would be | 12:29 |
|---|---|---|
| asac | ~/bzr/upstream-package-1.ubuntu | 12:29 |
| asac | ~/bzr/upstream-package-2.ubuntu | 12:29 |
| asac | ~/bzr/upstream-package-1.upstream | 12:29 |
| asac | ~/bzr/tarballs/ | 12:29 |
| Jazzva | Mhm... | 12:30 |
| asac | to safe space you can make a bzr repo out of bzr directory | 12:30 |
| asac | in this way bzr/upstream-package-1.upstream and /bzr/upstream-package-1.ubuntu would share the .bzr directory | 12:30 |
| asac | but afaik you have to make a repo out of bzr dir before branching initially | 12:31 |
| asac | like | 12:31 |
| asac | bzr init-repo ~/bzr | 12:31 |
| === Jazzva is lost... | ||
| asac | yeah sorry | 12:31 |
| asac | i will stop now | 12:31 |
| asac | :) | 12:31 |
| Jazzva | No problem... I just need some time to get used to bzr :)... | 12:32 |
| asac | sure ... maybe read that again in a few days ;) | 12:32 |
| Jazzva | Yeah, I noticed that usually works :)... | 12:32 |
| asac | the most unfortunate thing is that bzr builddeb gives you meaningless default error messages too often | 12:32 |
| Jazzva | Noticed... A lot of unmet deps :/... | 12:33 |
| asac | if you get some error you don't understand its most likely that bzr doesn't find the orig.tar.gz | 12:33 |
| asac | ah | 12:33 |
| Jazzva | Then I used bzr-buildpackage --builder '...' and everything seemed nice :) | 12:33 |
| asac | yes | 12:33 |
| asac | it should work without builder | 12:33 |
| asac | however your main root needs all depends installed then | 12:34 |
| Jazzva | Mhm... | 12:34 |
| === kujub [n=kurt@p549B196D.dip0.t-ipconnect.de] has joined #ubuntu-mozillateam | ||
| asac | anyway ... for signing i have to use --builder as well :) | 12:34 |
| Jazzva | Well, I'll try to work it out with --builder option and see if it looks right :). | 12:35 |
| asac | sure | 12:35 |
| asac | Jazzva: i get lintian warnings when building your package ... maybe you want to look into these as well | 12:41 |
| asac | Now running lintian... | 12:41 |
| asac | W: gnome-voice-control source: debian-rules-ignores-make-clean-error line 43 | 12:41 |
| asac | W: gnome-voice-control: non-standard-dir-in-usr usr/libexec/ | 12:41 |
| asac | W: gnome-voice-control: file-in-unusual-dir usr/libexec/voice_control_applet | 12:41 |
| Jazzva | Hmm, saw them now... | 12:43 |
| asac | Jazzva: why do you ship updated config.sub config.guess in diff? | 12:43 |
| asac | is that a glitch or intended? | 12:43 |
| Jazzva | Glitch... | 12:43 |
| Jazzva | Wait | 12:43 |
| Jazzva | There is a part in debian/rules where he updates config.sub and config.guess... debhelper made it and I didn't know it was wrong :/... | 12:44 |
| asac | hmm | 12:44 |
| asac | ok | 12:44 |
| Jazzva | I'll see if config.sub and configu.guess get changed during building and if they don't, I'll delete that part from debian/rules | 12:45 |
| Jazzva | Though I suppose they don't... at least they shouldn't... | 12:45 |
| asac | Jazzva: you can keep it in debian/rules | 12:45 |
| asac | did you keep that diff out of bzr? | 12:46 |
| Jazzva | Umm, I don't think I understand the question... | 12:46 |
| asac | not important | 12:47 |
| asac | its ok to keep it i guess | 12:47 |
| Jazzva | But I think it's not needed if config.sub and .guess don't change... | 12:48 |
| asac | well they change | 12:48 |
| asac | this instruction exists to make porters life easier i guess | 12:48 |
| asac | so if you are on debian kbsd you automatically get your architecture infos pulled in | 12:49 |
| asac | which might not be merged into mainline autotools | 12:49 |
| asac | yet | 12:49 |
| Jazzva | Hmm, saving initial c.g and c.s, running configure and make, and then diffing old and new c.g and c.s should show if they change... | 12:49 |
| Jazzva | What's kbsd? | 12:49 |
| asac | debian with gnu libc + kernel from freebsd | 12:49 |
| asac | a port | 12:49 |
| Jazzva | Ok. | 12:50 |
| Jazzva | So, it should stay in rules then? | 12:50 |
| asac | yes keep it | 12:50 |
| asac | if you commit config.* updates to bzr, please do so in a separate checkin | 12:50 |
| asac | ok i am off for tonight ;) | 12:51 |
| asac | sleep | 12:51 |
| asac | cu | 12:51 |
| Jazzva | First to add debian/* and then config.*? | 12:51 |
| asac | yes for instance | 12:51 |
| Jazzva | Ok, thanks :)... | 12:51 |
| Jazzva | I'll see what I can do with this :). | 12:51 |
| Jazzva | Good night | 12:51 |
| asac | sure | 12:51 |
| asac | thanks | 12:52 |
| === Admiral_laptop [n=Freddy@adsl-68-72-98-66.dsl.chcgil.ameritech.net] has joined #ubuntu-mozillateam | ||
| === Admiral_laptop [n=Freddy@adsl-68-72-98-66.dsl.chcgil.ameritech.net] has joined #ubuntu-mozillateam | ||
| === red_herring [n=rj@c-24-14-245-251.hsd1.il.comcast.net] has joined #ubuntu-mozillateam | ||
| === Admiral_laptop [n=Freddy@adsl-68-72-98-66.dsl.chcgil.ameritech.net] has joined #ubuntu-mozillateam | ||
| === gnomefreak [n=gnomefre@ubuntu/member/gnomefreak] has joined #ubuntu-mozillateam | ||
| === Admiral_Chicago_ [n=FreddyM@adsl-68-72-98-66.dsl.chcgil.ameritech.net] has joined #ubuntu-mozillateam | ||
| gnomefreak | asac: are you back from your weekend getaway? | 02:53 |
| === gnomefreak has work for us to figure out this week sometime. firefox-trunk 20070803 failed to build with an error we had in sunbird i have paste i think, 20070804 failed on trunk-fsh patch | ||
| gnomefreak | but i will see you tomorrow if i get a chance im on babysitting duty for next 2 days | 02:57 |
| gnomefreak | SAVE MEEEEEEEEEEEEEE | 02:57 |
| gnomefreak | ;) | 02:57 |
| Admiral_Chicago | gnomefreak: baby sitting is not fun :) | 02:59 |
| Jazzva | gnomefreak: Babies can be cool :)... Well, some of them. I hope you had luck... | 03:45 |
| Jazzva | As for asac, he's gone to sleep... | 03:46 |
| === Admiral_Chicago_ [n=FreddyM@adsl-68-72-98-66.dsl.chcgil.ameritech.net] has joined #ubuntu-mozillateam | ||
| === Admiral_Chicago [n=FreddyM@adsl-68-72-98-66.dsl.chcgil.ameritech.net] has joined #ubuntu-mozillateam | ||
| asac | well ... here i am :) | 09:27 |
| === asac_ [n=asac@debian/developer/asac] has joined #ubuntu-mozillateam | ||
| === kujub [n=kurt@p549B320B.dip0.t-ipconnect.de] has joined #ubuntu-mozillateam | ||
| Jazzva | Hey, asac... Good morning :). Got my mail? | 12:25 |
| asac | morning | 12:25 |
| asac | Jazzva: yes ... whats the question ;) ? | 12:26 |
| Jazzva | BTW, if you read it... Can I make an initial release with a patch :)? | 12:26 |
| asac | for what? | 12:26 |
| asac | for that libexec thing? | 12:26 |
| asac | yes, please do a patch | 12:26 |
| Jazzva | Uh-huh | 12:26 |
| Jazzva | Ok :) | 12:27 |
| asac | make it use pkglibdir | 12:27 |
| asac | not libexec dir | 12:27 |
| asac | but maybe confirm in #ubuntu-desktop where this applet binary has to go | 12:27 |
| Jazzva | Will do :)... | 12:27 |
| asac | Jazzva: as long as you don't diverge a lot, and you document your changes properly in changelog/bzr commit ... then i am fine if you don't use a patchsystem ... though in general patchsystems are preferred over just carrying changes in the diff.gz | 12:28 |
| Jazzva | Well, I read about them... dpatch sounded not so hard, so I meant to use it... | 12:29 |
| asac | sure ... maybe use quilt | 12:30 |
| asac | i prefer it over every other system | 12:30 |
| asac | but its your choice | 12:30 |
| asac | maybe use different ones for different packages ... so you find what you like most | 12:30 |
| Jazzva | Hmm, ok... Will try :). | 12:31 |
| === Fujitsu [n=fujitsu@ubuntu/member/fujitsu] has joined #ubuntu-mozillateam | ||
| Fujitsu | asac: You rang? (re. bug #128116) | 12:32 |
| ubotu | Launchpad bug 128116 in network-manager "NM loops indefinitely with `old_dev has_link? 1' when connecting to one particular network" [Undecided,New] https://launchpad.net/bugs/128116 | 12:32 |
| Fujitsu | (yes, I have quite some degree of technical skills) | 12:33 |
| asac | Hi Fujitsu | 12:34 |
| asac | yeah | 12:34 |
| asac | Fujitsu: maybe it helps if you set essid manually to "" before you try to connect? | 12:34 |
| Fujitsu | asac: I'm at home at the moment; I can try in about 12 hours. | 12:36 |
| asac | ok | 12:36 |
| asac | probably i am in bed then though ;) | 12:36 |
| asac | but give it a try | 12:36 |
| Fujitsu | Will do. | 12:37 |
| Fujitsu | Thanks for looking into this. | 12:37 |
| asac | sure | 12:40 |
| asac | need testers :) | 12:40 |
| asac | for every chipset i personally don't posess | 12:40 |
| Fujitsu | If you need anything from me, I can be found in... pretty much any #ubuntu-*, although I mostly sit in -devel and -motu. | 12:44 |
| asac | k | 12:45 |
| asac | for now testing what i asked would be a good start | 12:45 |
| asac | if it doesn't help i would need to do a test session with wpa_supplicant manually et al | 12:45 |
| Fujitsu | Doing it manually works fine. | 12:46 |
| Jazzva | asac: Hmm, I suppose "FATAL: Could not load /lib/modules/2.6.20-16-generic/modules.dep: No such file or directory" reported by bzr-builddeb is no biggie, right? :) (since the package builds and you said that bzr-builddeb will report some error messages) | 01:15 |
| Jazzva | Reported when running pbuilder, when the build-deps unpack... | 01:16 |
| Jazzva | asac: Configuration requires scrollkeeper-config, which is provided in scrollkeeper package, so I put it as a build-dep. But, then it stays in the final .deb, so I though I should remove it (it's in /var/lib/scrollkeper/). Since it needs it in installed state too, do I need to put it in package deps, or will it be determined with ${misc:Depends}? | 01:24 |
| Jazzva | Nevermind... I think I figured that one :). Took a look at deskbar-applet.'s files. | 03:07 |
| gnomefreak | ok im here im just looking for something atm | 03:11 |
| gnomefreak | asac: let me know when you have time there are a few things i stated above and there is one thing strange that really bothers me about the 20070803 build | 03:13 |
| asac | what is it? | 03:14 |
| gnomefreak | trunk-fsh is giving me issues but im looking at the failed hunks atm. on the 0803 build debian/tmp was empty | 03:15 |
| asac | gnomefreak: well ... did i push something to trunk recently? | 03:16 |
| gnomefreak | not that i know of extcpt what we did last week or week before | 03:17 |
| asac | what was that? | 03:18 |
| gnomefreak | looking | 03:19 |
| gnomefreak | i thnk just removing patches and stufff | 03:19 |
| asac | i did apply something that was a preview | 03:19 |
| asac | if i checked that in then we have troubles | 03:20 |
| gnomefreak | i fixed the firefox-trunk-install applications.in and freind | 03:20 |
| gnomefreak | and --disable-airbag | 03:20 |
| gnomefreak | i see no reason as to why autoconf.mk.in should fail other than removing something that isnt in the file at all | 03:21 |
| gnomefreak | oh wait | 03:21 |
| gnomefreak | https://code.launchpad.net/~mozillateam/firefox/trunk | 03:21 |
| gnomefreak | anyway the 2 hunks failed should apply without problem | 03:28 |
| === gnomefreak not understanding why. the mozilla/unix/Makefile.in should apply since everything in patch is after the endif and endif is last statement in file. so everything is add on. and the autoconf.mk.in looks fairly sane to me there are a few things that might be going wrong but i dont see it applied in patch at all | ||
| gnomefreak | applied in file at all | 03:31 |
| asac | hmm | 03:31 |
| asac | i doubt that patch refuses to apply if the patch applies cleanly :) | 03:32 |
| gnomefreak | brb smoke | 03:41 |
| asac | gnomefreak: i have one more thing todo ... right after uploading a network-manager bomb :) | 03:41 |
| asac | then i can look at trunk | 03:41 |
| asac | if not today, then tomorrow | 03:41 |
| asac | gnomefreak: paradiso doesn't just build right :) ? | 03:41 |
| gnomefreak | asac: i havent tempted it yet since its the same debian dir im gonna assume no | 03:46 |
| gnomefreak | maybe thats it | 03:46 |
| asac | should not be the same debian dir | 03:47 |
| asac | as the trunk contains this funky all-in-wonder-fix-all-make-install patch | 03:47 |
| gnomefreak | the patch adds stuff to end of the file endif being the end of file and you have what looks like deleted things and added things but there is nothing to delete after endif in file | 03:47 |
| asac | which is definitly the reason for the empty debian/tmp dir | 03:47 |
| gnomefreak | ah ok | 03:47 |
| gnomefreak | trunk had empty debina/tmp and doesnt have that patch | 03:48 |
| asac | but without that patch our future isn't bright | 03:48 |
| asac | as you remember ... we just crash ;) | 03:48 |
| gnomefreak | yes | 03:48 |
| gnomefreak | i remember :) | 03:48 |
| asac | the funny thing about this make install patch is that it works | 03:48 |
| asac | if your just run make install DESTDIR=/tmp/somedir | 03:48 |
| asac | it will install it properly in that place | 03:48 |
| asac | but it doesn't do that for us when run through dpkg-buildpackage -rfakeroot | 03:49 |
| asac | ... as a matter of another mystery | 03:49 |
| asac | gnomefreak: just try on the failed build tree (where debian/tmp is empty) | 03:49 |
| gnomefreak | right, could the dpkg-* package have changed in gutsy and thats why it fails | 03:49 |
| asac | if you run make install DESTDIR=debian/tmp | 03:49 |
| asac | it should be thgere | 03:49 |
| asac | i really doubt it | 03:49 |
| gnomefreak | asac: i dont have one anymore | 03:49 |
| asac | its something else wierd going on | 03:50 |
| gnomefreak | the one that failed i cleaned and changed date for build | 03:50 |
| gnomefreak | no dies at patches | 03:50 |
| gnomefreak | now. | 03:50 |
| asac | well ... adapt trunk-fsh | 03:50 |
| asac | you know how | 03:50 |
| asac | goto build-tree/mozilla | 03:50 |
| asac | quilt push -f | 03:50 |
| asac | fix the conflicts | 03:50 |
| asac | quilt refresh --diffstat -U8 | 03:50 |
| asac | then see that quilt pop -a | 03:50 |
| asac | + quilt push -a works | 03:51 |
| asac | if it does | 03:51 |
| asac | then just build | 03:51 |
| gnomefreak | ok after phonecall | 03:51 |
| Jazzva | Umm... sorry to get in, but what about DESTDIR=$(CURDIR)/debian/tmp? | 03:51 |
| asac | what do you mean? | 03:51 |
| Jazzva | (maybe I'm just talking non-sense, though) | 03:51 |
| Jazzva | This: <asac> if you run make install DESTDIR=debian/tmp | 03:51 |
| asac | yeah ... it should be the same | 03:51 |
| asac | but we use cdbs for firefox package | 03:52 |
| asac | so its just done automagically | 03:52 |
| Jazzva | Oh... ok | 03:52 |
| Jazzva | :) | 03:52 |
| asac | but you see what it runs on command line | 03:52 |
| asac | if you run that manually it just works | 03:52 |
| asac | but it appears to fail when build through debian/rules | 03:52 |
| Jazzva | Don't know CDBS, but you sure it will add $(CURDIR)? (well, it sounds logically to build in current dir) | 03:53 |
| Jazzva | asac: By the way, I fixed (probably) all what you said for gnome-voice-control and uploaded :) | 03:55 |
| asac | Jazzva: ok i will pull in the background | 03:56 |
| Jazzva | asac: Thanks... | 03:56 |
| asac | Jazzva: your checkin commands are not really verbose | 03:56 |
| asac | makes it hard to review ;) | 03:56 |
| asac | just give your commits the credits they deserve by using a verbose commit message next time | 03:57 |
| Jazzva | asac: I looked at this deskbar-applet (packaged using CDBS) and it passed "DESTDIR=$(CURDIR)/debian/deskbar-applet" to make | 03:57 |
| asac | what did you do to debian/rules? | 03:57 |
| Jazzva | asac: Sorry... Will do :) | 03:57 |
| asac | i don't see that from comment | 03:57 |
| Jazzva | Fixed the "no target to run 'clean'" by adding if [ -f Makefile ] ;... | 03:57 |
| Jazzva | And removed the /var/lib/scrollkeeper that gets added | 03:58 |
| asac | ok, document that please next time | 03:58 |
| Jazzva | Ok... | 03:58 |
| gnomefreak | as here is the conflict http://pastebin.mozilla.org/182092 looks like the full patch hunk | 03:58 |
| asac | Jazzva: you changed the configure line as well? | 03:58 |
| Jazzva | asac: Just wanted to say that | 03:58 |
| Jazzva | --libexecdir=/usr/lib/... | 03:59 |
| asac | Jazzva: thats wrong | 03:59 |
| gnomefreak | this patch is almost usless without these hunks in it iirc there is only 3 hunks | 03:59 |
| asac | Jazzva: please fix the makefile.am | 03:59 |
| asac | not the libexecdir | 03:59 |
| Jazzva | Hmm, well, that's what I got as advice from pitti :/... | 03:59 |
| asac | use pkglibdir instead of libexecdir | 03:59 |
| asac | hmm | 03:59 |
| Jazzva | When I asked in #ubuntu-desktop... | 03:59 |
| asac | hmm | 03:59 |
| asac | ok | 03:59 |
| asac | maybe --libexecdir is pkglibdir for us by definition? | 04:00 |
| asac | no idea | 04:00 |
| asac | does cdbs pass that argument as well? | 04:00 |
| Jazzva | What do you mean? | 04:01 |
| asac | well ... if cdbs passes --libexecdir to configure ... then its fine imo | 04:02 |
| Jazzva | Well, it seems to me it would pass to configure if you would add it :/... But I don't know cdbs :) | 04:02 |
| asac | yes of course ... i just ment if cdbs passes it by default then its probably policy ... if not its a hack ;) | 04:03 |
| Jazzva | Lemme see how they did it in deskbar-applet :) | 04:03 |
| asac | right | 04:04 |
| Jazzva | Hmm, no mention of "libexecdir" in their debian/rules... | 04:04 |
| asac | so ... look in Makefile.am of the applet binary | 04:04 |
| asac | how do they define the programs? | 04:05 |
| Jazzva | What do you mean? How do they define where it's gonna install? | 04:07 |
| asac | will ... in gnome-voic ... | 04:08 |
| asac | there is in src/Makefile.am: | 04:08 |
| asac | libexec_PROGRAMS = voice_control_applet | 04:08 |
| asac | if you change that to pkglib_... it will automatically get installed to proper directory | 04:08 |
| Jazzva | No mention of that in deskbar-applet, but they use this: "deskbarbindir = $(libdir)/deskbar-applet" | 04:10 |
| asac | hmm | 04:12 |
| asac | yeah | 04:12 |
| asac | use pkglib then | 04:12 |
| asac | e.g. patch Makefile.am | 04:12 |
| asac | or keep --libexecdir= ... whatever you want | 04:12 |
| asac | i don't really care | 04:12 |
| asac | :) | 04:12 |
| Jazzva | Umm... well, what's better? :) | 04:13 |
| asac | both are equal ... though fixing makefile looks more like the proper solution | 04:14 |
| asac | but keep --libexecdir | 04:14 |
| asac | ok lets look at the checkin for a minute :) | 04:14 |
| asac | http://pastebin.mozilla.org/182097 | 04:15 |
| asac | you see how you tackle multiple things in one commit? | 04:15 |
| asac | e.g. independent things | 04:15 |
| Jazzva | Mhm... | 04:15 |
| Jazzva | Oooh, so you wanted me to upload thing by thing :)? | 04:15 |
| gnomefreak | wish there was an automatic way to resolve conflicts :( can we add that to quilt ;) j/k i know we cant | 04:16 |
| Jazzva | For example: edit debian/control - upload - edit debian/rules - upload... Something like that? | 04:16 |
| gnomefreak | Jazzva: update debian/control debian/bleh and so on than commit debian/control <add whatever you did> commit debian/bleh <add what you did> and so on than once everything is goo bzr push <URL to push to> example sftp://gnomefreak@bazaar.launchpad.net/~jazzva/package/name | 04:29 |
| gnomefreak | bzr commit | 04:29 |
| gnomefreak | asac: did you tar up the granparadiso a7 tarball yet? | 04:29 |
| gnomefreak | for bar bd | 04:29 |
| gnomefreak | bzr bd | 04:29 |
| Jazzva | gnomefreak: Understood... :) | 04:29 |
| asac | Jazzva: yes ... distinct commits | 04:29 |
| asac | per feature ... as i outlined yesterday ... boosts readability of branch history | 04:29 |
| Jazzva | Now I see what you meant yesterday :)... | 04:29 |
| gnomefreak | this is assuming you have branch made already | 04:29 |
| gnomefreak | asac: by the looks of it and im not sure how this is but both hunks (autoconf and makefile.in) fail on whole hunks :( | 04:29 |
| gnomefreak | atleast thats what im seeing pre conflicts | 04:29 |
| asac | yes ... merge them | 04:29 |
| asac | resolve conflicts et al | 04:29 |
| gnomefreak | is there an sutomatic way of doing that? | 04:29 |
| asac | refresh patches | 04:29 |
| gnomefreak | sutomatic automatic | 04:29 |
| asac | gnomefreak: hehe ... no ... as outlined above ... push quilt patch ... resolve conflicts manually ... refresh | 04:29 |
| asac | gnomefreak: you remember ... i am sure ;) | 04:29 |
| gnomefreak | asac: i do but if whole hunk in patch is failing do i remove that part of patch or add the patch to file | 04:29 |
| gnomefreak | patch file manually | 04:29 |
| gnomefreak | see the pastebin link i gave you for one of the outputs (conflicts | 04:29 |
| asac | gnomefreak: well ... if the hunk fails you have to ensure that its done upstream now ... otherwise the hunk has to be inserted to proper place | 04:29 |
| gnomefreak | the parts of the hunk are not in the files that should be patched yet | 04:29 |
| asac | quilt push -f | 04:29 |
| asac | should bring conflicts in files | 04:29 |
| asac | otherwise push just complains | 04:29 |
| gnomefreak | and it did i pasted one of them for you to see | 04:29 |
| gnomefreak | http://pastebin.mozilla.org/182092 | 04:29 |
| gnomefreak | it states it 2 times over | 04:29 |
| gnomefreak | do i just add the parts with + or all of it as none of it is in file atm | 04:29 |
| asac | what is that paste about? | 04:34 |
| asac | there isn't any conflict | 04:34 |
| asac | can you paste the conflicted file? | 04:34 |
| asac | or the parts that conflicts + some context | 04:34 |
| asac | gnomefreak: do you see what that hunk does? | 04:34 |
| asac | it renames some targets to use -trunk- | 04:34 |
| asac | inside | 04:35 |
| asac | just quilt push -f | 04:35 |
| asac | and use -trunk as well for those that are in the patch | 04:35 |
| gnomefreak | that is the conflict file | 04:37 |
| asac | really? | 04:37 |
| gnomefreak | yes | 04:38 |
| asac | i mean the file itself | 04:38 |
| gnomefreak | both are like that | 04:38 |
| asac | it contains conflicts marked | 04:38 |
| asac | look into that | 04:38 |
| asac | not the .rej file | 04:38 |
| gnomefreak | that is the .rej | 04:38 |
| asac | yeah ... look in the real file | 04:38 |
| gnomefreak | k | 04:38 |
| asac | do you see those places? | 04:38 |
| asac | in that file? | 04:38 |
| gnomefreak | opening both atm | 04:39 |
| gnomefreak | ok in the makein.mk file i see some of the lines but the changes are not present | 04:40 |
| gnomefreak | example makein.mk file ends with libs:: vms/mozilla.com vms/install.com vms/getinfo.com $(INSTALL) $? $(DIST)/bin | 04:40 |
| gnomefreak | endif | 04:40 |
| gnomefreak | the .rej file starts with ** 62,125 **** endif | 04:41 |
| gnomefreak | ifdef MOZ_ENABLE_GTK | 04:41 |
| gnomefreak | the endif in rej is the last line of the in.mk file | 04:41 |
| gnomefreak | so none of the lines for that hunk are in the file at akk | 04:41 |
| gnomefreak | all | 04:41 |
| asac | gnomefreak: you have to look in the files that have conflicts | 04:42 |
| asac | makein.mk is not known to me | 04:42 |
| asac | :) | 04:42 |
| gnomefreak | makefile.in.mk | 04:42 |
| asac | he? | 04:42 |
| asac | you mean Makefile.in ? | 04:42 |
| gnomefreak | yes | 04:42 |
| asac | well | 04:43 |
| gnomefreak | but yes sorry makefile.in | 04:43 |
| asac | gnomefreak: is there pkg_config_files | 04:43 |
| asac | somewhere in that Makefile.in | 04:43 |
| gnomefreak | nope just PACKAGE_FILE = unix.pkg | 04:43 |
| gnomefreak | total file including license is only 56 or 57 lines | 04:44 |
| gnomefreak | none of the lines http://pastebin.mozilla.org/182092 are in the makefile.in file except the starting endif that is last line in makefile.in | 04:45 |
| gnomefreak | http://pastebin.mozilla.org/182109 is the full makefile.in | 04:46 |
| gnomefreak | thats what im not getting how does it fail on something that hasnt been patched upstream if it passed prior to new release | 04:46 |
| gnomefreak | by the looks of it nothing in the failed hunks has been patched upstream | 04:47 |
| asac | gnomefreak: thats obviously the wrong Makefile.in | 04:48 |
| gnomefreak | asac: its the one the failure gave me | 04:48 |
| asac | well .. .what directory is that from? | 04:48 |
| gnomefreak | build/unix/Makefile.in | 04:48 |
| gnomefreak | hmmmmmm | 04:48 |
| gnomefreak | maybe just saw somehting | 04:49 |
| gnomefreak | but i could be wrong | 04:49 |
| gnomefreak | nope not what i was thinking | 04:49 |
| gnomefreak | +++ mozilla/build/unix/Makefile.in2007-07-23 11:53:23.000000000 +0200 | 04:50 |
| gnomefreak | that is from patch itself | 04:50 |
| gnomefreak | so from what i can tell its the right file | 04:50 |
| gnomefreak | is it possible they patched a different file to use your patch? | 04:51 |
| gnomefreak | if i look in build-tree/mozilla/patches it shows our patches i guess that is when i tried to build it added them | 04:53 |
| gnomefreak | hmmm | 05:02 |
| gnomefreak | @schedule new_york | 05:06 |
| ubotu | Schedule for America/New_York: 07 Aug 11:00: Kernel Team | 08 Aug 08:00: Edubuntu | 09 Aug 11:00: Ubuntu Development Team | 10 Aug 00:00: MOTU Team | 11 Aug 13:00: Xubuntu Developers | 14 Aug 11:00: Ubuntu Server Team meeting | 05:06 |
| asac | gnomefreak: hmmm ... have you looked in bonsai? | 05:07 |
| asac | maybe they have changed that file lately | 05:07 |
| gnomefreak | no i lost net connection yesterday and forgot to do that today | 05:07 |
| gnomefreak | hmmmmmm | 05:12 |
| gnomefreak | makefile.in search within lastweek shows nothing | 05:12 |
| gnomefreak | atleast not in CVS | 05:12 |
| gnomefreak | asac: making orig for granparadiso a7 will upload so you can check sanity before i use it to build | 05:14 |
| gnomefreak | autoconf/mk/in has had 2 changes recently looking at them atm | 05:18 |
| gnomefreak | asac: hmmmm this is interesting | 05:19 |
| gnomefreak | hmmmmmm it looks like it changed but im not sure of date | 05:25 |
| gnomefreak | http://bonsai.mozilla.org/multidiff.cgi | 05:26 |
| gnomefreak | but no dates | 05:26 |
| gnomefreak | seems they dont use -trunk anymore | 05:26 |
| gnomefreak | still doesnt make any sense as the parts they changed our patch -the mozilla line and + our line all is the same by the looks of it, all changes made to autoconf.mk.in are already in the file we have | 05:35 |
| === cwong1 [i=chatzill@nat/intel/x-538148c1b45adcef] has joined #ubuntu-mozillateam | ||
| cwong1 | asac: hi.. | 05:35 |
| gnomefreak | hmmm | 05:36 |
| gnomefreak | benjamin%smedbergs.us: -mrelibdir= $(mredir)/lib but our patch keeps that line maybe that would be our conflict | 05:36 |
| cwong1 | asac: sorry, I was busy fighting other battles last Thursday and Friday and not being able to sync up with u | 05:37 |
| asac | cwong1: hi | 05:45 |
| asac | cwong1: yes ... that should be fine | 05:46 |
| cwong1 | asac: I ran into a problem with the Patch to nswindows.cpp. It caused a core dump. | 05:46 |
| asac | how do you know? | 05:47 |
| asac | that its because of that patch? | 05:47 |
| cwong1 | asac: I ran it without the pach and the browser works find in the hildon enviorment. | 05:47 |
| cwong1 | s/find/fine/ | 05:47 |
| asac | and otherwise it crashes? | 05:48 |
| cwong1 | asac: yes | 05:48 |
| asac | reproducible? | 05:48 |
| cwong1 | asac: yes | 05:48 |
| asac | but i ran it as well afaik | 05:48 |
| asac | hmm | 05:48 |
| cwong1 | asac: have u try bring up the about box and then hit the escape key to close it. That should do it for sure. | 05:48 |
| asac | does it happen outside hildon as well? | 05:49 |
| gnomefreak | ha think i fixed it | 05:49 |
| cwong1 | asac: I believe so | 05:49 |
| asac | ok let me try | 05:49 |
| gnomefreak | oh fuck mozilla | 05:50 |
| cwong1 | lol | 05:50 |
| gnomefreak | fix one patch all others die | 05:50 |
| asac | gnomefreak: thats an offense :) | 05:50 |
| cwong1 | :) | 05:50 |
| gnomefreak | fixed trunk-fsh | 05:50 |
| asac | nice | 05:51 |
| gnomefreak | asac: http://pastebin.mozilla.org/182125 | 05:51 |
| gnomefreak | not so nice :( | 05:51 |
| asac | cwong1: don't see it outside of test env | 05:52 |
| cwong1 | asac: hmmm | 05:52 |
| cwong1 | asac: well. for today's release, can we not include that hildon patch until I do some more testing on my end? | 05:53 |
| gnomefreak | asac: when you get time please check tarball to see if i did it right http://gnomefreak.youmortals.com/Tarballs/firefox-granparadiso-3.0~alpha7.orig.tar.gz | 05:53 |
| asac | cwong1: let me try to reproduce first | 05:54 |
| cwong1 | asac: try it with hildon, this is the target environment. | 05:55 |
| asac | what do you mean by "with hildon" ? | 05:57 |
| cwong1 | asaci:run in the the chroot with hildon desktop runing in the background | 05:58 |
| gnomefreak | im kind of willing to bet we need to drop fix_make_install due to https://bugzilla.mozilla.org/show_bug.cgi?id=389673 | 06:02 |
| ubotu | Mozilla bug 389673 in Build Config "Fix "make install" to copy from dist/ rather than recursive makefile traversal" [Normal,Resolved: fixed] | 06:02 |
| asac | cwong1: i can't get it to crash | 06:09 |
| asac | cwong1: what add-ons et al do you have installed? | 06:10 |
| cwong1 | asac: did you try using the image create to create an image and then run it in that environment? | 06:14 |
| cwong1 | s/create/creator/ | 06:14 |
| asac | well i saw a crash now | 06:15 |
| asac | its in hildon | 06:15 |
| asac | need hildon dbg symbols ... lets see | 06:15 |
| cwong1 | glad u can reproduce it. :) | 06:16 |
| asac | 0x00002b1fecdafb4a in hildon_window_escape_timeout (data=0x98e470) at hildon-window.c:1609 | 06:19 |
| gnomefreak | i guess that tar doesnt work with the _ or the - | 06:20 |
| asac | cwong1: can you find out what hildon_window_escape_timeout is about? | 06:21 |
| asac | cwong1: e.g. what purpose does it serve et al | 06:21 |
| asac | cwong1: anyway ... its not a problem to not use hildon window patch .. most likely we won't need hildon window anyway | 06:22 |
| cwong1 | asac: I will. In the meantime, can we push the rest of the changes upstream without that hildon patch. | 06:22 |
| cwong1 | asac: can we pull in the patches (- hildon) from WORKING into master and push that up? I can then fix moblin.org to point to the new repository. | 06:24 |
| asac | cwong1: what patches? | 06:24 |
| asac | just the localstore one? | 06:24 |
| cwong1 | The patches that I have checked into the WORKING last week. | 06:24 |
| asac | ok, will do that after i return from sport ... then upload et al. | 06:26 |
| asac | hope that is good enough ;) | 06:26 |
| cwong1 | ok. Send me an email when it is done please. So I can test it out. :) | 06:26 |
| cwong1 | btw, can u email your mailing address? | 06:26 |
| cwong1 | When the Samsung Q1 comes in, I will send to you. | 06:27 |
| cwong1 | asac: please include the change request that I sent last Wed. (the new icon and desktop file change). | 06:29 |
| asac | sure | 06:29 |
| asac | yes | 06:29 |
| cwong1 | tx | 06:29 |
| asac | i will add those changes | 06:29 |
| cwong1 | coffee break and u have a nice workout:) | 06:30 |
| asac | i hope this week we get our own window as well | 06:30 |
| asac | sure | 06:30 |
| asac | ;) | 06:30 |
| === gnomefreak goes for lunch, something is wrong with tarball i made i guess since it doesnt want to build using it | ||
| Jazzva | asac: Can I do the bug-testing in Gran Paradiso? *unsure* | 06:36 |
| === asac_ [n=asac@debian/developer/asac] has joined #ubuntu-mozillateam | ||
| === Ubulette [n=Ubulette@APuteaux-153-1-75-203.w81-249.abo.wanadoo.fr] has joined #ubuntu-mozillateam | ||
| Ubulette | Hi, anyone working on FF3a7 ? | 07:54 |
| === JenFraggle [n=jen@host86-134-14-106.range86-134.btcentralplus.com] has joined #ubuntu-mozillateam | ||
| asac_ | Jazzva: well ... it doesn't work yet | 07:56 |
| Ubulette | I've built a7 debs like I did the a6 ones, ie just porting what you guys did for a5. After a few tweaks, I obtain the debs but bookmarks and passwords are broken. | 07:59 |
| Ubulette | problem is the moz linux build is okay using the same profile | 07:59 |
| Ubulette | I'm wondering if any of you had been successful so far... | 08:00 |
| Jazzva | asac: Ok... | 08:05 |
| === Ubulette_ [n=Ubulette@APuteaux-153-1-54-49.w82-124.abo.wanadoo.fr] has joined #ubuntu-mozillateam | ||
| === cwong1_ [i=chatzill@nat/intel/x-4814527adcf19e4e] has joined #ubuntu-mozillateam | ||
| === cwong1__ [i=chatzill@nat/intel/x-3167203eae7dac42] has joined #ubuntu-mozillateam | ||
| === cwong1 [i=chatzill@nat/intel/x-3167203eae7dac42] has left #ubuntu-mozillateam [] | ||
| === Ubulette_ is now known as Ubulette | ||
| === cwong1 [i=chatzill@nat/intel/x-3167203eae7dac42] has joined #ubuntu-mozillateam | ||
| === Ubulette_ [n=Ubulette@APuteaux-153-1-27-9.w82-124.abo.wanadoo.fr] has joined #ubuntu-mozillateam | ||
| === Ubulette_ is now known as Ubulette | ||
| asac | cwong1: yt? | 10:23 |
| gnomefreak | im assuming hacking that patch caused everything else to fail | 10:23 |
| asac | yeah ... most likely | 10:23 |
| asac | how does the new patch look like? | 10:23 |
| gnomefreak | it doesnt i dropped it once everything else failed | 10:23 |
| asac | well thats sad | 10:23 |
| gnomefreak | i just removed the lines that they removed upstream | 10:23 |
| asac | you knew that you need that | 10:23 |
| gnomefreak | asac: the patch you have in granparadiso? | 10:23 |
| gnomefreak | or the one i hacked | 10:23 |
| asac | gnomefreak: he? | 10:23 |
| asac | i thought you dropped it in the end | 10:23 |
| === gnomefreak has backup patch | ||
| asac | ... so you didn't hack it | 10:23 |
| gnomefreak | asac: i dont do anything without a backup | 10:23 |
| asac | well ... it didn't apply right? | 10:23 |
| asac | then its not worth much :) | 10:23 |
| gnomefreak | it applied nothing else did | 10:23 |
| asac | telephone | 10:23 |
| Ubulette | ohoh, granparadiso talk. nice. | 10:23 |
| gnomefreak | Ubulette: not really but yes | 10:23 |
| Ubulette | did you read my message(s) 2h ago ? | 10:23 |
| gnomefreak | asac: after hacking the patch i get http://pastebin.mozilla.org/182125 | 10:23 |
| asac | 5 minutes | 10:23 |
| gnomefreak | Ubulette: yes | 10:23 |
| gnomefreak | take your time | 10:23 |
| === gnomefreak hates when upstream picks bits of patches and applys them, brb need a drink | ||
| === ubotu [n=ubotu@ubuntu/bot/ubotu] has joined #ubuntu-mozillateam | ||
| Ubulette | gnomefreak: so, what's your status on that ? mine is it builds fine and run fine but it fucked a few things up like bookmarks | 10:23 |
| Ubulette | i guess it's caused by the new "places" change | 10:23 |
| gnomefreak | Ubulette: thats a known issue to start with and im assuming you dropped patches? since patches are not appling | 10:23 |
| asac | most likely it crashes in cairo on shutdown | 10:23 |
| Ubulette | no. I jsut re-did the patches. didn't drop anything | 10:23 |
| Ubulette | I even had to add some patches to make the build succeed | 10:23 |
| Ubulette | (things that went perfectly well in a5 and a6) | 10:23 |
| cwong1 | asac: i am back | 10:23 |
| asac | phone call | 10:23 |
| Ubulette | asac, that's with ubuntu's cairo, not the one shipped with ff | 10:23 |
| asac | yes | 10:23 |
| asac | we want ubuntu one | 10:23 |
| Ubulette | oh, i see | 10:23 |
| asac | intetestingly, it doesnt't crash when started from dist/bin | 10:24 |
| asac | though system cairo is linked in | 10:24 |
| Ubulette | do you mean that's the only issue you have with a7 ? | 10:26 |
| asac | imo its make install that is broken | 10:26 |
| gnomefreak | asac: make install was just hacked | 10:26 |
| gnomefreak | brian or bob did it | 10:28 |
| asac | Ubulette: well its the blocker that holds back everything on trunk :) | 10:28 |
| asac | ok ... probably another call soon | 10:28 |
| asac | Ubulette: we have a patch that is ment to heal our make install once and forver | 10:28 |
| asac | Ubulette: however its somehow broken :) | 10:28 |
| asac | Ubulette: would be cool if you could try and see if you find the reason | 10:28 |
| gnomefreak | asac: thats should be easy enough fixed if you read my post above | 10:28 |
| asac | Ubulette: i won't have time today and tomorrow :) | 10:28 |
| asac | Ubulette: its the trunk branch in http://code.launchpad.net/~mozillateam | 10:28 |
| asac | iirc | 10:28 |
| asac | gnomefreak: he? | 10:28 |
| gnomefreak | https://bugzilla.mozilla.org/show_bug.cgi?id=389673 | 10:29 |
| ubotu | Mozilla bug 389673 in Build Config "Fix "make install" to copy from dist/ rather than recursive makefile traversal" [Normal,Resolved: fixed] | 10:29 |
| gnomefreak | asac: it was done after you made our patch | 10:29 |
| asac | gnomefreak: yes ... thats the fix | 10:29 |
| asac | whats about it? | 10:29 |
| asac | oh it landed? | 10:29 |
| gnomefreak | they applied it upstream | 10:29 |
| gnomefreak | in CVS | 10:29 |
| asac | damn | 10:29 |
| asac | now it happened | 10:29 |
| asac | well | 10:29 |
| gnomefreak | asac: they take bits and peices from what im seeing | 10:29 |
| asac | gnomefreak: does it give you an empty debian/tmp directory now? | 10:29 |
| gnomefreak | reason why none of my patches are working atm | 10:30 |
| asac | gnomefreak: ok ... let me do this then ... can you push a fresh trunk orig somewhere? | 10:30 |
| gnomefreak | asac: once i get it to build ill be glad to tell you | 10:30 |
| asac | once that is fixed we make paradiso out of it | 10:30 |
| gnomefreak | yes | 10:30 |
| asac | cwong1: can we talk about branch policy? | 10:30 |
| cwong1 | asac: yes | 10:31 |
| asac | ok ... lets assume i cherry-pick checkins to master | 10:31 |
| cwong1 | ok | 10:31 |
| asac | now we need to upgrade upstream branch as well | 10:31 |
| asac | what should i do? | 10:31 |
| gnomefreak | ok its building orig | 10:31 |
| asac | cwong1: my idea would be to rebase master ... and before that create a branch for backup purpose | 10:32 |
| asac | e.g. browser.1.8.1.5 | 10:32 |
| asac | damn ... phone call again | 10:32 |
| asac | 5 min | 10:32 |
| gnomefreak | lol | 10:32 |
| asac | cwong1: what do you thinK? | 10:40 |
| cwong1 | asac: Rebase master sounds ok with me. | 10:40 |
| asac | cwong1: yeah ... just to wanted to be sure, as i need to override that branch on pushing | 10:40 |
| asac | cwong1: which is why i would create a branch for every new release | 10:41 |
| cwong1 | asac: you do have permission to do it, right | 10:41 |
| cwong1 | ? | 10:41 |
| asac | cwong1: i guess i have | 10:41 |
| asac | cwong1: so master should point to the most current branch then, right? | 10:41 |
| cwong1 | asac: yes, this is what we are building our release with | 10:43 |
| Ubulette | asac, well, Just had a look at https://code.launchpad.net/~mozillateam/firefox/trunk and it seems I've already done all that to grandparadiso a7, except the big make install think (I've just fixed one Makefile in toolkit/xre causing build failure). Yet I have runtime issues. | 10:43 |
| asac | Ubulette: well .. what is *all* for you? | 10:43 |
| asac | cwong1: ok ... i will first update upstream branch | 10:43 |
| Ubulette | asac, your missing .ini files, the rework of fsh patche, etc. | 10:43 |
| cwong1 | asac: will you be able to get things push into the release bulid by end of day? | 10:47 |
| asac | i will try ... if no regressions pop-up it should be possible | 10:47 |
| cwong1 | I will check on the build tonight then. Thanks. Btw I got your mailing address, as soon as the unit comes in, I will send to you. | 10:47 |
| gnomefreak | ill have the orig up in under 5 minutes | 10:48 |
| asac | gnomefreak: thanks | 10:51 |
| gnomefreak | anytime | 10:51 |
| === gnomefreak made a Tarballs dir finally | ||
| gnomefreak | just have to push them there. | 10:52 |
| gnomefreak | asac: btw we are getting tight on time with upstream freeze (doesnt affect much of anything for us atm) but we are 3 releases behind on iceape (people are complaining) maybe ill grab 1.1.4 tarball and see what i can make happen, i would like to hear from mike about cal. before that if we can | 10:56 |
| gnomefreak | tonight sometime ill test build it | 10:56 |
| gnomefreak | hmmmm | 10:56 |
| asac | mike is unlikely to fix calendar before | 10:56 |
| gnomefreak | k | 10:56 |
| asac | cwong1: looking at http://www.moblin.org/repos/?p=projects/mobile-browser.git;a=shortlog;h=WORKING ... which patch(es) do we want to not include? | 10:56 |
| cwong1 | asac: the hildon patch that you have created. the rest are ok | 10:56 |
| asac | cwong1: just this: http://www.moblin.org/repos/?p=projects/mobile-browser.git;a=commit;h=c2f08ddfef5f24f37b0b929cdbb0c7727eb0165e | 10:57 |
| asac | or the infrastructure patch for hildon as well? | 10:57 |
| gnomefreak | asac: http://gnomefreak.youmortals.com/Tarballs/firefox-trunk_2.99+2cvs20070805.orig.tar.gz | 11:00 |
| gnomefreak | heading for smoke ill be back shortly | 11:00 |
| asac | gnomefreak: what branch do you work on ? mt trunk? | 11:00 |
| cwong1 | asac: the only patch we need to exclude is the nswindow.cpp change. The rest are ok. | 11:00 |
| asac | ok | 11:00 |
| Ubulette | well, seems I'm not going anywhere with my a7 issues. I guess there's no need for me to fight while you guys don't seems to be experiencing the same issues. I'll wait for your a7 diff to see what you did differently. | 11:00 |
| asac | Ubulette: he? | 11:07 |
| gnomefreak | asac: yes mt trunk atm | 11:07 |
| asac | Ubulette: what are your problems? | 11:07 |
| gnomefreak | mt trunk and mine are same | 11:07 |
| asac | Ubulette: missing bookmarks et al are due to the crashes | 11:08 |
| asac | Ubulette: do you start trunk build from console? | 11:08 |
| gnomefreak | asac: and profile issues as i recall start 2.0.0.6 close start 3.0a* close start 2.0.0.6 bookmarks tend to wind up gone as do the saved bookmarks on the tool bar but not all | 11:11 |
| === gnomefreak wonders if we can get 3.0 its own profile, atleast i dont remember seeing it | ||
| Ubulette | asac, I don't think my bookmark issue is caused by the crash as even after the crash, if I run my a6, your a5 or mozilla's a7, bookmarks are okay (same profile) | 11:15 |
| gnomefreak | Ubulette: thats not what everyone else is experencing | 11:15 |
| asac | Ubulette: have you tried to start from dist_bin in the build-tree ? | 11:15 |
| asac | dist/bin | 11:15 |
| asac | gnomefreak: well ... i have broken bookmarks too :) | 11:15 |
| gnomefreak | see | 11:15 |
| gnomefreak | :) | 11:15 |
| asac | gnomefreak: at least i had when i last could build this :) | 11:15 |
| Ubulette | asac, hmm, nope. I can't. I build all my stuff in a bootstrap | 11:15 |
| Ubulette | well, I can transfer the result. | 11:15 |
| gnomefreak | asac: yep as soon as i get it built or you we will test and see if making its own ~/mozilla dir to keep it separate see if it happens than | 11:15 |
| gnomefreak | im looking for mikes CVS link to iceape atm | 11:15 |
| asac | Ubulette: bootstrap? you mean chroot? | 11:15 |
| Ubulette | yep. very limited environment. Just base and builddeps | 11:15 |
| Ubulette | adnd tool chain of course | 11:15 |
| Ubulette | and | 11:15 |
| asac | right ... but if depends are there you should be able to chroot into it and run it | 11:15 |
| asac | last i looked what was in dist/bin worked well | 11:15 |
| asac | which means that make install is broken ... e.g. some jar is not packed up properly ... or some file is not copied et al | 11:15 |
| asac | would be cool if you can verify that starting from dist/bin still works | 11:15 |
| gnomefreak | asac: if you happen to stumble across mikes iceape CVS so i can pull in his debian dir to see if i can get this done for 1.1.4 few things im looking for with it, but i have to go out soon to pick up g/f | 11:16 |
| gnomefreak | hmmmmmm | 11:16 |
| gnomefreak | its a bit early to celebrate but looks good atm | 11:16 |
| asac | gnomefreak: calendar is broken | 11:16 |
| gnomefreak | i lied | 11:16 |
| asac | gnomefreak: thats the reason mike doesn't pull it in | 11:16 |
| gnomefreak | asac: we drop cal binaries | 11:16 |
| asac | gnomefreak: chances are 50% that it will return imo | 11:17 |
| asac | do what you want with that info | 11:17 |
| asac | i would drop iceape-calendar | 11:17 |
| gnomefreak | i agree | 11:17 |
| asac | but its your decision | 11:17 |
| gnomefreak | atleast until he fixes it | 11:17 |
| asac | mikes want to keep an empty package | 11:17 |
| gnomefreak | but once gutsy release we cant do anything | 11:17 |
| asac | which i don't really understand :) | 11:17 |
| gnomefreak | asac: pitti doesnt want that | 11:17 |
| gnomefreak | mike isnt uploading our packages | 11:18 |
| asac | gnomefreak: right ... its your package :) | 11:18 |
| asac | gnomefreak: decide what to do | 11:18 |
| === gnomefreak really not sure what to do atm | ||
| asac | gnomefreak: and bug me if i forget to upload something :) | 11:18 |
| asac | gnomefreak: i am here to upload for you | 11:18 |
| gnomefreak | ty | 11:18 |
| gnomefreak | ok ill see what i can do with current build updating to 1.1.4, but i still have trunk failing btw same patch | 11:20 |
| asac | cwong1: what i do in package is just create a link for /usr/share/midbrowser/icons/mozicon50.png /usr/share/pixmaps/midbrowser.png | 11:20 |
| asac | cwong1: is mozicon50.png already the right one? | 11:20 |
| gnomefreak | brb going to pick her up ill play with iceape tonight let me know if you get tarball for a7 gran... as mine failed | 11:22 |
| Ubulette | asac, it's a server, not a desktop so I can't (easily) run it from there. I can just transfer the chroot dir to my desktop, that's easy. | 11:22 |
| Ubulette | I'll do that asap | 11:22 |
| cwong1 | asac: I dont thinkg so | 11:22 |
| cwong1 | asac: I sent you a midbrowser.png last week. You should have an install rule to copy the one I sent to to /usr/share/pixmaps/midbrowser.png | 11:22 |
| cwong1 | s/to to/you to/ | 11:22 |
| asac | cwong1: ... we should fix the icon in midbrowser | 11:22 |
| cwong1 | asac: where should I by the new icon? | 11:23 |
| asac | cwong1: wait a second ... let me look | 11:24 |
| asac | cwong1: ok ... just replace the icons in browser/app | 11:25 |
| asac | the mozicon128.png ... mozicon50.xpm and mozicon16.xpm | 11:25 |
| asac | the others would be nice but are not required now | 11:25 |
| asac | let me know when you landed this on working branch .... or master branch | 11:26 |
| asac | cwong1: ^^ | 11:26 |
| cwong1 | I dont have the right size for those icons right now. Can I just use the one I sent you and update the rest when my graphic guy comes back with the right file? | 11:27 |
| asac | cwong1: you have 128 | 11:27 |
| asac | use gimp or something for mozicon50 xpm (48x48) and mozicon16.xpm (16x16) | 11:34 |
| asac | cwong1: wait a second ... i have them already :) | 11:34 |
| asac | cwong1: stupid me :) | 11:34 |
| cwong1 | asac: can you check them in then. | 11:34 |
| asac | yes | 11:39 |
| cwong1 | cool | 11:39 |
| asac | i have to wait till upstream checkout finieshes though | 11:39 |
| asac | because i cannot switch branch to where the icon is atm | 11:39 |
| cwong1 | ok | 11:39 |
| asac | cwong1: maybe you can write a script that exports master to some midbrowser-VERSION-source.tar.bz2 ? | 11:39 |
| cwong1 | asac: I can do that. Where should I keep the script? | 11:39 |
| asac | good question :) | 11:39 |
| asac | i think in our tree | 11:39 |
| asac | cwong1: please take care that the top-level directory is called mozilla/ | 11:39 |
| cwong1 | asac: are u suggesting to change our repsoitory name? | 11:43 |
| asac | no ... just when tarring up releases | 11:43 |
| cwong1 | asac: ah...ok | 11:43 |
| asac | its the style mozilla releases all their product | 11:43 |
| asac | so lets keep the line | 11:43 |
| cwong1 | asac: what about VERSION? Are we starting with 2.0.0.6? | 11:43 |
| asac | well ... this release will still be firefox ... i already have midbrowser/ tree ready ... then we can use our own versioning scheme | 11:43 |
| asac | currently midbrowser package in ubuntu is at something like 0.1 | 11:43 |
| asac | so we have options | 11:43 |
| cwong1 | should be start with 0.1 and increment every time we release a new one? | 11:43 |
| cwong1 | s/be/we/ | 11:43 |
| asac | cwong1: ok branch updated | 11:43 |
| asac | would be cool if you could provide me with an midbrowser-VERSION-source.tar.bz2 | 11:43 |
| asac | cwong1: oh wait :) | 11:43 |
| asac | cwong1: i have to rebase first | 11:43 |
| cwong1 | ok | 11:43 |
| cwong1 | ascii: Let me make sure I know what you want for midbrowser-VERSION-source.tar.bz2. | 11:50 |
| cwong1 | 1. Checkout the master branch and name the toplevel mozilla | 11:50 |
| cwong1 | 2. tar cvf midbrowser-0.2-source.tar | 11:50 |
| cwong1 | 3. bzip2 midbrowser-0.2-source.tar | 11:50 |
| cwong1 | Is that all you want? | 11:50 |
| asac | yes ... please remember to exclude .git dir | 11:51 |
| cwong1 | How do I send you the tar file? | 11:51 |
| asac | wait till i rebased :) | 11:54 |
| asac | cwong1: ok as you can see now here: http://www.moblin.org/repos/projects/mobile-browser.git/ ... we have master.1.8.1.5 | 11:54 |
| asac | lets see if pushing rebased master breakes anything :) ... cross-fingers | 11:55 |
| cwong1 | asac: I see it | 11:55 |
| asac | ok now cross-fingers | 11:55 |
| asac | cool master is rebsed | 11:56 |
| asac | and master.1.8.1.5 still has the old :) | 11:56 |
| asac | fine | 11:56 |
| cwong1 | 1.8.1.5 is just like a tag in cvs pointing to the old stuff, right? | 11:57 |
| asac | ok i will rebase working as well then | 11:57 |
| asac | i won't keep history for working/feature branches, ok? | 11:57 |
| asac | just for release branches | 11:57 |
| cwong1 | ok | 11:57 |
| asac | cwong1: well its a branch | 11:57 |
| asac | cwong1: its not a tag | 11:57 |
| asac | cwong1: but since we base development on it ... its ok imo | 11:57 |
| cwong1 | asac: as far as create the source.tar file, it seems to me it is easier for you to create it from your end so I don't have to manually put in on some external server for you to get it. What do u think? | 12:00 |
| asac | well ... i think that we should release official tar.bz2 balls from moblin if possible | 12:00 |
| asac | its bad practice to put something hand-baked into ubuntu | 12:01 |
| asac | its good to have a strict upstream/distribution border imo | 12:01 |
| asac | i can do that for now ... but we should think about it | 12:01 |
| asac | ok working is rebased as well | 12:02 |
| cwong1 | If I release it as source tar balls, how are you going to get the tarball and have it include into your build system? | 12:02 |
| asac | cwong1: Your mail to 'Umd-checkins' with the subject | 12:02 |
| asac | mobile-browser: Changes to 'UPSTREAM' | 12:02 |
| asac | Is being held until the list moderator can review it for approval. | 12:02 |
| asac | thats what i got? | 12:03 |
| asac | oh sorry | 12:03 |
| asac | message was too big :) | 12:03 |
| asac | nevermind | 12:03 |
| asac | cwong1: its the maintainer job to do that | 12:03 |
| asac | cwong1: its actually just a drop into a directory | 12:03 |
| asac | then build | 12:03 |
| cwong1 | asac: sorry I am new to this. I am still confuse here. | 12:06 |
| cwong1 | asac: what do you mean by just a drop into a drecotyr then build? | 12:06 |
| asac | cwong1: https://wiki.ubuntu.com/MozillaTeam/Build/Bzr?highlight=%28mozillateam%29 | 12:07 |
| asac | cwong1: so what you do is step II once for every upstream release | 12:08 |
| asac | and then you only do step II | 12:08 |
| asac | III (sorry) | 12:08 |
| asac | step II - Create new orig.tar.gz from upstream tarball | 12:08 |
| asac | step III - Build from bzr | 12:08 |
| cwong1 | hang on | 12:09 |
| asac | afaik there is even a rule in debian/rules that allows you to create the orig.tar.gz (step II) with one command | 12:09 |
| asac | but since its so trivial, i don't bother to remember | 12:09 |
| cwong1 | asac: back in 5 mins | 12:13 |
| Jazzva | asac: Hey, anything else to do :)? (except bugs, I'm gonna see the bughelper list now) | 12:22 |
| asac | Jazzva: hehe | 12:22 |
| asac | Jazzva: yes sure :) | 12:22 |
| asac | Jazzva: we need someone to maintain a set of .desktop file for firefox/mozilla extensions in ubuntu archive | 12:23 |
| Jazzva | Ok, I know a bit about .desktop files... | 12:24 |
| asac | nice | 12:24 |
| Jazzva | asac: The basics, though... But I guess I'll learn more :) | 12:24 |
| asac | let me search | 12:24 |
| asac | its pretty simple | 12:24 |
| asac | the most challenging thing is to extract or find an icon for each extension :) | 12:25 |
| Jazzva | Need to use original Mozilla artwork? | 12:25 |
| Jazzva | Or can I use other free icons on the net? | 12:26 |
| asac | no ... its assembling a list of extensions that have ubuntu packages | 12:26 |
| asac | then finding an icon for each extension | 12:26 |
| asac | e.g. greasemonkey has one inside i guess | 12:26 |
| Jazzva | Oh, I see.. | 12:26 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!