=== 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 === Admiral_Chicago_ [n=FreddyM@adsl-68-72-98-104.dsl.chcgil.ameritech.net] has joined #ubuntu-mozillateam === DarkMageZ [n=richard@238.101.233.220.exetel.com.au] has joined #ubuntu-mozillateam === jerome_ [n=jerome@gra94-2-82-66-142-60.fbx.proxad.net] has joined #ubuntu-mozillateam === ondra_AllPeers [n=smrt@81.104.95.80.ip.b26.cz] has joined #ubuntu-mozillateam [11:36] Admiral_Chicago: i sent him email to come here since i didnt have your email handy [11:38] asac: it failed same place same errors (just fyi) [11:49] hmm [11:49] k [11:50] should we try with a new tarball if they released one? [11:54] he? [11:54] is it official that that tarball doesn't build or what? [11:54] no === JakubLe [n=superman@81.104.95.80.ip.b26.cz] has joined #ubuntu-mozillateam === JakubLe [n=superman@81.104.95.80.ip.b26.cz] has left #ubuntu-mozillateam [] [12:25] heya [12:25] asac: news? [12:36] send [12:36] bluekuja: ^^^ [12:37] OoO [12:37] ;) [12:37] :) [12:37] lets see what happens [12:37] yea [12:38] asac: your mail rocks! [12:39] thanks a lot alex! :) [12:40] asac: ah [12:40] you forgot [12:40] to add motu-council [12:40] asac: so only gauvain will receive it [12:41] :D [12:41] bluekuja: i have replied all [12:41] mmm [12:41] otherwise gauvain hasn't send to mc [12:41] either [12:41] it doesn't appear in archive [12:41] bluekuja: its in CC [12:41] so all ok [12:41] ah yup [12:41] Cc: Andrea Veri , motu-council@lists.ubuntu.com, mantha@ubuntu.com, asac@ubuntu.com, vil@ubuntu.com, ivoks@ubuntu.com, zhengpeng-hou@ubuntu.com [12:41] you're right [12:41] did not see it [12:42] yup [12:42] ;) [12:50] should i be looking on MoM for merges? [12:51] mom or dad [12:51] better dad for now [12:52] so you can see if someone is already working on something [12:52] e.g you don't duplicate the work [12:53] gnomefreak, I'm leaving again for work [12:53] gonna be here later [12:53] so I can help you [12:53] :) [12:53] wher eis dad? [12:53] http://dad.dunnewind.net/universe.php [12:54] ty [12:54] np [12:54] :) [12:54] cya later! [12:57] yeah ... ubuntu mobile builds :) [12:57] aeh mobile browser i mean :) [01:00] it seems i still have 2 outstanding merges :( [01:00] asac: did you hear back on iceape-calendar from mike? [01:01] asac: also seems there is a new version of nspluginwrapper [01:05] thats odd === jerome_ [n=jerome@gra94-2-82-66-142-60.fbx.proxad.net] has joined #ubuntu-mozillateam [01:11] gnomefreak: he? [01:11] where is new nspluginwrapper? [01:11] ftp://ftp.fr.debian.org/debian/pool/contrib/n/nspluginwrapper/ [01:11] im grabbing diffs and source atm [01:11] what version? [01:12] vs. what is our ? [01:12] ours is .4-2 [01:13] new is -3 [01:13] so no new upstream [01:13] no [01:13] what does changelog say? [01:13] new debian, im looking [01:15] http://pastebin.mozilla.org/113904 === jerome_ [n=jerome@gra94-2-82-66-142-60.fbx.proxad.net] has joined #ubuntu-mozillateam [01:16] i can make these changes in our build change the version in changelog and poof done [01:17] that wont work [01:19] he added a symlink patch [01:20] gnomefreak: look at merges.ubuntu.com [01:20] take it from there if it already arrived and do the merge [01:20] so you keep our changes [01:21] i grabbed our source from repos [01:22] gnomefreak: we have it in bzr [01:22] yep there too [01:22] k [01:22] i am oout for lunch in a few [01:22] should i just move the changes they made to our package? [01:22] didn't have acigarette nor coffee ... and need to shop these now [01:23] you have to merge them [01:23] go have fun im still on coffee [01:23] happy gnomefreak [01:23] :) [01:28] k lunch === jerome_ [n=jerome@gra94-2-82-66-142-60.fbx.proxad.net] has joined #ubuntu-mozillateam [02:19] asac: https://bugs.launchpad.net/ubuntu/+source/nspluginwrapper/+bug/123533 let me know if it was done ok or wrong i tried following wiki and kind of hard (they shoot in all directions at one) [02:19] Launchpad bug 123533 in nspluginwrapper "nspluginwrapper merge new debian version" [Undecided,In progress] [02:20] gnomefreak: did you start from merges.ubuntu.com ? [02:20] DaD [02:20] he? [02:20] its not on merges.ubuntu.com [02:20] what does that mean? [02:20] http://dad.dunnewind.net/universe.php [02:20] its listed there [02:21] you purged my changes ... wait till it arrives on merges [02:21] if it ever will arrive [02:21] ... but i hope so [02:22] thought your changes were applied in debian when you last packaged it there [02:22] the only other change from ubuntu was the patch and they applied that in debian [02:23] i never pushed my changes to debian [02:23] you can see in diff that my changelog entry was removed by your merge [02:23] what is dad.dunnewind? [02:23] ah shit [02:24] dad tells you list of outstanding merges it reads from ftp.fr.debian.org [02:24] why does it exist? [02:24] i mean we have merges.ubuntu.com [02:24] asac: theres MoM DaD and merges.ubuntu.com [02:25] http://dad.dunnewind.net/nspluginwrapper/nspluginwrapper_0.9.91.4-2ubuntu2.patch [02:25] those are mandatory to preserve [02:25] according to changelog only [02:25] asac: nspluginwrapper sould not show up on merges.ubuntu.com as it has been merged already [02:25] nspluginwrapper-0.9.91.4.orig/utils/mkruntime.sh has been applied [02:25] gnomefreak: no it hasn't ... there is new debian release [02:25] so it should be there as well [02:26] as updated merges [02:27] anyway ... we don't really need that merge [02:27] the package doesn't bring any substantial new for us [02:27] k [02:27] but if you want to merge you have to move our diff to a patch in debian/patches/ [02:27] as debian now uses quild [02:27] quilt [02:27] MoM has a blacklist DaD doesnt reason why its not showing up on m.u.c [02:31] it turns out it shouldnt be merged that is why its not on m.u.c === jerome_ [n=jerome@gra94-2-82-66-142-60.fbx.proxad.net] has joined #ubuntu-mozillateam [02:48] hmm [02:48] intersting [02:49] gnomefreak: ok [02:49] i accept that for now [02:49] then just forget about dad :) [02:49] in future [02:50] k [02:52] ty, if you want i can re-add your changes than debdiff it [02:52] gnomefreak: just do the merge proper :) [02:52] readding manually is not proper [02:52] though it works :) [02:52] don't ask me how proper is ;) [02:52] lo [02:52] maybe its indeed manually [02:52] l [02:52] me neither :( [02:53] please figure out :) [02:53] so you can teach me ;) [02:53] k [02:53] i found the documentation completely incomprehensible [02:53] it is manually [02:53] asac: it is hard as hell to follow [02:54] thats how i ended up with what was attached to bug [02:54] what steps did you do? [02:55] ill grab bluekuja sometime this week and see if he can explain better (motu doestn seem to answer questions on some days) [02:55] bluekuja: ^^^ [02:55] please help! [02:55] i used 2 of the merging pages but i missed your changes i thought they were debian changes [02:55] but how did you miss them? [02:55] i mean the merge procedure should automatically merge them or bring you conflicts [02:55] still waking up [02:56] at that time atleast [02:56] gnomefreak: can you redo? [02:56] asac: not likely [02:56] and run script? [02:56] so i can see what you did? [02:56] asac: i can try, there is no script for merges other than to help with bug reporting and grabbing sources [02:58] i think since ubuntu changes you made were not in debian i have to ask for a sync unless i can do them myself [02:59] he? [02:59] thats nonsense [02:59] merging is about changes we have that debian hasn't [03:00] i know unless it was changed recently that is how it was done [03:01] used to be someone maybe motu or core would sync the 2 to add ubuntu changes or drop ubuntu changes [03:02] i think you don't understand [03:02] there should be no problem [03:02] if you follow merge procedure with dad [03:02] i looked at the .patch file and it has our changes [03:03] unless i really get something wrong [03:03] none of these links tell you anything about dad [03:04] and the merge isnt on MoM and as i understand it wont be [03:04] hmm ... can't use ask how to do a merge from dad? [03:04] s/use/you/ [03:04] i grabbed the source from ftp.fr.debian.... and apt-get ours [03:04] asac: i asked i didnt get an answer [03:05] thats way i said ^^ up there they dont answer questions on some days [03:07] gnomefreak: your question asked something trivial: if they added our changes ... but they didn't [03:07] they just took parts of our changes [03:07] not all [03:08] oh this script works really good :( [03:09] gnomefreak@GutsyGibbon:~/merges$ sh grab-merge.sh [03:09] Sure you want to delete all the files in /home/gnomefreak/merges [yn] ? y [03:09] so much for that idea === gnomefreak goes for smoke i may end up waiting for bluekuja [03:15] gnomefreak: that is right [03:15] you have to move the grag-merge.sh somewhere else [03:16] otherwise you will always whipe it [03:16] then you have to say [03:16] sh grab-merge.sh nspluginwrapper [03:16] asac: it wasnt grabbing sources like it should [03:16] it uses mom not dad [03:16] yeah [03:16] look into that script [03:16] should be easy to change [03:16] name it grab-merge-dad.sh [03:16] theres one for dad :) [03:16] yeah [03:16] use that [03:17] lol [03:20] this almost looks too easy === gnomefreak doesnt think its gonna do what i want but gonna try anyway [03:22] nope they just build it [03:24] seems the only conflict is debian/control [03:28] yeah ... you probably have to eliminate the change that was moved to debian/patches [03:28] just look at the debdiff [03:28] looking at report [03:28] actually the build should fail [03:28] because the new patch in debian/patches doesn't apply [03:29] only conflict that couldnt be fixe was control file [03:30] yeah build will fail [03:30] you have to unpatch the pristine source first [03:30] i have 2 patches here one with our changes and one with debian changes it looks like [03:30] e.g. remove the patch that moved to debian/patches [03:31] gnomefreak: move our patches to a patch in debian/patches/ [03:31] except the patch that has already been added there [03:32] hjmf_: there? [03:32] so i just more that file nspluginwrapper.....patch to the debian patches dir. after removing the part that they added [03:33] yes ... only diffs that don't apply to debian/ dir [03:33] of course [03:33] e.g. not the debian/control changes that are in that .patchj [03:33] those you need to apply manually again (if there are any) [03:33] k [03:34] do you see the difference? [03:34] there are changes against upstream sources ... and changes against debian/ [03:34] changes against upstream sources should now go to a patch [03:34] nspluginwrapper-0.9.91.4/src/npw-config.c upstream? [03:38] ok made changes to patch i guess go with the numbers they have 000 001 so make this 002 [03:39] like 002_ubuntu.diff === DarkMageZ [n=richard@238.101.233.220.exetel.com.au] has joined #ubuntu-mozillateam [03:43] name is 002_nsplugindir_install.diff [03:43] just ubuntu is lame [03:43] as it should go to debian as well at some point [03:49] ok im gonna try this see if it works and ill paste debdiff when done so you can make sure its right === gnomefre1k [n=gnomefre@adsl-221-44-127.rmo.bellsouth.net] has joined #ubuntu-mozillateam === gnomefreak [n=gnomefre@ubuntu/member/gnomefreak] has joined #ubuntu-mozillateam [04:03] ok that sucked === jerome_ [n=jerome@gra94-2-82-66-142-60.fbx.proxad.net] has joined #ubuntu-mozillateam === jerome_ [n=jerome@gra94-2-82-66-142-60.fbx.proxad.net] has joined #ubuntu-mozillateam [04:13] should i debdiff debians .dsc and new or our old .dsc and new? [04:16] both [04:16] and paste somewhere before uploading [04:18] ok but the 2 mihgt conflict [04:21] ok here is debdiff using 4-2ubuntu2 and 4-3ubuntu1 http://pastebin.mozilla.org/113943 [04:23] this one is debiands 4-3 against our 4-3ubuntu1 http://pastebin.mozilla.org/113944 [04:23] im gonna assume the first one is all that is needed [04:24] gnomefreak: looks almost good [04:24] howver you kept debian/ changes in patch [04:24] they don't belong there [04:24] only upstream changes as i said :) [04:25] and you didn't remove the changes that are applied in debian for it [04:25] so in general the build should fail [04:25] like it is [04:25] please fix those [04:25] and you didn't wipe our changes against upstream: nspluginwrapper-0.9.91.4.orig/src/npw-config.c [04:26] those will make the patch fail as well [04:27] that patch you added was it applie upstream? [04:29] http://pastebin.mozilla.org/113945 is the patch i added [04:29] the npw-config is the change you added that i left out in first debdiff this morning [04:31] ok i just removed the ialibs as you stated in your changelog entry [04:31] gnomefreak: no nothing was applied upstream [04:32] just the javascript stuff was added to debian/patches/ [04:32] (if you consider this upstream) [04:33] http://pastebin.mozilla.org/113945 doesnt show javascript so im confused [04:33] ^^ patch that i added to debian/patches [04:33] sorry i mean .sh [04:33] shell [04:33] not javascript [04:33] ah the last part [04:34] ok so i pull the last part out of patch [04:35] asac: line 42-44 shoudl i drop those also? [04:35] or even 40-44 [04:36] he? [04:36] that belongs to a diff against debian/ [04:36] its nothing that you could drop [04:36] its part of the diff of nspluginwrapper-0.9.91.4/debian/changelog [04:36] so leave # [04:36] so leave only in patch2: [04:36] # [04:36] unchanged: [04:37] that was odd [04:37] no ... those can be removed [04:37] right [04:37] ok [04:37] please verify that the 45-end patch is [04:37] in debian/patches/ [04:37] ... though i think it its [04:38] not with that name [04:38] only 2 patches other than ours [04:39] onlly symlink patch, the bashism patch and the one i just added [04:40] inside them none has anything that looks like 45-end [04:40] gnomefreak: its in bashism patch [04:40] ah ok [04:40] just check that that hunk is there as well [04:40] yes its there [04:40] k [04:41] you verified that the *hunk* is there as well? [04:41] looking [04:41] then all is fine [04:41] show me updated debdiffs against debian when ready [04:41] im not seeing it [04:42] http://pastebin.mozilla.org/113947 is the bashism patch [04:43] gnomefreak: its in there [04:43] try to find it :) [04:43] where? [04:43] its the error hunk [04:43] line 12ff [04:44] where did you get 45-end though? [04:44] http://pastebin.mozilla.org/113945 [04:44] ?? [04:45] dont know [04:45] then i don't understand your question [04:45] its in there [04:45] starting from line 45 [04:45] ... its cruft [04:45] oh [04:45] that has to go [04:45] as its in the patch you just showed me [04:45] 45 on debdiff paste [04:45] yes [04:46] oh ok well im gening another debdiff [04:46] if you are done there should be no diff against any upstream sources in the debdiff of debian vs. ubuntu(new) [04:46] ok [04:46] cool [04:47] and you want debain4-3 4-3ubuntu1 diff ? or 4-2ubuntu2 4-3ubuntu1 diff? [04:47] 2nd one is the biggest [04:48] example you want debdiff nspluginwrapper_0.9.91.4-2ubuntu2.dsc nspluginwrapper_0.9.91.4-3ubuntu1.dsc > nspluginwrapper_0.9.91.4.debdiff? [04:49] this merge script grabs 3 or 4 .dsc plus the one i made [04:51] http://pastebin.mozilla.org/113952 is the debdiff from command above [04:54] -Xs-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/nspluginwrapper/ubuntu [04:55] that was dropped [04:55] bad [04:55] +Depends: ${shlibs:Depends}, ia32-libs, ia32-libs-gtk, linux32 [04:55] gtk doesn't exist for us [04:55] so remove that [04:55] ok now show me diff against debian version [04:56] e.g. once you fixed both above [04:56] ok [04:57] you want me to leave ia32-libs or drop that also? [04:57] i cant access the link you gave [05:00] just what i said [05:00] gtk [05:01] gnomefreak: you can change the url to use code.launchpad.net instead of bazaar.launchpad.net [05:01] while yuo are at it [05:02] in the link you gave? [05:02] so you visit that url with browser as well [05:02] its not a link [05:02] its a diff [05:02] that you dropped [05:02] look at your debdiff [05:02] its removed [05:02] it has to stay [05:02] and maybe replace bazaar with code [05:06] http://pastebin.mozilla.org/113956 here is the ubuntu version to ubuntu version [05:07] http://pastebin.mozilla.org/113957 debian version against new ubuntu version [05:07] brb smoke [05:08] gnomefreak: you still have dropped the bzr link [05:09] and you still have nspluginwrapper-0.9.91.4/utils/mkruntime.sh [05:09] changes [05:10] did you do anything? [05:10] or are those links the old ones? [05:10] same goes for nspluginwrapper-0.9.91.4/src/npw-config.c [05:10] its still in there [05:10] drop that also? [05:10] all from 120-bottom [05:10] in http://pastebin.mozilla.org/113957 [05:11] has to go [05:11] hey ... thats what i was talking about all the time ;) [05:11] i never had the bzr link in there [05:11] yes ... which was wrong :) [05:11] we need it [05:11] as it was in the previous ubuntu version [05:11] where? [05:12] look at the ubuntu/ubuntu debdiff [05:12] and you will see [05:12] oh that one [05:15] http://pastebin.mozilla.org/113959 asac that is the patch i used the .sh part was dropped already [05:15] not understanding why diff is nt picking that up [05:15] isnt [05:15] gnomefreak: please reconsider this: we don't want *any* diffs that are not in debian/ directoy [05:16] if i drop nspluginwrapper-0.9.91.4/src/npw-config.c only thing left in patch is changelog [05:16] gnomefreak: since you added the right diff to debian/patches [05:16] gnomefreak: start from beginning [05:16] you messed things up [05:16] either you dropped the patch in debian/patches again [05:16] cd into debian and run debdiff ~/merges/nspluginwrapper....dsc other one [05:17] gnomefreak: you probably updated debian then [05:17] e.g. by accident [05:17] be sure that you have unmodified debian [05:17] a few minutes ago you had this: http://pastebin.mozilla.org/113956 [05:18] which has nspluginwrapper-0.9.91.4.orig/debian/patches/002_nsplugindir_install.diff [05:18] which is not in debian by definition [05:18] if that isn't showing up in your debdiffs then you definitly messed areound with original debian [05:18] unless you don't have it anymore now [05:18] its still in debian dir [05:18] debian/patches [05:19] get a clean debian version [05:19] ive been editing it as i go [05:19] if its not showing up then you copied it to debian's directory tree [05:19] at some point [05:20] perserve your new ubuntu version ... then wipe everything and get a clean debian one again [05:20]