[11:36] <gnomefreak> Admiral_Chicago: i sent him email to come here since i didnt have your email handy
[11:38] <gnomefreak> asac: it failed same place same errors (just fyi)
[11:49] <asac> hmm
[11:49] <asac> k
[11:50] <gnomefreak> should we try with a new tarball if they released one?
[11:54] <asac> he?
[11:54] <asac> is it official that that tarball doesn't build or what?
[11:54] <gnomefreak> no
[12:25] <bluekuja> heya
[12:25] <bluekuja> asac: news?
[12:36] <asac> send
[12:36] <asac> bluekuja: ^^^
[12:37] <asac> OoO
[12:37] <asac> ;)
[12:37] <bluekuja> :)
[12:37] <asac> lets see what happens
[12:37] <bluekuja> yea
[12:38] <bluekuja> asac: your mail rocks!
[12:39] <bluekuja> thanks a lot alex! :)
[12:40] <bluekuja> asac: ah
[12:40] <bluekuja> you forgot
[12:40] <bluekuja> to add motu-council
[12:40] <bluekuja> asac: so only gauvain will receive it
[12:41] <bluekuja> :D
[12:41] <asac> bluekuja: i have replied all
[12:41] <bluekuja> mmm
[12:41] <asac> otherwise gauvain hasn't send to mc
[12:41] <asac> either
[12:41] <bluekuja> it doesn't appear in archive
[12:41] <asac> bluekuja: its in CC
[12:41] <asac> so all ok
[12:41] <bluekuja> ah yup
[12:41] <asac> Cc: Andrea Veri <bluekuja@ubuntu.com>, motu-council@lists.ubuntu.com, mantha@ubuntu.com, asac@ubuntu.com, vil@ubuntu.com, ivoks@ubuntu.com, zhengpeng-hou@ubuntu.com
[12:41] <bluekuja> you're right
[12:41] <bluekuja> did not see it
[12:42] <bluekuja> yup
[12:42] <bluekuja> ;)
[12:50] <gnomefreak> should i be looking on MoM for merges?
[12:51] <bluekuja> mom or dad
[12:51] <bluekuja> better dad for now
[12:52] <bluekuja> so you can see if someone is already working on something
[12:52] <bluekuja> e.g you don't duplicate the work
[12:53] <bluekuja> gnomefreak, I'm leaving again for work
[12:53] <bluekuja> gonna be here later
[12:53] <bluekuja> so I can help you
[12:53] <bluekuja> :)
[12:53] <gnomefreak> wher eis dad?
[12:53] <bluekuja> http://dad.dunnewind.net/universe.php
[12:54] <gnomefreak> ty
[12:54] <bluekuja> np
[12:54] <bluekuja> :)
[12:54] <bluekuja> cya later!
[12:57] <asac> yeah ... ubuntu mobile builds :)
[12:57] <asac> aeh mobile browser i mean :)
[01:00] <gnomefreak> it seems i still have 2 outstanding merges :(
[01:00] <gnomefreak> asac: did you hear back on iceape-calendar from mike?
[01:01] <gnomefreak> asac: also seems there is a new version of nspluginwrapper
[01:05] <gnomefreak> thats odd
[01:11] <asac> gnomefreak: he?
[01:11] <asac> where is new nspluginwrapper?
[01:11] <gnomefreak> ftp://ftp.fr.debian.org/debian/pool/contrib/n/nspluginwrapper/
[01:11] <gnomefreak> im grabbing diffs and source atm
[01:11] <asac> what version?
[01:12] <asac> vs. what is our ?
[01:12] <gnomefreak> ours is .4-2
[01:13] <gnomefreak> new is -3
[01:13] <asac> so no new upstream
[01:13] <gnomefreak> no
[01:13] <asac> what does changelog say?
[01:13] <gnomefreak> new debian, im looking
[01:15] <gnomefreak> http://pastebin.mozilla.org/113904
[01:16] <gnomefreak> i can make these changes in our build change the version in changelog and poof done
[01:17] <gnomefreak> that wont work
[01:19] <gnomefreak> he added a symlink patch
[01:20] <asac> gnomefreak: look at merges.ubuntu.com
[01:20] <asac> take it from there if it already arrived and do the merge
[01:20] <asac> so you keep our changes
[01:21] <gnomefreak> i grabbed our source from repos
[01:22] <asac> gnomefreak: we have it in bzr
[01:22] <gnomefreak> yep there too
[01:22] <asac> k
[01:22] <asac> i am oout for lunch in a few
[01:22] <gnomefreak> should i just move the changes they made to our package?
[01:22] <asac> didn't have acigarette nor coffee ... and need to shop these now
[01:23] <asac> you have to merge them
[01:23] <gnomefreak> go have fun im still on coffee
[01:23] <asac> happy gnomefreak
[01:23] <gnomefreak> :)
[01:28] <asac> k lunch
[02:19] <gnomefreak> 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] <ubotu> Launchpad bug 123533 in nspluginwrapper "nspluginwrapper merge new debian version" [Undecided,In progress] 
[02:20] <asac> gnomefreak: did you start from merges.ubuntu.com ?
[02:20] <gnomefreak> DaD
[02:20] <asac> he?
[02:20] <gnomefreak> its not on merges.ubuntu.com
[02:20] <asac> what does that mean?
[02:20] <gnomefreak> http://dad.dunnewind.net/universe.php
[02:20] <gnomefreak> its listed there
[02:21] <asac> you purged my changes ... wait till it arrives on merges
[02:21] <asac> if it ever will arrive
[02:21] <asac> ... but i hope so
[02:22] <gnomefreak> thought your changes were applied in debian when you last packaged it there
[02:22] <gnomefreak> the only other change from ubuntu was the patch and they applied that in debian
[02:23] <asac> i never pushed my changes to debian
[02:23] <asac> you can see in diff that my changelog entry was removed by your merge
[02:23] <asac> what is dad.dunnewind?
[02:23] <gnomefreak> ah shit
[02:24] <gnomefreak> dad tells you list of outstanding merges it reads from ftp.fr.debian.org
[02:24] <asac> why does it exist?
[02:24] <asac> i mean we have merges.ubuntu.com
[02:24] <gnomefreak> asac: theres MoM DaD and merges.ubuntu.com
[02:25] <asac> http://dad.dunnewind.net/nspluginwrapper/nspluginwrapper_0.9.91.4-2ubuntu2.patch
[02:25] <asac> those are mandatory to preserve
[02:25] <asac> according to changelog only
[02:25] <gnomefreak> asac: nspluginwrapper sould not show up on merges.ubuntu.com as it has been merged already
[02:25] <asac> nspluginwrapper-0.9.91.4.orig/utils/mkruntime.sh has been applied
[02:25] <asac> gnomefreak: no it hasn't ... there is new debian release
[02:25] <asac> so it should be there as well
[02:26] <asac> as updated merges
[02:27] <asac> anyway ... we don't really need that merge
[02:27] <asac> the package doesn't bring any substantial new for us
[02:27] <gnomefreak> k
[02:27] <asac> but if you want to merge you have to move our diff to a patch in debian/patches/
[02:27] <asac> as debian now uses quild
[02:27] <asac> quilt
[02:27] <gnomefreak> MoM has a blacklist DaD doesnt reason why its not showing up on m.u.c
[02:31] <gnomefreak> it turns out it shouldnt be merged that is why its not on m.u.c
[02:48] <asac> hmm
[02:48] <asac> intersting
[02:49] <asac> gnomefreak: ok
[02:49] <asac> i accept that for now
[02:49] <asac> then just forget about dad :)
[02:49] <asac> in future
[02:50] <gnomefreak> k
[02:52] <gnomefreak> ty, if you want i can re-add your changes than debdiff it
[02:52] <asac> gnomefreak: just do the merge proper :)
[02:52] <asac> readding manually is not proper
[02:52] <asac> though it works :)
[02:52] <asac> don't ask me how proper is ;)
[02:52] <gnomefreak> lo
[02:52] <asac> maybe its indeed manually
[02:52] <gnomefreak> l
[02:52] <gnomefreak> me neither :(
[02:53] <asac> please figure out :)
[02:53] <asac> so you can teach me ;)
[02:53] <gnomefreak> k
[02:53] <asac> i found the documentation completely incomprehensible
[02:53] <gnomefreak> it is manually
[02:53] <gnomefreak> asac: it is hard as hell to follow
[02:54] <gnomefreak> thats how i ended up with what was attached to bug
[02:54] <asac> what steps did you do?
[02:55] <gnomefreak> ill grab bluekuja sometime this week and see if he can explain better (motu doestn seem to answer questions on some days)
[02:55] <asac> bluekuja: ^^^
[02:55] <asac> please help!
[02:55] <gnomefreak> i used 2 of the merging pages but i missed your changes i thought they were debian changes
[02:55] <asac> but how did you miss them?
[02:55] <asac> i mean the merge procedure should automatically merge them or bring you conflicts
[02:55] <gnomefreak> still waking up
[02:56] <gnomefreak> at that time atleast
[02:56] <asac> gnomefreak: can you redo?
[02:56] <gnomefreak> asac: not likely
[02:56] <asac> and run script?
[02:56] <asac> so i can see what you did?
[02:56] <gnomefreak> asac: i can try, there is no script for merges other than to help with bug reporting and grabbing sources
[02:58] <gnomefreak> 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] <asac> he?
[02:59] <asac> thats nonsense
[02:59] <asac> merging is about changes we have that debian hasn't
[03:00] <gnomefreak> i know unless it was changed recently that is how it was done
[03:01] <gnomefreak> used to be someone maybe motu or core would sync the 2 to add ubuntu changes or drop ubuntu changes
[03:02] <asac> i think you don't understand
[03:02] <asac> there should be no problem
[03:02] <asac> if you follow merge procedure with dad
[03:02] <asac> i looked at the .patch file and it has our changes
[03:03] <asac> unless i really get something wrong
[03:03] <gnomefreak> none of these links tell you anything about dad
[03:04] <gnomefreak> and the merge isnt on MoM and as i understand it wont be
[03:04] <asac> hmm ... can't use ask how to do a merge from dad?
[03:04] <asac> s/use/you/
[03:04] <gnomefreak> i grabbed the source from ftp.fr.debian.... and apt-get ours
[03:04] <gnomefreak> asac: i asked i didnt get an answer
[03:05] <gnomefreak> thats way i said ^^ up there they dont answer questions on some days
[03:07] <asac> gnomefreak: your question asked something trivial: if they added our changes ... but they didn't
[03:07] <asac> they just took parts of our changes
[03:07] <asac> not all
[03:08] <gnomefreak> oh this script works really good :(
[03:09] <gnomefreak> gnomefreak@GutsyGibbon:~/merges$ sh grab-merge.sh
[03:09] <gnomefreak> Sure you want to delete all the files in /home/gnomefreak/merges [yn] ? y
[03:09] <gnomefreak> so much for that idea
[03:15] <asac> gnomefreak: that is right
[03:15] <asac> you have to move the grag-merge.sh somewhere else
[03:16] <asac> otherwise you will always whipe it
[03:16] <asac> then you have to say
[03:16] <asac> sh grab-merge.sh nspluginwrapper
[03:16] <gnomefreak> asac: it wasnt grabbing sources like it should
[03:16] <gnomefreak> it uses mom not dad
[03:16] <asac> yeah
[03:16] <asac> look into that script
[03:16] <asac> should be easy to change
[03:16] <asac> name it grab-merge-dad.sh
[03:16] <gnomefreak> theres one for dad :)
[03:16] <asac> yeah
[03:16] <asac> use that
[03:17] <gnomefreak> lol
[03:20] <gnomefreak> this almost looks too easy
[03:22] <gnomefreak> nope they just build it
[03:24] <gnomefreak> seems the only conflict is debian/control
[03:28] <asac> yeah ... you probably have to eliminate the change that was moved to debian/patches
[03:28] <asac> just look at the debdiff
[03:28] <gnomefreak> looking at report
[03:28] <asac> actually the build should fail
[03:28] <asac> because the new patch in debian/patches doesn't apply
[03:29] <gnomefreak> only conflict that couldnt be fixe was control file
[03:30] <asac> yeah build will fail
[03:30] <asac> you have to unpatch the pristine source first
[03:30] <gnomefreak> i have 2 patches here one with our changes and one with debian changes it looks like
[03:30] <asac> e.g. remove the patch that moved to debian/patches
[03:31] <asac> gnomefreak: move our patches to a patch in debian/patches/
[03:31] <asac> except the patch that has already been added there
[03:32] <asac> hjmf_: there?
[03:32] <gnomefreak> so i just more that file nspluginwrapper.....patch to the debian patches dir. after removing the part that they added
[03:33] <asac> yes ... only diffs that don't apply to debian/ dir
[03:33] <asac> of course
[03:33] <asac> e.g. not the debian/control changes that are in that .patchj
[03:33] <asac> those you need to apply manually again (if there are any)
[03:33] <gnomefreak> k
[03:34] <asac> do you see the difference?
[03:34] <asac> there are changes against upstream sources ... and changes against debian/
[03:34] <asac> changes against upstream sources should now go to a patch
[03:34] <gnomefreak> nspluginwrapper-0.9.91.4/src/npw-config.c   upstream?
[03:38] <gnomefreak> ok made changes to patch i guess go with the numbers they have 000 001 so make this 002
[03:39] <gnomefreak> like 002_ubuntu.diff
[03:43] <asac> name is 002_nsplugindir_install.diff
[03:43] <asac> just ubuntu is lame
[03:43] <asac> as it should go to debian as well at some point
[03:49] <gnomefreak> ok im gonna try this see if it works and ill paste debdiff when done so you can make sure its right
[04:03] <gnomefreak> ok that sucked
[04:13] <gnomefreak> should i debdiff debians .dsc and new or our old .dsc and new?
[04:16] <asac> both
[04:16] <asac> and paste somewhere before uploading
[04:18] <gnomefreak> ok but the 2 mihgt conflict
[04:21] <gnomefreak> ok here is debdiff using 4-2ubuntu2 and 4-3ubuntu1 http://pastebin.mozilla.org/113943
[04:23] <gnomefreak> this one is debiands 4-3 against our 4-3ubuntu1 http://pastebin.mozilla.org/113944
[04:23] <gnomefreak> im gonna assume the first one is all that is needed
[04:24] <asac> gnomefreak: looks almost good
[04:24] <asac> howver you kept debian/ changes in patch
[04:24] <asac> they don't belong there
[04:24] <asac> only upstream changes as i said :)
[04:25] <asac> and you didn't remove the changes that are applied in debian for it
[04:25] <asac> so in general the build should fail
[04:25] <asac> like it is
[04:25] <asac> please fix those
[04:25] <asac> and you didn't wipe our changes against upstream: nspluginwrapper-0.9.91.4.orig/src/npw-config.c
[04:26] <asac> those will make the patch fail as well
[04:27] <gnomefreak> that patch you added was it applie upstream?
[04:29] <gnomefreak> http://pastebin.mozilla.org/113945 is the patch i added
[04:29] <gnomefreak> the npw-config is the change you added that i left out in first debdiff this morning
[04:31] <gnomefreak> ok i just removed the ialibs as you stated in your changelog entry
[04:31] <asac> gnomefreak: no nothing was applied upstream
[04:32] <asac> just the javascript stuff was added to debian/patches/
[04:32] <asac> (if you consider this upstream)
[04:33] <gnomefreak> http://pastebin.mozilla.org/113945 doesnt show javascript so im confused
[04:33] <gnomefreak> ^^ patch that i added to debian/patches
[04:33] <asac> sorry i mean .sh
[04:33] <asac> shell
[04:33] <asac> not javascript
[04:33] <gnomefreak> ah the last part
[04:34] <gnomefreak> ok so i pull the last part out of patch
[04:35] <gnomefreak> asac: line 42-44 shoudl i drop those also?
[04:35] <gnomefreak> or even 40-44
[04:36] <asac> he?
[04:36] <asac> that belongs to a diff against debian/
[04:36] <asac> its nothing that you could drop
[04:36] <asac> its part of the diff of nspluginwrapper-0.9.91.4/debian/changelog
[04:36] <gnomefreak> so leave #
[04:36] <gnomefreak> so leave only in patch2:
[04:36] <gnomefreak> #
[04:36] <gnomefreak> unchanged:
[04:37] <gnomefreak> that was odd
[04:37] <asac> no ... those can be removed
[04:37] <asac> right
[04:37] <gnomefreak> ok
[04:37] <asac> please verify that the 45-end patch is
[04:37] <asac> in debian/patches/
[04:37] <asac> ... though i think it its
[04:38] <gnomefreak> not with that name
[04:38] <gnomefreak> only 2 patches other than ours
[04:39] <gnomefreak> onlly symlink patch, the bashism patch and the one i just added
[04:40] <gnomefreak> inside them none has anything that looks like 45-end
[04:40] <asac> gnomefreak: its in bashism patch
[04:40] <gnomefreak> ah ok
[04:40] <asac> just check that that hunk is there as well
[04:40] <gnomefreak> yes its there
[04:40] <gnomefreak> k
[04:41] <asac> you verified that the *hunk* is there as well?
[04:41] <gnomefreak> looking
[04:41] <asac> then all is fine
[04:41] <asac> show me updated debdiffs against debian when ready
[04:41] <gnomefreak> im not seeing it
[04:42] <gnomefreak> http://pastebin.mozilla.org/113947 is the bashism patch
[04:43] <asac> gnomefreak: its in there
[04:43] <asac> try to find it :)
[04:43] <gnomefreak> where?
[04:43] <asac> its the error hunk
[04:43] <asac> line 12ff
[04:44] <gnomefreak> where did you get 45-end though?
[04:44] <asac> http://pastebin.mozilla.org/113945
[04:44] <asac> ??
[04:45] <gnomefreak> dont know
[04:45] <asac> then i don't understand your question
[04:45] <asac> its in there
[04:45] <asac> starting from line 45
[04:45] <asac> ... its cruft
[04:45] <gnomefreak> oh
[04:45] <asac> that has to go
[04:45] <asac> as its in the patch you just showed me
[04:45] <gnomefreak> 45 on debdiff paste
[04:45] <asac> yes
[04:46] <gnomefreak> oh ok well im gening another debdiff
[04:46] <asac> if you are done there should be no diff against any upstream sources in the debdiff of debian vs. ubuntu(new)
[04:46] <asac> ok
[04:46] <asac> cool
[04:47] <gnomefreak> and you want debain4-3 4-3ubuntu1 diff ? or 4-2ubuntu2 4-3ubuntu1 diff?
[04:47] <gnomefreak> 2nd one is the biggest
[04:48] <gnomefreak> 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] <gnomefreak> this merge script grabs 3 or 4 .dsc plus the one i made
[04:51] <gnomefreak> http://pastebin.mozilla.org/113952 is the debdiff from command above
[04:54] <asac> -Xs-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/nspluginwrapper/ubuntu
[04:55] <asac> that was dropped
[04:55] <asac> bad
[04:55] <asac> +Depends: ${shlibs:Depends}, ia32-libs, ia32-libs-gtk, linux32
[04:55] <asac> gtk doesn't exist for us
[04:55] <asac> so remove that
[04:55] <asac> ok now show me diff against debian version
[04:56] <asac> e.g. once you fixed both above
[04:56] <gnomefreak> ok
[04:57] <gnomefreak> you want me to leave ia32-libs or drop that also?
[04:57] <gnomefreak> i cant access the link you gave
[05:00] <asac> just what i said
[05:00] <asac> gtk
[05:01] <asac> gnomefreak: you can change the url to use code.launchpad.net instead of bazaar.launchpad.net
[05:01] <asac> while yuo are at it
[05:02] <gnomefreak> in the link you gave?
[05:02] <asac> so you visit that url with browser as well
[05:02] <asac> its not a link
[05:02] <asac> its a diff
[05:02] <asac> that you dropped
[05:02] <asac> look at your debdiff
[05:02] <asac> its removed
[05:02] <asac> it has to stay
[05:02] <asac> and maybe replace bazaar with code
[05:06] <gnomefreak> http://pastebin.mozilla.org/113956 here is the ubuntu version to ubuntu version
[05:07] <gnomefreak> http://pastebin.mozilla.org/113957 debian version against new ubuntu version
[05:07] <gnomefreak> brb smoke
[05:08] <asac> gnomefreak: you still have dropped the bzr link
[05:09] <asac> and you still have nspluginwrapper-0.9.91.4/utils/mkruntime.sh
[05:09] <asac> changes
[05:10] <asac> did you do anything?
[05:10] <asac> or are those links the old ones?
[05:10] <asac> same goes for nspluginwrapper-0.9.91.4/src/npw-config.c
[05:10] <asac> its still in there
[05:10] <gnomefreak> drop that also?
[05:10] <asac> all from 120-bottom
[05:10] <asac> in http://pastebin.mozilla.org/113957
[05:11] <asac> has to go
[05:11] <asac> hey ... thats what i was talking about all the time ;)
[05:11] <gnomefreak> i never had the bzr link in there
[05:11] <asac> yes ... which was wrong :)
[05:11] <asac> we need it
[05:11] <asac> as it was in the previous ubuntu version
[05:11] <gnomefreak> where?
[05:12] <asac> look at the ubuntu/ubuntu debdiff
[05:12] <asac> and you will see
[05:12] <gnomefreak> oh that one
[05:15] <gnomefreak> http://pastebin.mozilla.org/113959 asac that is the patch i used the .sh part was dropped already
[05:15] <gnomefreak> not understanding why diff is nt picking that up
[05:15] <gnomefreak> isnt
[05:15] <asac> gnomefreak: please reconsider this: we don't want *any* diffs that are not in debian/ directoy
[05:16] <gnomefreak> if i drop nspluginwrapper-0.9.91.4/src/npw-config.c only thing left in patch is changelog
[05:16] <asac> gnomefreak: since you added the right diff to debian/patches
[05:16] <asac> gnomefreak: start from beginning
[05:16] <asac> you messed things up
[05:16] <asac> either you dropped the patch in debian/patches again
[05:16] <gnomefreak> cd into debian and run debdiff ~/merges/nspluginwrapper....dsc other one
[05:17] <asac> gnomefreak: you probably updated debian then
[05:17] <asac> e.g. by accident
[05:17] <asac> be sure that you have unmodified debian
[05:17] <asac> a few minutes ago you had this: http://pastebin.mozilla.org/113956
[05:18] <asac> which has nspluginwrapper-0.9.91.4.orig/debian/patches/002_nsplugindir_install.diff
[05:18] <asac> which is not in debian by definition
[05:18] <asac> if that isn't showing up in your debdiffs then you definitly messed areound with original debian
[05:18] <asac> unless you don't have it anymore now
[05:18] <gnomefreak> its still in debian dir
[05:18] <gnomefreak> debian/patches
[05:19] <asac> get a clean debian version
[05:19] <gnomefreak> ive been editing it as i go
[05:19] <asac> if its not showing up then you copied it to debian's directory tree
[05:19] <asac> at some point
[05:20] <asac> perserve your new ubuntu version ... then wipe everything and get a clean debian one again
[05:20] <asac> gnomefreak: i have no idea what you did
[05:20] <asac> 10 minutes ago your debdiffs looked good
[05:21] <asac> please be sure that you don't mix something up
[05:22] <gnomefreak> starting over and just gonna bring stuff over as needed
[05:23] <asac> what do you mean by starting over?
[05:23] <asac> its not just "bringing over" ... its reverting changes as well
[05:23] <asac> so you don't have any diffs against non debian/... dirs
[05:23] <gnomefreak> re ran script to grab sources
[05:23] <asac> ok
[05:23] <gnomefreak> starting clean
[05:24] <gnomefreak> ok you want nspluginwrapper-0.9.91.4/src/npw-config.c taken out of patch?
[05:24] <asac> everything that is not nspluginwrapper-0.9.91.4/debian/*** has to go to a patch
[05:24] <asac> in debian/patches/
[05:24] <asac> e.g. in your 002_...
[05:25] <asac> expect the hunks for bashism that are already moved to a patch
[05:25] <gnomefreak> http://pastebin.mozilla.org/113963 is my 002 patch as it is
[05:25] <gnomefreak> that is right right?
[05:26] <asac> no
[05:26] <gnomefreak> if i pull the npw-config.c where is the use of the patch come in other than changelog
[05:26] <asac> the debian/* stuff doesn't belong there
[05:27] <asac> in debian/patches/* there *must not* be any debian/... patch
[05:27] <asac> just patches against upstream sources
[05:27] <gnomefreak> so i remove all of the changelog stuff
[05:27] <asac> gnomefreak: it should never have ended up there
[05:27] <asac> but yes
[05:27] <gnomefreak> do we want the changelog stuff added by hand?
[05:27] <gnomefreak> to changelog?
[05:28] <gnomefreak> wait maybe its there
[05:28] <gnomefreak> nvm damn
[05:28] <asac> it should be there
[05:28] <asac> by merge
[05:28] <gnomefreak> it is
[05:29] <gnomefreak> http://pastebin.mozilla.org/113964 new patch
[05:34] <gnomefreak> asac: new ubuntu against ubuntu debdiff http://pastebin.mozilla.org/113965
[05:35] <asac> ok
[05:35] <bluekuja> back
[05:35] <asac> now debian vs ubunt?
[05:35] <bluekuja> asac: what persia said on his mail?
[05:35] <gnomefreak> http://pastebin.mozilla.org/113966
[05:35] <gnomefreak> debian vs ubutnu
[05:37] <bluekuja> asac: in fact, one vote is not the final decision
[05:38] <bluekuja> that's why there are 2 council members
[05:38] <asac> gnomefreak: you still have the cruft
[05:38] <asac> outside debian dir
[05:38] <bluekuja> *5
[05:38] <asac> do you see?
[05:38] <asac> look at debian vs ubuntu diff
[05:39] <asac> there should be no diff outside debian/ dir
[05:39] <asac> gnomefreak: just try to build and you will see that it fails
[05:40] <gnomefreak> it failed on thier patches
[05:41] <asac> yes
[05:41] <asac> because you didn't remove them
[05:41] <asac> from upstream source
[05:41] <gnomefreak> 1 out of 1 hunk FAILED -- rejects in file utils/mkruntime.sh
[05:41] <asac> as i said
[05:41] <gnomefreak> Patch 001_remove_bashisms.diff can be reverse-applied
[05:41] <asac> you still have cruft
[05:41] <asac> look at the debdiff
[05:41] <asac> and you will see
[05:41] <asac> the patches in debian/patches are fine -> don't touch
[05:41] <asac> remove the diffs against upstream sources
[05:42] <asac> bluekuja: i haven't received any mail
[05:42] <bluekuja> he cced only motu-council
[05:42] <bluekuja> https://lists.ubuntu.com/archives/motu-council/2007-July/000214.html
[05:42] <bluekuja> here it is
[05:42] <gnomefreak> give me a around line number and dont say line 89 and 90
[05:43] <gnomefreak> this debdiff is what DaD changed and what i changed btw
[05:44] <gnomefreak> not to mention the script grabs 3 sources
[05:44] <asac> bluekuja: do you have any decent email client and can bounce that mail to me?
[05:45] <asac> e.g. not forward
[05:45] <asac> -> really  bounce
[05:45] <bluekuja> I use tbird
[05:45] <asac> there is a bounce mail extension
[05:45] <asac> search for it
[05:45] <bluekuja> ok
[05:45] <bluekuja> give me a min
[05:45] <asac> gnomefreak: look at it
[05:46] <asac> everything that is a diff that doesn't belong to debian/ dir has to go
[05:46] <gnomefreak> i am
[05:46] <asac> yes then you will find
[05:46] <asac> look at debian vs ubuntu debdiff
[05:46] <gnomefreak> see that is the dir im running it from
[05:47] <gnomefreak> same dir that i ran ubuntu vs ubuntu
[05:47] <asac> i don'tknow what you are talking about atm
[05:47] <asac> the dir doesn't matter
[05:47] <asac> the debdiff just contains cruft
[05:47] <asac> e.g. changes that are now in a patch
[05:47] <asac> all those have to go
[05:49] <gnomefreak> line 90ish
[05:49] <gnomefreak> maybe its getting in there when the patch is applied?
[05:49] <asac> all of that
[05:49] <asac> yes of course it gets in there
[05:49] <asac> it has to be reverted manually
[05:49] <gnomefreak> from debdiff
[05:49] <asac> no its not getting in there if the debian/patches/ patch is applied
[05:49] <asac> it gets in there when the automatic merge is attempted
[05:49] <asac> you have to revert it
[05:50] <gnomefreak> ah ok
[05:50] <gnomefreak> so edit those files
[05:50] <asac> its not giving  you any conflicts because it just applies cleanly
[05:50] <asac> revert the patch parts
[05:50] <asac> the normal way is to patch it reversed
[05:50] <asac> copy the patches you don't want to another file
[05:50] <asac> then patch it with -R
[05:51] <asac> or manually edit ... but that is a pita if you are doing huge things
[05:51] <asac> e.g. copy the diffs you don't want to /tmp/donwant.patch
[05:51] <gnomefreak> check those files to see if the patches are needed
[05:51] <asac> then patch -p1 -R < /tmp/dontwant.patch
[05:51] <asac> he?
[05:51] <asac> i already checked a hundred times
[05:51] <asac> those patches are duplicated atm
[05:51] <asac> you have them in debian/patches/
[05:51] <asac> and you have them in general diff.gz
[05:52] <asac> e.g. directly patched against upstream sources
[05:52] <gnomefreak> how the hell did that happen
[05:52] <asac> because those files where patched in previous version
[05:52] <bluekuja> asac: done
[05:52] <asac> so the merge applied it ... and had no problem to do soe
[05:52] <gnomefreak> ok so pull debians patches out
[05:52] <asac> he?
[05:52] <asac> no
[05:52] <bluekuja> asac: redirected to your mail
[05:52] <asac> bluekuja: can you please explain gnomefreak what he has todo
[05:53] <gnomefreak> the patches i dont want are in the debdiff
[05:53] <bluekuja> asac: yup
[05:53] <asac> upstream moved changes from diff.gz to patches in debian/patches/
[05:53] <bluekuja> gnomefreak, what's the problem?
[05:53] <gnomefreak> those are debians 2 patches
[05:53] <asac> now he has patches in debian/patches
[05:53] <asac> but still upstream source is directly patched
[05:53] <asac> as you can see in
[05:53] <asac> http://pastebin.mozilla.org/113966
[05:53] <asac> line 91ff
[05:54] <bluekuja> yup
[05:54] <asac> the patch we had against debian is already in debian/patches too
[05:54] <gnomefreak> the patches that were applied are on the debdiff those are 000 and 001 both added by debian
[05:54] <asac> its just to wipe all diffs that are not in debian/ directory
[05:55] <asac> yes ... plus we had a patch as well
[05:55] <asac> which we now moved to 002
[05:55] <asac> so everything has to go
[05:55] <gnomefreak> right
[05:55] <bluekuja> gnomefreak, anyway your remaining changes are bad
[05:55] <gnomefreak> define everything
[05:55] <asac> gnomefreak: everything not affecting debian/
[05:55] <asac> has to go out of diff.gz
[05:56] <bluekuja> gnomefreak, are you merging now?
[05:56] <gnomefreak> bluekuja: `yes
[05:56] <bluekuja> gnomefreak, a lot of changes
[05:56] <bluekuja> are not documented
[05:56] <bluekuja> in your current changelog entry
[05:57] <bluekuja> e.g
[05:57] <bluekuja> #
[05:57] <bluekuja> -Depends: ${shlibs:Depends}, ia32-libs, ia32-libs-gtk, linux32
[05:57] <bluekuja> #
[05:57] <bluekuja> +Depends: ${shlibs:Depends}, ia32-libs, linux32
[05:57] <bluekuja> you not document this
[05:57] <bluekuja> there are changes in a .sh file
[05:57] <bluekuja> (from the diff)
[05:57] <bluekuja> still not documented
[05:57] <gnomefreak> becaue debian added it
[05:57] <bluekuja> ?
[05:58] <bluekuja> you're merging
[05:58] <gnomefreak> we added it first than debian took it over
[05:58] <bluekuja> wait
[05:58] <bluekuja> current debian version has them
[05:58] <gnomefreak> * Inherit "remove bashisms" patch from Ubuntu, to remove bashisms (oddly enough!) - patch by Anders Kaseorg
[05:58] <gnomefreak> i had added that patch in version 4-2ubuntu2
[05:59] <bluekuja> gnomefreak, what are you using?
[05:59] <bluekuja> e.g dad/mom
[05:59] <gnomefreak> dad
[05:59] <bluekuja> ok, so
[05:59] <bluekuja> if you debdiff
[05:59] <bluekuja> current debian version
[05:59] <bluekuja> with new ubuntu one
[05:59] <bluekuja> (you merged)
[05:59] <gnomefreak> question why does my ubuntu vs ubuntu look right and my debian vs ubuntu now
[05:59] <gnomefreak> not
[06:00] <bluekuja> you have to debdiff
[06:00] <bluekuja> debian vs ubuntu
[06:00] <gnomefreak> bluekuja: done that
[06:00] <bluekuja> and you get that?
[06:00] <gnomefreak> http://pastebin.mozilla.org/113966
[06:00] <bluekuja> is right
[06:00] <gnomefreak> this looks right? http://pastebin.mozilla.org/113965
[06:00] <bluekuja> you have to check
[06:00] <gnomefreak> if its right wtf
[06:00] <bluekuja> previous entries too
[06:00] <bluekuja> look what asac said
[06:01] <bluekuja> #
[06:01] <bluekuja> * src/npw-config.c: NSPLUGIN_DIR environment can override default
[06:01] <bluekuja> #
[06:01] <bluekuja> +    mozilla_system_dir and can specify custom install dir for created
[06:01] <bluekuja> #
[06:01] <bluekuja> +    wrapper library
[06:01] <bluekuja> and you have it
[06:01] <bluekuja> (but you not document it)
[06:01] <bluekuja> same for * utils/mkruntime.sh: applied anti-bashism patch by Anders
[06:01] <bluekuja> you have it on your debdiff
[06:01] <bluekuja> but you not document it
[06:01] <bluekuja> you have to check for every ubuntu change
[06:02] <bluekuja> added
[06:02] <bluekuja> and report them all
[06:02] <bluekuja> checking if they are still there
[06:02] <bluekuja> (using debdiff)
[06:02] <gnomefreak> it was applie in version nspluginwrapper (0.9.91.4-2ubuntu2) gutsy; urgency=low
[06:02] <bluekuja> yea
[06:02] <bluekuja> you have to report that
[06:02] <gnomefreak> i did
[06:02] <bluekuja> as remaining change
[06:02] <bluekuja> no
[06:02] <gnomefreak> yes
[06:02] <bluekuja> you did not
[06:02] <bluekuja> I dont see it in your changelog entry
[06:03] <gnomefreak> http://pastebin.mozilla.org/113974
[06:03] <gnomefreak> its not in this version that i applied it when i applied it it was sent up already. debian took the patch and added the patch as 001
[06:03] <bluekuja> still bad
[06:05] <bluekuja> gnomefreak, you're not understanding me
[06:05] <bluekuja> :)
[06:05] <bluekuja> gnomefreak, the last link
[06:05] <bluekuja> is what you get from?
[06:05] <gnomefreak> why do i have to report anything that was already done
[06:06] <bluekuja> gnomefreak, wait
[06:06] <bluekuja> please
[06:06] <bluekuja> link me
[06:06] <gnomefreak> i reported it already
[06:06] <bluekuja> all the debdiff
[06:07] <gnomefreak> http://pastebin.mozilla.org/113976
[06:07] <asac> bluekuja: please take care that all the changes that are not against a debian/ directory are removed from debdiff ... i have to go out for a few
[06:07] <bluekuja> asac: ok, you gonna answer to hat mail?
[06:07] <gnomefreak> http://pastebin.mozilla.org/113977
[06:07] <bluekuja> *that
[06:07] <asac> bluekuja: once i received it
[06:08] <bluekuja> asac: strange
[06:08] <bluekuja> I sent it to you
[06:08] <bluekuja> already
[06:08] <gnomefreak> brb snoke
[06:08] <bluekuja> using bounce addon
[06:09] <bluekuja> asac: maybe reported as spam?
[06:11] <gnomefreak> k
[06:12] <gnomefreak> the 2 patches that are on the debdiff shouldnt be on debdiff so i should go in remove the parts of the patch from the files (since somehoe they got applied to source) right?
[06:12] <asac> bluekuja: no should be fine
[06:13] <gnomefreak> so the patch works as it should or its like double patching?
[06:13] <bluekuja> asac: mmm..strange then
[06:13] <asac> gnomefreak: no they did not get applied to source somehow ... they have moved to patches/ directory ... otherwise you would have seen a merge conflict ... which is why you might be confused atm
[06:13] <gnomefreak> the only merge conflict was control file
[06:14] <bluekuja> I'm a little less confused
[06:14] <bluekuja> of what are you doing
[06:14] <bluekuja> :)
[06:15] <gnomefreak> that makes one of us because i didnt touch the 2 patches debian had all i did was add ours
[06:15] <gnomefreak> the 002
[06:15] <bluekuja> gnomefreak,
[06:15] <bluekuja> explain me what you did step by step please
[06:16] <gnomefreak> took patch dad gave me for versiion 4-2ubuntu2 edited it and added it to debian/patches and series. changed changelog and changed control
[06:17] <bluekuja> ?
[06:17] <bluekuja> what you did?
[06:17] <bluekuja> why you touched the patch?
[06:17] <gnomefreak> http://pastebin.mozilla.org/113980 patch i added
[06:18] <gnomefreak> oh shit
[06:18] <gnomefreak> the symlinks patch is the same i added
[06:18] <bluekuja> lol
[06:18] <gnomefreak> nvm no it isnt
[06:19] <gnomefreak> it patches same file though
[06:19] <bluekuja> dont touch the patch
[06:19] <bluekuja> of ubuntu version
[06:19] <bluekuja> just grab-merge
[06:19] <gnomefreak> the patch ishowed you looks good right?
[06:19] <bluekuja> you added ut=
[06:19] <bluekuja> *it?
[06:20] <bluekuja> which patch system does it use?
[06:20] <gnomefreak> when i used grab-merge it was named something 4-2ubuntu2.patch so i edited it and added it
[06:20] <gnomefreak> quilt
[06:21] <bluekuja> gnomefreak, you dont have to touch
[06:21] <bluekuja> the patch
[06:21] <bluekuja> dad provides you
[06:21] <gnomefreak> asac: told me to get rid of everyting from debian dir related
[06:21] <bluekuja> gnomefreak, answer to me
[06:21] <gnomefreak> so i ended up with the npw-con... patch
[06:21] <gnomefreak> bluekuja: that was meant for you
[06:21] <bluekuja> why did you touch the patch dad provides you?
[06:22] <gnomefreak> bluekuja: asac told me to remove everything debian dir related from the patch dad gave me for ubuntu version not debian version
[06:22] <bluekuja> why?
[06:22] <gnomefreak> bluekuja: he said it shouldnt be in there
[06:23] <bluekuja> mmmm
[06:23] <gnomefreak> changelog entries and crap
[06:24] <bluekuja> mm
[06:24] <bluekuja> usually
[06:24] <bluekuja> you dont have to touch it
[06:24] <gnomefreak> lets start all over let me make new dir andgrab new
[06:24] <bluekuja> yeah
[06:24] <bluekuja> ^^
[06:24] <bluekuja> do it please
[06:25] <gnomefreak> care to grab it too so you know what im doing?
[06:26] <bluekuja> yeah
[06:26] <bluekuja> give me a min
[06:26] <gnomefreak> ok grabbed i got the 3 sources and a toplevel dir
[06:26] <bluekuja> ok wait me
[06:26] <bluekuja> 2 mins
[06:26] <gnomefreak> k
[06:31] <asac> hey folks .. i think i will do the merge then
[06:31] <asac> its just not comprehensible ... i mean its not really that difficult
[06:31] <asac> debian previously had not patch system
[06:32] <asac> now debian introduced patch system
[06:32] <asac> so everything has to go to patches
[06:32] <bluekuja> asac, is an easy one
[06:32] <asac> debian already did that for everything except for our nsplugindir changes
[06:32] <bluekuja> from what I see here
[06:32] <bluekuja> asac: received my redirect?
[06:32] <asac> so we have to make a patch our of it
[06:32] <asac> yes
[06:33] <bluekuja> oh it works then
[06:33] <asac> problem is that merge-script patches upstream sources because it of course applies like a charm
[06:33] <asac> which is why you need to revert it manually
[06:33] <asac> so you don't have duplicate patches
[06:33] <asac> ---> all patches belong to debian/patches/
[06:33] <asac> so when you see anything in diff.gz that is outside of debian/ hierarchy it has to go
[06:33] <asac> (but first check that the change is actually in some debian/patches/ file)
[06:34] <asac> bluekuja: yes it works
[06:34] <asac> bouncing allows me to reply now without breaking thread
[06:34] <bluekuja> oh cool
[06:34] <bluekuja> didnt know about it
[06:34] <asac> its just like i received the mail directly
[06:34] <bluekuja> yeah
[06:34] <bluekuja> really nice
[06:34] <asac> modern mailing lists have an option to safe mbox files from archive site
[06:34] <asac> but ubuntu apparently doesn' have that option
[06:35] <asac> which is a shame imo
[06:35] <bluekuja> yup
[06:35] <asac> ok out again
[06:35] <bluekuja> cu later
[06:35] <bluekuja> :)
[06:35] <asac> i will look ... if you finished the nspluginwrapper merge then i am happy :)
[06:35] <bluekuja> asac: me or gnomefreak ?
[06:35] <asac> both
[06:35] <asac> :)
[06:35] <bluekuja> :D
[06:36] <gnomefreak> after all frigging morning i not giving up
[06:36] <asac> bluekuja: please help him
[06:36] <asac> read what i said in histroy
[06:36] <asac> its all in there
[06:36] <asac> and its not really difficula
[06:36] <asac> gnomefreak has already done all
[06:36] <bluekuja> no, as I said
[06:36] <bluekuja> :)
[06:36] <asac> he just has to wipe the changes from non debian/ files
[06:37] <asac> e.g. so nothing else than debian/ files show up in diff.gz
[06:37] <gnomefreak> hence go in source files and edit the parts that are in the patches i thought would have done that
[06:39] <asac> yes
[06:39] <asac> go the way you want
[06:39] <asac> i just said patching with -R like described above will guard you from all problems
[06:39] <gnomefreak> but i didnt understand the mocing patches that i dont want
[06:39] <asac> hjmf_: when you appear ... can you drop the bug links for the debdiffs you prepared?
[06:40] <asac> he?
[06:40] <asac> anyway .... do what suites you best
[06:40] <asac> what counts is the result ;)
[06:40] <asac> not the way
[06:40] <asac> :)
[06:40] <gnomefreak> you said make a dir tmp/patchesdontwant
[06:40] <asac> mo
[06:40] <asac> no ... read again
[06:40] <asac> make a patch /tmp/patchidontwant.patch
[06:41] <asac> in that you paste the patches (e.g. diffs) you don't want
[06:41] <asac> then you just patch them with -R
[06:41] <asac> but it doesn't matter
[06:41] <gnomefreak> oh
[06:41] <asac> I will try to bring something up ... like:
[06:41] <asac> how to revert patches you don't want :)
[06:41] <asac> in wiki
[06:42] <gnomefreak> i move debdiff to temp dir. than edit them than patch using the edited versions
[06:42] <gnomefreak> than build than debdiff again
[06:43] <asac> more or less yes
[06:43] <asac> e.g. you can either remove what you want :) ... or you can create a new patch with patches/diffs that you don't want :)
[06:43] <gnomefreak> the debian vs ubuntu one was the only messed up pne?
[06:43] <asac> both will end up with a file with patches that you don't want
[06:44] <asac> gnomefreak: its the one where you can see what you don't want
[06:44] <gnomefreak> ok
[06:44] <asac> of course the other is also messed up
[06:44] <asac> but you cannot easily see what you don't want
[06:44] <bluekuja> asac: strange thing that dad messed up things
[06:44] <bluekuja> (it happens sometimes)
[06:44] <asac> bluekuja: think about it ... it didn't mess up
[06:44] <bluekuja> in fact
[06:44] <asac> it did what you want .. it merged diff into it
[06:44] <bluekuja> as you said
[06:45] <asac> its the special case that diff.gz content was moved to debian/patches/
[06:45] <asac> which is why there are no conflicts
[06:45] <bluekuja> yeah
[06:45] <bluekuja> you're right
[06:45] <bluekuja> that explains
[06:45] <bluekuja> everything
[07:30] <gnomefreak> damn it
[07:31] <gnomefreak> brb
[07:33] <gnomefreak> i might have it :)
[07:36] <gnomefreak> nope damn
[07:37] <bluekuja> gnomefreak, have you followed what alex said?
[07:38] <gnomefreak> yes and i got turned around but im back i should have it this time :)
[07:38] <bluekuja> :D
[07:53] <gnomefreak> got it
[07:53] <bluekuja> woohoo
[07:53] <bluekuja> :)
[07:54] <gnomefreak> hold that woohoo
[07:54] <gnomefreak> i did it right i swear
[07:54] <bluekuja> lol
[08:02] <gnomefreak> http://pastebin.mozilla.org/114023 what do you think? i  tried both patching and not patching the 002_nsplugindir_install.diff but either way it shows up in debdiff since i added it
[08:06] <gnomefreak> either i answered the patch questions right or wrong  if wrong i can easliy redo it and answer correctly this time :)
[08:07] <gnomefreak> its building binaries by the looks of it
[08:08] <gnomefreak> it failed because im not on 64bit but looks good.
[08:08] <asac> gnomefreak: looks reasonable right ... yes
[08:08] <gnomefreak> asac: yes i think so
[08:09] <gnomefreak> http://pastebin.mozilla.org/114023
[08:09] <asac> 002_nsplugindir_install.diff showing up is not a problem
[08:09] <gnomefreak> good :)
[08:09] <asac> actually its wanted because we added it
[08:10] <asac> its just important that what you see in that patch doesn't show up again
[08:10] <asac> like it did before
[08:10] <asac> gnomefreak: ok ... now give me a debdiff from ubuntu to ubuntu so i can update bzr repo based on that :)
[08:10] <gnomefreak> k
[08:12] <asac> gnomefreak: only thing you want to do is add an explicit section that documents the diff against debian (e.g. "left mergesn:"
[08:12] <asac> )
[08:12] <asac> explicit section in changelog
[08:12] <gnomefreak> k
[08:12] <asac> so when next merge arrives one can easily checked if anything was dropped
[08:13] <asac> just look at the debdiff (debian - ubuntu) and describe what you see there
[08:14] <gnomefreak> hmmmm
[08:14] <gnomefreak> it reverted the patches as it should have
[08:15] <gnomefreak> but at the end it added the npw-config.c patch in ubuntu vs ubuntu debdiff
[08:15] <gnomefreak> i may have to redo that
[08:15] <gnomefreak> no because its in debian dir
[08:15] <gnomefreak> we should be good let me get this up
[08:16] <gnomefreak> asac: http://pastebin.mozilla.org/114025 let me kno if i should redo this one
[08:17] <bluekuja> asac: I talked with dholbach about that guy
[08:17] <bluekuja> and he suggested me to send a mail (already sent yesterday)
[08:17] <bluekuja> to explain it
[08:17] <bluekuja> ;)
[08:24] <asac> he?
[08:24] <asac> bluekuja: sorry don't follow
[08:25] <bluekuja> asac: gauvain posted that comment on the base of this guy
[08:25] <bluekuja> comments
[08:26] <bluekuja> nvm :)
[08:30] <asac> of which guys?
[08:30] <bluekuja> mr_pouit
[08:30] <asac> or is is still anonymous?
[08:30] <asac> who is that?
[08:30] <bluekuja> no no
[08:30] <bluekuja> I talked with him
[08:30] <bluekuja> he's a MOTU
[08:31] <asac> is that the one you pissed at lately?
[08:31] <asac> because of his comments on your debdiffs?
[08:31] <bluekuja> mmm...nope, his friend
[08:31] <bluekuja> I worked with him for a week
[08:31] <asac> there you see what happens
[08:31] <bluekuja> yea
[08:31] <bluekuja> I've seen :/
[08:32] <bluekuja> both are french
[08:32] <asac> please keep any nationalism or patriotism out of this
[08:32] <bluekuja> yeah, that's not what I mean
[08:33] <asac> ok
[08:33] <bluekuja> they know very well
[08:33] <asac> right
[08:33] <bluekuja> and he pointed it out
[08:33] <bluekuja> my discussion
[08:33] <bluekuja> (via pm)
[08:33] <bluekuja> with him
[08:33] <bluekuja> (the one of debdiffs comments)
[08:33] <asac> yeah ... i knew somehow :)
[08:34] <asac> in any case ... even if you are not accepted you probably will not get rejected, but just deferred
[08:34] <asac> so don't care for it
[08:34] <bluekuja> yea
[08:34] <asac> just show that you can do better
[08:34] <gnomefreak> asac: attached debdiff to bug 123533 with the updated changelog (changelog could be better on the patch reverting part) :( thats what i came up with im still kind of burnt out from this damn thing
[08:34] <ubotu> Launchpad bug 123533 in nspluginwrapper "nspluginwrapper merge new debian version" [Undecided,In progress]  https://launchpad.net/bugs/123533
[08:34] <bluekuja> asac: anyway 4 votes are missing
[08:34] <asac> gnomefreak: congrats
[08:34] <asac> gnomefreak: you did well
[08:34] <gnomefreak> ty :)
[08:35] <gnomefreak> ty for the help bluekuja and asac
[08:35] <asac> at last :)
[08:35] <gnomefreak> lol
[08:35] <asac> gnomefreak: next time it gets better
[08:35] <bluekuja> gnomefreak, np
[08:35] <bluekuja> feel free to ask
[08:35] <bluekuja> everytime
[08:35] <gnomefreak> i hope it does get better
[08:35] <asac> finally you got more experienced to look at diffs, right?
[08:36] <asac> e.g. can you read the debdiff you produced?
[08:36] <bluekuja> asac: anyway, I can't understand latest comment by emmet
[08:36] <asac> gnomefreak: e.g. what changes exist ... and what file they affect?
[08:36] <bluekuja> it does not make sense
[08:36] <asac> bluekuja: please ... get over it ...  i will add one more comment and then wait
[08:37] <bluekuja> asac: yup
[08:37] <asac> all he said is that it makes sense to look closer if there is any negative feedback from a mc member
[08:37] <bluekuja> asac: you know how I'm done
[08:37] <bluekuja> for this stuff
[08:37] <asac> sure
[08:38] <bluekuja> and usually I feel really sad
[08:38] <bluekuja> (which is bad)
[08:38] <asac> don't do that
[08:38] <asac> right
[08:38] <asac> just concentrate on what you are doing :)
[08:38] <asac> not on what others are doing ;)
[08:38] <bluekuja> yeah, that's the right thing to do
[08:38] <bluekuja> but sometimes
[08:38] <asac> bluekuja: maybe look at the sven luther case in debian
[08:39] <bluekuja> for NM?
[08:39] <asac> and you will learn why people get allergic if someone tries to convince anyone
[08:39] <asac> no a DD who got thrown out lately
[08:39] <bluekuja> oh
[08:39] <bluekuja> what he did?
[08:39] <asac> just search for sven luther in google :)
[08:39] <gnomefreak> yes i do know what the changes are and what files  (after looking at the for 6hours i better)
[08:40] <bluekuja> yeah, searching right now :D
[08:40] <asac> he just did not stop pushing his opinion on anyone
[08:40] <asac> if you disagreed or stated an opinion he couldn't follow he would repeat his arguments over and over again
[08:41] <bluekuja> asac: he's not more a DD then?
[08:41] <bluekuja> for that
[08:42] <asac> http://lists.debian.org/debian-project/2007/03/threads.html#00241
[08:42] <gnomefreak> how does a vote make you able to declair yourself a leader :(
[08:42] <asac> read a few on that page
[08:42] <asac> its not all ... since some are only in -private
[08:42] <asac> bluekuja: he has been expulsed
[08:42] <bluekuja> aww
[08:42] <asac> bluekuja: and finally he has even been banned from all debian lists
[08:42] <asac> and irc
[08:43] <bluekuja> 0_9
[08:43] <asac> and if that happens in debian then its really hard
[08:43] <bluekuja> *0_0
[08:43] <asac> i mean ... people say: thats censoring et al
[08:45] <asac> its not easy to find ... if you go to debian-project archive ... there should be length threads
[08:45] <asac> where you can better see how he replies to each and everyone
[08:45] <asac> always saying the same things
[08:46] <asac> as if people didn't understand what he said
[08:46] <asac> http://wiki.debian.org/DebianInstaller/FransPopAndOthersVs.SvenLutherIssue/SvenLutherThinking
[08:46] <bluekuja> yeah
[08:46] <bluekuja> found that too
[08:46] <asac> there has even been a wiki page set up for that
[08:47] <asac> one of the many mediation attempts
[08:47] <asac> all started that fras pop revoked his commit rights to debian-installer
[08:47] <asac> which he refused to accept
[08:47] <gnomefreak> looks like glibc was uploaded
[08:47] <asac> in the end frans pop left the project because of this constant attacks
[08:48] <bluekuja> frans was a DD too?
[08:48] <asac> yeah ...lead of debian-installer
[08:48] <gnomefreak> oh how much i hate those auto replies to emails :(
[08:48] <asac> auto replies?
[08:48] <bluekuja> sven luther was a famous DD then
[08:48] <bluekuja> for his work I mean
[08:49] <bluekuja> debian-installer is a really important package
[08:49] <bluekuja> and part
[08:49] <asac> no
[08:49] <gnomefreak> yeah guy on debian bug 297293 has one set
[08:49] <ubotu> Debian bug 297293 in mozilla-thunderbird "mozilla-thunderbird: profiles imported from (older) mozilla mailnews might fail to copy mail to Sent-Folder" [Important,Open]  http://bugs.debian.org/297293
[08:49] <asac> sven luther just did the powerpc port
[08:49] <bluekuja> oh
[08:49] <asac> frans pop was the lead
[08:49] <gnomefreak> where it replies with out of office
[08:49] <bluekuja> oh, so I did only powerpc port
[08:49] <bluekuja> *he
[08:50] <bluekuja> there are huge discussions
[08:50] <asac> yeah ... about 80% the mails of last year i would guess
[08:50] <asac> and even more on debian-private
[08:50] <asac> which is not public
[08:50] <asac> (luckily)
[08:51] <bluekuja> who got debian-private access?
[08:51] <asac> DD
[08:52] <bluekuja> oh k
[08:52] <asac> its usually to announce vacations
[08:52] <bluekuja> oh :D
[08:52] <bluekuja> cool
[08:52] <asac> but its actually the place were discussion takes place that hurts feelings and attacks others et al
[08:52] <asac> not a good place after all
[08:56] <asac> gnomefreak: yeah .. auto-reply is a major issue
[08:56] <asac> you are luck if you don't get endless bouncing
[08:56] <asac> like we had once ;)
[08:58] <asac> ok out for an hour or so
[08:58] <gnomefreak> have fun
[08:58] <bluekuja> cu later
[08:58] <bluekuja> ;)
[08:59] <gnomefreak> signal 5 is X related
[08:59] <gnomefreak> by the looks of it
[08:59] <gnomefreak> asac: when you get back see bug 122858 for signal 5 and sebs conclusion
[08:59] <ubotu> Launchpad bug 122858 in firefox "[gutsy]  firefox crash on a _XError" [High,Confirmed]  https://launchpad.net/bugs/122858
[09:02] <asac> yeah its not a glib bug
[09:02] <asac> my bet its compiz
[09:03] <gnomefreak> i would agree on that
[11:09] <gnomefreak> asac: you around or still off?
[11:18] <asac> sure
[11:18] <gnomefreak> oh bug 123622
[11:18] <ubotu> Launchpad bug 123622 in firefox "Add third party default prefs to firefox" [Wishlist,New]  https://launchpad.net/bugs/123622
[11:18] <gnomefreak> im thinking thats just looking for issues
[11:19] <asac> telephone
[11:19] <gnomefreak> k
[11:24] <asac> actually i don't see the point
[11:24] <asac> its already possible
[11:24] <gnomefreak> please comment if you get time :)
[11:24] <asac> just install a .js file inside that
[11:25] <asac> invalidated
[11:25] <asac> if he claims its not possible ping me again
[11:25] <gnomefreak> k
[11:26] <asac> https://launchpad.net/ubuntu/+source/ubufox
[11:26] <gnomefreak> you got it done?
[11:26] <asac> yes
[11:26] <asac> waiting for build to finish to smash it through binary NEW
[11:26] <asac> then i can upload new firefox
[11:27] <asac> that drops lots of ubuntu-* patches
[11:27] <gnomefreak> sweet
[11:27] <gnomefreak> you have a branch for ubufox?
[11:27] <asac> yes
[11:27] <asac> https://code.launchpad.net/ubufox/
[11:27] <asac> main is just ubufox
[11:27] <asac> and ubuntu is the package
[11:28] <gnomefreak> k
[11:28] <gnomefreak> ty ill play a bit with it
[11:28] <gnomefreak> did you upload nsplugin stuff to branch?
[11:29] <asac> hmm you mean update?
[11:29] <asac> no not yet
[11:29] <asac> i will do nsplugin update tomorrow
[11:29] <asac> morning
[11:29] <gnomefreak> ok
[11:30] <asac> http://people.ubuntu.com/~asac/git-repo/mobile.browser.1.8.git/
[11:30] <asac> :)
[11:30] <gnomefreak> damn you have been busy
[11:31] <asac> i have been more busy figuring out how to setup the branch repo than actually bootstrapping the mobile browser
[11:31] <asac> basically its still firefox
[11:31] <asac> but you configure with --enable-application=midbrowser
[11:31] <asac> instead of browser
[11:31] <asac> i am still unsure if git repo is really how its ment to be done :/
[11:31] <gnomefreak> cool
[11:32] <asac> gnomefreak: btw, you remember the canvas build failure?
[11:32] <asac> it happens with firefox as well
[11:32] <asac> its that you have to use system-cairo in order to make it succeed
[11:33] <gnomefreak> i think so
[11:33] <asac> apparently the in-source cairo is borked that ships with firefox 2.0
[11:33] <gnomefreak> it is
[11:33] <gnomefreak> its causing crashes
[11:33] <asac> (e.g. same for sunbird 0.5)
[11:33] <gnomefreak> maybe not insource but libcario is
[11:33] <asac> so where did we fail now for sunbird?
[11:33] <gnomefreak> asac: same place same error
[11:33] <asac> yes ... i don't remember the exact error
[11:33] <asac> do you have link at hand?
[11:34] <asac>  /lastlog pastebin will bring me lots of links :(
[11:34] <gnomefreak> i doubt it let me check
[11:34] <gnomefreak> http://gnomefreak.pastebin.ca/596546
[11:34] <asac> is that current build error?
[11:35] <gnomefreak> one of more use on mozilla pastebin but not sure of the link
[11:35] <asac> ah right ... this crazy autocomplete thing
[11:35] <asac> wierd stuff
[11:35] <gnomefreak> ill build in a bit and upload a new error log if you need
[11:35] <asac> no ... it will probably fail
[11:35] <asac> gnomefreak: please push to a private branch
[11:35] <asac> so i can build what you have
[11:35] <asac> i really have to play around a bit to find what is missing
[11:35] <gnomefreak> ok give me afew
[11:39] <gnomefreak> no i seem to not beable to :(
[11:39] <gnomefreak> bzr: ERROR: Unable to connect to SSH host bazaar.launchpad.net; EOF during negotiation
[11:40] <gnomefreak> EOF end of file?
[11:44] <asac> he?
[11:44] <asac> yes
[11:44] <asac> but that doesn'matter
[11:44] <asac> how did you try to push?
[11:47] <gnomefreak> wtf
[11:47] <gnomefreak> [Errno 13]  Directories directly under a user directory must be named after a product name registered in Launchpad <https://launchpad.net/>.
[11:47] <gnomefreak> so much for that
[11:48] <gnomefreak> bzr push --create-prefix sftp://gnomefreak@bazaar.launchpad.net/~gnomefreak/sunbird/ubuntu-0.x
[11:48] <gnomefreak> change sunbird to trunk?
[11:49] <asac> hmm
[11:49] <asac> no not sunbird
[11:49] <asac> aeh don't change i mean
[11:49] <asac> hmm
[11:49] <asac> push as ubuntu-1.8.x
[11:49] <asac> or ... just push as ubuntu
[11:50] <asac> as we will probably not maintain other branches
[11:50] <asac> and its unsure what release policy upstream has
[11:50] <asac> so go for just ubuntu
[11:50] <asac> i guess the EOF was just a temporary issue
[11:50] <asac> the url looks good that you used
[11:51] <asac> next time just try ubuntu instead of ubuntu-0.x
[11:51] <gnomefreak> it was
[11:51] <gnomefreak> none of it works
[11:51] <gnomefreak> gnomefreak@GutsyGibbon:~/gutsy_builds/work/sunbird-0.x/debian$ bzr push --create-prefix sftp://gnomefreak@bazaar.launchpad.net/~gnomefreak/sunbird/ubuntu
[11:51] <gnomefreak> Enter passphrase for key '/home/gnomefreak/.ssh/id_dsa':
[11:51] <gnomefreak> bzr: ERROR: Permission denied: '/~gnomefreak/sunbird/ubuntu': [Errno 13]  Directories directly under a user directory must be named after a product name registered in Launchpad <https://launchpad.net/>
[11:52] <gnomefreak> can we register it without well it
[11:52] <asac> you have to register
[11:52] <asac> why haven't you?
[11:52] <asac> just do :)
[11:52] <gnomefreak> i didnt know i had to
[11:52] <gnomefreak> lol
[11:52] <asac> register sunbird
[11:52] <asac> project
[11:52] <asac> set mozillateam as driver
[11:52] <asac> done
[11:54] <gnomefreak> name and display name as sunbird?
[11:54] <asac> yes ... for now its ok
[11:55] <asac> we can change later
[11:55] <asac> don't care about description for now
[11:55] <asac> just set it as subproject of mozilla
[11:55] <asac> you remember?
[11:55] <asac> :)
[11:55] <asac> we looked at the list of registered trash there
[11:55] <asac> because we talked about registering sunbird
[11:55] <asac> :)
[11:56] <gnomefreak> ah yes
[11:57] <gnomefreak> https://launchpad.net/sunbird :)
[11:58] <asac> yeah thats good
[11:58] <asac> now push your initial code ;)
[11:58] <gnomefreak> im trying
[11:59] <gnomefreak> its just sitting there this could be good sign
[11:59] <gnomefreak> its pushing :)
[12:06] <gnomefreak> it will be here when its done https://code.launchpad.net/~gnomefreak/sunbird/ubuntu-0.x
[12:07] <asac> so you used 0.x ?
[12:07] <asac> hmm ok
[12:07] <gnomefreak> yeah
[12:07] <gnomefreak> it was on the scroll back
[12:08] <asac> and deleting 4 characters from the back was too much ... boah
[12:08] <asac> :-P
[12:08] <gnomefreak> lol
[12:08] <asac> anyway ... i consider this a temporary branch anyway ... you can remove or hide or something once mozillateam branch is up
[12:08] <gnomefreak> true
[12:09] <asac> i am really unhappy that i committed the trunk tarball once
[12:09] <asac> this is why pushing initial takes ages now
[12:09] <asac> because it uploads a 35mb tarball that is never used
[12:09] <asac> unfortunately we cannot remove that revision :/
[12:10] <gnomefreak> the tarball is branched?
[12:10] <asac> the initial trunk branch i created had the embedded tarball in it ... remember?
[12:10] <gnomefreak> ah yes
[12:10] <asac> i branched from that branch for firefox ubuntu-2.0.0.x
[12:10] <asac> and so on
[12:11] <asac> so we still carry it around
[12:11] <asac> as bzr always downloads everything
[12:11] <gnomefreak> yep
[12:11] <asac> even tbird branch has it
[12:11] <asac> and paradiso
[12:11] <asac> its all in there ;)
[12:11] <asac> the invisible handicap we carry around
[12:11] <asac> ;)
[12:11] <gnomefreak> you can get rid of it
[12:11] <asac> he?
[12:12] <asac> without doing a new branch
[12:12] <gnomefreak> ssh into the branch and remove the .bzr file
[12:12] <gnomefreak> no
[12:12] <asac> haha
[12:12] <gnomefreak> you still have to upload
[12:12] <asac> no
[12:12] <asac> i ouwld have to redo everything
[12:12] <asac> e.g. merge everything over that is not the tarball checkin
[12:12] <asac> i don't dare todo that
[12:12] <asac> and its always only on initial push/pull that its a problem
[12:13] <gnomefreak> right
[12:13] <asac> and since we deal with huge tarballs everyday
[12:13] <asac> its not really much added work
[12:14] <gnomefreak> i can make this branch mozillateam branch
[12:14] <gnomefreak> :)
[12:14] <gnomefreak> i can change the ending too im sure
[12:24] <asac> you can ... but please don't until this builds
[12:24] <asac> then we should clean up revisions so that there are not so many commits (e.g. at best all the complete package rename to one big commit)
[12:24] <gnomefreak> can we clean them up?
[12:24] <asac> once we get this build we can do the clean up together so you can push
[12:24] <asac> yes
[12:24] <gnomefreak> it commited 64 by default
[12:25] <gnomefreak> and 64 is a big one
[12:25] <asac> because its not yet officially published
[12:25] <asac> which is why i want to hold back mozillateam branch publishing ... which i consider official for us
[12:25] <gnomefreak> yep
[12:28] <asac> http://people.ubuntu.com/~asac/Screenshot-Add-ons.png
[12:28] <asac> ubufox :)
[12:28] <asac> not really a big attraction ;) ... but its there
[12:28] <asac> :)
[12:29] <gnomefreak> i had to grab the orig and dsc and diff for that
[12:29] <asac> to build ubufox?
[12:29] <gnomefreak> yeah
[12:29] <asac> you can just branch the ubuntu branch
[12:29] <asac> then say:
[12:29] <asac> bzr bd --split .
[12:29] <asac> but in general you should better download the tarball to your tarballs directory
[12:30] <asac> so its the same
[12:30] <asac> especially if you plan to push this to preview
[12:30] <asac> bzr bd --split . will create a orig for you
[12:30] <asac> (just for your info)
[12:30] <gnomefreak> oh
[12:30] <gnomefreak> damn
[12:30] <asac> but ... the tarball will probably differ in md5sum
[12:30] <asac> from what i uploaded
[12:31] <asac> so better use the one you can download from launchpad etm
[12:31] <asac> amt
[12:31] <asac> atm
[12:31] <asac> damn
[12:31] <asac> http://launchpadlibrarian.net/8283205/ubufox_0.2.orig.tar.gz
[12:31] <asac> its 22k :)
[12:31] <asac> so not a big thing
[12:31] <gnomefreak> https://launchpad.net/ubuntu/gutsy/+source/ubufox this tar
[12:31] <asac> but then use the bzr branch
[12:31] <asac> the link i provided
[12:31] <asac> guess its from there ... yes
[12:31] <gnomefreak> got it
[12:32] <gnomefreak> ill set it up now i hope
[12:32] <asac> you can also branch the main branch and run sh build.sh
[12:32] <asac> then you will get an .xpi
[12:32] <asac> which you can install as user
[12:39] <gnomefreak> i still want to build debs for preview right?
[12:39] <gnomefreak> or .xpi?
[12:42] <asac> i don't know ... the extension is probably not worth much in feisty now
[12:42] <asac> even in gutsy its not
[12:42] <gnomefreak> bzr bd --merge . is the command right?
[12:42] <asac> just if you use latest firefox which doesn't have the ubuntu pref tweaks anymore
[12:42] <asac> you don't need merge
[12:42] <gnomefreak> i keep forgetting --merge
[12:42] <gnomefreak> oh ok
[12:42] <asac> because its not just debian layout
[12:42] <asac> its all in there
[12:43] <asac> gnomefreak: remember: --merge if you have debian/ -only layout
[12:43] <gnomefreak> ah ok
[12:43] <asac> if upstream source is included as well, then you don't need it
[12:44] <gnomefreak> lol its a FTB
[12:45] <asac> you don't fullfill package depdenencies?
[12:46] <gnomefreak> maybe
[12:46] <gnomefreak> its not failing there but ill see
[12:46] <gnomefreak> how would i know ther eis no debian dir
[12:46] <asac> hehe
[12:46] <asac> you branched main branch then
[12:47] <asac> which is actually upstream source
[12:47] <asac> you need core-dev branch
[12:47] <asac> e.g. ubuntu
[12:47] <gnomefreak> you didnt have another one that i saw on your LP page goes back to branch right one
[12:47] <asac> https://code.launchpad.net/ubufox/
[12:47] <asac> the ubuntu one is in realm of core-dev
[12:47] <asac> i am just upstream author
[12:47] <asac> its always better to look at code page of project
[12:48] <asac> and not of team/person
[12:48] <gnomefreak> good point
[12:48] <asac> i could have done this as a native package ... e.g. not with orig.tar.gz
[12:48] <asac> but i hope i can make something out of it that is good for other distributors as well
[12:48] <gnomefreak> its pushed
[12:48] <asac> which is why i split it up in upstream branch
[12:49] <asac> and ubuntu branch
[12:49] <asac> he?
[12:49] <gnomefreak> the sunbird branch
[12:50] <asac> ah great
[12:50] <asac> i will pull it in a minute
[12:50] <asac> can you please add mozilla-bugs as bug contact for ubufox package?
[12:50] <asac> https://launchpad.net/ubuntu/gutsy/+source/ubufox
[12:50] <asac> https://launchpad.net/ubuntu/gutsy/+source/ubufox
[12:50] <asac> damn
[12:50] <asac> https://bugs.launchpad.net/ubuntu/+source/ubufox/
[12:50] <gnomefreak> yep i can
[12:50] <asac> thats the page
[12:51] <gnomefreak> just the one?
[12:51] <asac> yes
[12:51] <gnomefreak> that was fast
[12:52] <gnomefreak> done
[12:52] <asac> great
[12:55] <asac> ok sunbird build is going ... lets see what happens
[12:55] <gnomefreak> good luck
[12:55] <asac> ;)
[12:55] <gnomefreak> let me know what you find
[12:56] <asac> sure
[12:56] <asac> i will send you a patch :)
[12:56] <asac> but lets see how fast it fails
[12:56] <asac> javascript engine appears to build like a charm :) ... naturally of course
[12:56] <gnomefreak> eh i dont think you will need a patch i still thinging configure options but shhhh
[12:56] <gnomefreak> it failes damn near end of it
[12:56] <gnomefreak> -e
[12:57] <asac> not patch like in patch in debian/patches
[12:57] <asac> patch like bzr diff :)
[12:57] <gnomefreak> ah ok that will work
[12:57] <gnomefreak> brb smoke
[12:57] <asac> sure
[01:02] <gnomefreak> btw how do you read when it moves so damn fast
[01:07] <asac> i see them :)
[01:07] <asac> i know where to look
[01:07] <asac> e.g. i can see
[01:07] <asac> lude ../../../../mozilla-config.h -Wp,-MD,.deps/nsLeafBoxFrame.pp nsLeafBoxFrame.cpp
[01:07] <asac> so i know its buildding something in layout engine
[01:08] <asac> if you look of the bottom of the terminal you often can see what file is currently build
[01:08] <asac> if its really fast you might see the pattern e.g. it creates .jar files or something like that
[01:09] <gnomefreak> ah ok
[01:09] <gnomefreak> yeah i catch bits and peices of it
[01:10] <asac> yeah ... if you looked often enough you will recogize :)
[01:10] <asac> especially if you looked at most of those files once
[01:10] <asac> and if you know exactly what modules exist in code its getting easier to identify at least some that you know