[00:00] <asac> with --remember you can permanently change that
[00:00] <asac> i hope your password was your sshkey passphrase ;)
[00:00]  * asac thought we dont allow non key auth
[00:01] <asac> ccheney: so yes. we should upload a stripped libsoup package ;)
[00:01] <asac> to ppa for bootstrap
[00:01] <asac> and hope thats it
[00:01] <asac> actually while we rename it ;)
[00:02] <asac> but for now we can try without rename
[00:02] <asac> ccheney: so soup w/o gnome .... then see what webkit needs from glib
[00:14]  * ccheney needs to get the rest of the glib functions into soup to get it to finish building, saw the proxy issue earlier and didn't finish porting the functions over yet
[00:15] <ccheney> looks like ~ 21 functions to copy over
[00:22] <asac> does that build?
[00:26] <asac> 01:22 < jorlow> trimeta: can you disable extensions and try again?
[00:26] <asac> 01:22 < jorlow> it'd be especially helpful if you knew which one put it over the edge
[00:26] <asac> 01:22 < trimeta> Disabling AdThwart, Chrome Keyconfig, FlashBlock, RSS Subscription, and Select To Get Maps made them not crash. So yea.
[00:26] <asac> lol
[00:26] <asac> in #chromium ;)
[00:26] <asac> thats bugabundo ;)
[00:30] <ccheney> doesn't build without the functions but gets to the point of attempting to link all of libsoup together
[00:30] <ccheney> so it probably will work once i get them ported
[00:30] <asac> yeah
[00:31] <asac> so when we have that we have to check ewbkit and port whatever is needed there ;)
[00:36] <ccheney> yep
[00:36]  * ccheney going to get dinner, bbl
[08:42] <ripps|sleep> fta: ping
[09:25]  * BUGabundo_eyeswi yawns
[10:05] <fta> ripps, hi, did you read my answers?
[10:06] <ripps> yeah, I was bit confused, are you telling me to try and rename the orig.tar?
[10:06] <ripps> because doing that also changed the changelog version with the bot parses it. So it doesn't work either
[10:08] <fta> look at the current version in the repo, the tarball doesn't have the epoch, yet the package has it
[10:09] <fta> fta@ix:/tmp $ head -1 mplayer-1.0~rc3+svn20090426/debian/changelog
[10:09] <fta> mplayer (2:1.0~rc3+svn20090426-1ubuntu10.1) karmic-proposed; urgency=low
[10:09] <fta> -rw-r--r--  1 fta  fta  10029266 2009-06-07 16:04 mplayer_1.0~rc3+svn20090426.orig.tar.gz
[10:09] <fta> -rw-r--r--  1 fta  fta      2673 2009-12-09 07:05 mplayer_1.0~rc3+svn20090426-1ubuntu10.1.dsc
[10:09] <fta> -rw-r--r--  1 fta  fta     73589 2009-12-09 07:05 mplayer_1.0~rc3+svn20090426-1ubuntu10.1.diff.gz
[10:10] <fta> my bot won't work for that just yet, i need to fix it, should be easy, but i didn't have time just yet
[10:33] <ripps> okay, I guess I'll have to manage my the coreavc ppa manally for now.
[10:33] <ripps> Lot of eager people want to try out the new coreavc-2.0
[10:49] <fta> ripps, i will try to fix it asap, i just need to setup a test project with an epoch
[10:49] <ripps> well, there's mplayer, but I suppose that's a bit too large...
[11:54] <asac> [reed]: root certificates ... can admins add that somehow to firefox
[11:54] <asac> for all users?
[11:54] <[reed]> define "admins"
[11:55] <asac> like X working in a company having root on linux boxes
[11:56] <asac> so typical desktop sys administrator ... running around rolling out software to various machines etc.
[11:57] <asac> from what i recall mozilla was scared that distros could mess up their root certificates too easily and hence there is no way to add root certs to /etc/... somehow
[11:57] <[reed]> not easily... he could create a default firefox profile with the cert and push it out
[11:57] <asac> ;)
[11:57] <asac> hmm
[11:57] <[reed]> but any new profile wouldn't have it
[11:57] <asac> do you know about references that discussed why there is no way to add a /etc/ sec store for firefox?
[11:58] <asac> or nss even
[11:59] <[reed]> nope, not without searching
[12:13] <asac> hi hjmf  ;) happy new year!
[14:57]  * BUGabundo_work picks asac up, and move him to #ubuntu+1 
[14:57] <asac> topic?
[14:57] <BUGabundo_work> sir, your presence is required
[14:57] <BUGabundo_work> http://paste.ubuntu.com/351809/
[14:57] <BUGabundo_work> apparmor
[14:58] <asac> apparmor. yes.
[15:10] <asac> jdstrand: did you land all apparmore improvements on all branches?
[15:10] <asac> or just 3.5?
[15:11] <jdstrand> asac: all
[15:12] <jdstrand> BUGabundo_work, asac: I've not seen /dev/shm/orbit-yofel/linc-dff-0-6e09a978f6b2 before-- what is this?
[15:13] <yofel> jdstrand: good question... lemme try to find out
[15:13] <asac> hmm. he is here ;) ... why are we talking in #ubuntu+1 ;)
[15:13] <yofel> asac: that's where the discussion began ;)
[15:13]  * asac left that channel ;)
[15:14] <jdstrand> yofel: it might be we need to update an abstraction, rather than the firefox profile
[15:14] <asac> kk
[15:15] <micahg> asac: xul193 failed a sqlite test that upstream moz added which I think was caused by a fix by upstream sqlite, I should open a new bug in bmo with the relavent info, rigt?
[15:16] <asac> micahg: test?
[15:16] <asac> you mean like in "make check" ?
[15:16] <asac> or configure test?
[15:16] <micahg> no
[15:16] <micahg> http://hg.mozilla.org/mozilla-central/rev/06dd18a36470
[15:17] <micahg> yeah, I guess it's a configure test
[15:18] <micahg> there was a debian bug for pretty much the same thing as the moz bug and the debian maintainer said it was fixed in the latest sqlite
[15:19] <micahg> hmmm, they already have a bug to upgrade to the latest sqlite...
[15:20]  * micahg thinks he should go as in #developers
[15:20] <micahg> *ask
[15:22] <asac> whats the problem?
[15:22] <asac> our sqlite isnt built with that flag?
[15:22] <micahg> asac: no, it is
[15:22] <micahg> but sqlite apparently changed the way the flag works
[15:23] <micahg> asac: this is the change that might have caused the issue: The SQLITE_SECURE_DELETE  compile-time option fixed to make sure that content is deleted even when the truncate  optimization applies.
[15:24] <nigel_nb> hi, is bug 503107 a known issue for firefox in ubuntu?
[15:25] <micahg> asac: #developers wants to know why we use system sqlite :)
[15:34] <micahg> nigel_nb: sorry, got a little distracted
[15:35] <nigel_nb> micahg: no problem :)
[15:35] <micahg> nigel_nb: adblock plus can cause the issue that the user's having
[15:35] <nigel_nb> micahg: I do encounter that bug often
[15:35] <micahg> I generally suggest a new profile
[15:36] <micahg> I can pastebin the text
[15:36] <nigel_nb> and a new profile works too
[15:36] <nigel_nb> but is it a bug, that the profile is getting corrupted?
[15:36] <micahg> nigel_nb: this is generally what I use: http://pastebin.ubuntu.com/351828/
[15:36] <micahg> nigel_nb: no, abp is blocking flash
[15:36] <micahg> unless the user allows it
[15:37] <nigel_nb> micahg: ohh
[15:37] <micahg> nigel_nb: people shouldn't be installing addons without understanding what they do
[15:37] <nigel_nb> hold up, it happens to me too
[15:37] <nigel_nb> but I dont think I have add block
[15:37] <micahg> nigel_nb: so I choose for people to have a eureka moment rather than have me tell them the issue
[15:37] <micahg> then once they discover it, I usually explain the problem
[15:38] <nigel_nb> micahg: but I dont have adblock installed, so what could be my issue?
[15:38] <micahg> nigel_nb: what issue?
[15:38] <micahg> you can't see videos?
[15:38] <nigel_nb> I encouter the same thing, flash stops working often
[15:39] <nigel_nb> then I have to create a new profile
[15:39] <nigel_nb> (at least I'm learning all my passwords now)
[15:39] <micahg> nigel_nb: you shouldn't have to do that
[15:39] <micahg> nigel_nb: 64 bit or 32 bit?
[15:40] <nigel_nb> 64-bit
[15:40]  * micahg hasn't really had a problem with flash since the upgrade to karmic
[15:40] <nigel_nb> micahg: you use 32-bit?
[15:40] <micahg> nigel_nb: no, 64 bit
[15:40] <micahg> nigel_nb: bug 238606
[15:40] <micahg> is that your bug?
[15:41] <asac> using 64 bit flash?
[15:41] <nigel_nb> that sounds similar to mine
[15:41] <yofel> jdstrand, asac: it seems like I found the actual root cause... for some reason I had 'export TMPDIR=/dev/shm' at the end of my .bashrc, this causes orbit-yofel to be in /dev/shm instead of /tmp and this seems to break apparmor
[15:42] <asac> sounds bad ;)
[15:42] <asac> doesnt feellike a bug
[15:42] <nigel_nb> micahg: oh, by the way, what status do u want me to set on those bugs? invalid? incomplete?
[15:43] <micahg> nigel_nb: which bugs?
[15:43] <micahg> people with addons they don't understand?
[15:43] <nigel_nb> micahg: the flash not working on firefox bugs
[15:43] <micahg> nigel_nb: that can be a lot of things
[15:43] <nigel_nb> micahg: oh oh
[15:44] <micahg> there are at least 2 master bugs for flash issues
[15:44] <jdstrand> yofel: cool. if you want to use /dev/shm as TMP, then update /etc/apparmor.d/abstractions/user-tmp
[15:44] <nigel_nb> micahg: shall I link this one up as a dup of 238606?
[15:45] <micahg> nigel_nb: no, first you have to determine if it's a user issue or that bug or another
[15:45] <yofel> jdstrand: wouldn't it be somehow possible to make apparmor read $TMPDIR?
[15:45] <nigel_nb> micahg: ok, how do I start?
[15:45] <micahg> nigel_nb: ask the user to test with a new profile
[15:46] <micahg> then you can rule out non-system addons
[15:46] <nigel_nb> micahg: okay, I'll put in the pastebin you gave me and then set as incomplete
[15:46] <jdstrand> yofel: not easily, besides you wouldn't want to cause it could be used to circumvent apparmor. eg TMPDIR=/
[15:46] <micahg> nigel_nb: yep
[15:47] <jdstrand> yofel: that is why the abstraction is there-- it is designed for people like you who need to define another tmp dir
[15:47] <yofel> jdstrand: ah, makes sense, thx anyway
[15:47] <nigel_nb> micahg: thanks :)
[15:47] <micahg> nigel_nb: thank you for helping
[15:48] <nigel_nb> happy to help micahg :)
[15:48] <yofel> asac: thank you too for your time
[15:48] <micahg> jdstrand: I wanted to comment out of that ff bug about /usr/local/lib, I would think if anything it should be commented out
[15:48] <micahg> jdstrand: but wanted to check with you first
[15:49] <asac> yofel: welcome
[15:50] <jdstrand> micahg: sorry, I don't understand your question
[15:50] <asac> apparmor?
[15:50] <micahg> jdstrand: the bug about /usr/local/lib in the apparmor profile
[15:50]  * jdstrand nods
[15:50] <asac> we defintly want warnings in dmesg if users access /usr/local/lib
[15:51] <micahg> bug 501822
[15:51] <asac> would be a big win triaging bugs because users ran make install on ancient gtk or something
[15:51] <asac> yeah. if we could misuse apparmore to just warn (even if enabled) i would be happy ;9
[15:51] <micahg> well, wasn't there a bug to warn on apparmor failure
[15:52] <jdstrand> asac: not possible.  the profile can be in complain, force or completely disabled
[15:52] <jdstrand> (it's a kernel thing)
[15:53] <micahg> jdstrand: can we have a complain profile and a force profile?
[15:53] <asac> yeah. then i would prefer to not block /usr/local/lib ;K)
[15:53] <jdstrand> micahg: not loaded at the same time
[15:53] <micahg> jdstrand: I'm suggesting with separate rules
[15:54] <jdstrand> micahg: the profile attaches to the binary
[15:54]  * micahg was thinking from a seucrity perspective, /usr/local/lib could cause issues
[15:54] <jdstrand> micahg: so we can't do that
[15:54] <micahg> jdstrand: ah
[15:54] <jdstrand> well, actually, I might be able to play with 'audit'
[15:55] <jdstrand> actually no, that wouldn't work
[15:55] <jdstrand> and it would be confusing for the user
[15:56] <micahg> bug 489278
[15:56] <jdstrand> micahg: my feeling was that /usr/local/lib could cause issues, but overall, you need admin access for those directories anyway
[15:56] <jdstrand> if you have that, you can change the profile
[15:56] <micahg> jdstrand: yes, but regular users have sudo rights on ubuntu desktops :)
[15:57] <micahg> if they're following so blog post that's malicious, they won't know it
[15:57] <micahg> *some
[15:57] <jdstrand> micahg: well, we aren't protecting a user from him/herself. that is very difficult. we are protecting users from a misbehaving firefox
[15:57] <jdstrand> firefox can't write to /usr/local/lib
[15:57] <jdstrand> (due to apparmor)
[15:57] <jdstrand> even via sudo
[15:57] <micahg> that's why I figure if it's commented out like some of the other more permissive things it might be better
[15:58] <jdstrand> (cause apparmor denies it)
[15:58] <micahg> jdstrand: even firefox using libs in there might cause issues
[15:58] <jdstrand> micahg: oh, I think I understand your question-- you say add it to the profile, but have it commented out
[15:58] <micahg> yep :)
[15:58] <jdstrand> gotcha
[15:58] <micahg> since it's not a regular use case
[15:58] <micahg> as in most users using software from the repos won't need it
[15:58] <jdstrand> no it isn't, but I feel for that guy who spent months on it
[15:59] <micahg> yeah, that why bug 489278 would be nice
[15:59] <jdstrand> but people use firefox differently than other apps
[15:59] <jdstrand> specifically, we try to support using extensions, etc
[15:59] <jdstrand> (not from the repo)
[15:59] <micahg> jdstrand: yes, but I don't think those go in /usr/local/lib do they?
[16:00] <jdstrand> this will be even more important moving forward when we aren't shipping extensions in the repo due to maintenance issues and the new mozilla security support
[16:00] <jdstrand> micahg: probably not, but a user may want to install stuff there, if they compile from source
[16:01]  * jdstrand was even considering adding /usr/local/lib/** mr, to abstractions/base
[16:01] <micahg> jdstrand: yes, but what if someone install a malicious deb package that installs in /usr/lib/local
[16:02] <jdstrand> micahg: a malicious deb can do far worse than install a lib in /usr/local/lib to be then later be used by the user in some random app
[16:02] <jdstrand> it runs as full root
[16:02] <jdstrand> that deb could install that lib in /usr/lib
[16:02] <micahg> jdstrand: yes, but wouldn't it be harder to find something in there?
[16:03] <jdstrand> it would be even harder to find it in /usr/lib
[16:03] <jdstrand> if you are installing random debs off the internet, all bets are off
[16:03] <jdstrand> they can disable apparmor entirely
[16:03] <jdstrand> install a rootkit
[16:03] <jdstrand> anything
[16:03] <micahg> hmm, ok, that's why I figure I'd talk to you since my concerns might not be valid
[16:04] <jdstrand> micahg: it is always valid to think about the security of adjusting the profile
[16:04] <jdstrand> micahg: so thank you :)
[16:05] <jdstrand> I'm still thinking about /usr/local/lib for firefox, and wanted to get discuss it more with the others from the security team
[16:05] <micahg> jdstrand: I also wanted to ask you about backporting some of the FF profile fixes to karmic
[16:05] <micahg> spcifically chromium
[16:05] <micahg> oops
[16:05] <jdstrand> micahg: iirc, you said you wanted to do an SRU
[16:05] <micahg> chromium was for something different
[16:05] <micahg> jdstrand: yeah, and then an SRU got uploaded without it
[16:06] <micahg> should I rebase it?
[16:06] <micahg> chromium was for browser abstractions
[16:06] <micahg> but I think there were a few profile fixes that would be nice for karmic, but I'd have to check
[16:06] <jdstrand> micahg: feel free to do an SRU with all the profile fixes you want, attach it to to one of the bugs and follow StableReleaseUpdates. ping me and I'll comment on the debdiff
[16:07] <micahg> jdstrand: great, thanks
[16:07] <jdstrand> np
[16:50] <micahg> asac: we don't want firefox displaying local php scripts in the browser as text, right?
[16:53] <asac> micahg: i would think if there is a system handler for that, then not. otherwise yes.
[17:47] <sebner> asac: ping
[17:58] <sebner> asac: is that something for ubuntu? (The idea, not the work itself :P) http://www.be-jo.net/de/2010/01/thunderbird-als-starter-ins-indicator-applet/
[18:20] <asac> last time i looked this was really hackish
[18:21] <sebner> asac: what's the difference between evolution and thunderbird? Evolution is a little bit more gnome integrated
[18:23] <asac> sebner: the difference is that its  a complete different code base
[18:23] <sebner> asac: but what's the difference difficulties for integrating TB into indicator?
[18:25] <asac> the difference is that TB 3 was a huge effort and integrating with indicator applet is low prio for them
[18:31] <fta> hi
[18:31] <sebner> asac: bah, I suppose more users are using TB than evolution to be honest
[18:31] <sebner> hiuhuhu fta
[18:32] <asac> hi fta
[18:32]  * asac starts to pack things
[18:33] <fta> ?
[19:36] <asac> : just commuting ... with all the hardware stuff i have ;)
[19:45] <micahg> nigel_nb: you got a bite on the bug
[19:45] <asac> ok out for a few hours ... travelling
[19:45] <nigel_nb> micahg: he did reply
[19:45] <nigel_nb> micahg: and he has ad block :)
[19:46] <micahg> nigel_nb: that info was already in the bug :)
[19:48] <micahg> nigel_nb: firefox bugs reported with ubuntu-bug attach extensions list and plugins
[22:39] <asac> ccheney: so lots of troubles ?
[22:39] <micahg> asac: did you spin 3.5.7 yet or do I have time tonight to try to get dh_xul in?
[22:40] <asac> micahg: is it out yet?
[22:40] <asac> ;)
[22:40] <micahg> supposed to release today
[22:40] <asac> err ... wasnt dh_xul merged already?
[22:40] <asac> or just approved?
[22:40] <micahg> asac: just approved
[22:41] <micahg> I saw your commnet
[22:41] <micahg> but wasn't able to merge
[22:41] <asac> ok. thanks
[22:41] <asac> the merge is just one command i would hope ;)
[22:41] <micahg> I kept getting errors
[22:41] <micahg> and now it's diverged
[22:41] <asac> merge erros?
[22:41] <micahg> after the arm patch
[22:41] <asac> that shouldnt collide except for changelog
[22:41] <micahg> so I'll just apply the diff from the merge
[22:42] <micahg> idk
[22:42] <asac> please run bzr merge ... that should  work
[22:42] <asac> its expected to have conflicts in changelog
[22:42] <asac> but applying the diff manually will have that too ;)
[22:42] <asac> you need to resolve those in editor and run bzr resolve
[22:43] <micahg> ok, bzr merge lp:branch?
[22:43] <asac> yeah.. go in current checkout of .head ... run bzr merge lp:....branch/to/merge
[22:43] <asac> then all should work well ... except the changelog will have conflicts
[22:44] <asac> go there with editor and shuffle bits until bzr diff looks reasonable ;)
[22:44] <asac> usually its just moving the comment he made somewhere else and removing the markers
[22:44] <micahg> hmm
[22:44] <micahg> that went smoother than last time
[22:44]  * micahg doesn't know what changed
[22:45] <asac> heh
[22:46] <micahg> hmm
[22:46] <micahg> my patch name isn't 80 character changelog safe
[22:46] <micahg> I can fix that afer
[22:46] <micahg> what should be my commit message for the merge?
[22:47] <micahg> asac: ?
[22:48] <asac> i usually use:
[22:48] <asac> debcommit -e
[22:49] <asac> and then i add one line on top saying:
[22:49] <asac> (merge lp....)
[22:49] <micahg> ?the branch name
[22:49] <asac> yes
[22:49] <asac> lp:....
[22:49] <micahg> k
[22:49] <asac> and below keep the thing debcommit suggests (e.g. basically the
[22:49] <asac> changelog comment
[22:49] <asac> remember to give credits to author by using [ Name <email> ]
[22:50] <micahg> also, you're not spinning a 1.9.1.6, so should I update the docs to say minimum version for dh_xulrunner to 1.9.1.7
[22:50] <micahg> asac: credit in the merge and changelog?
[22:51] <micahg> credit yes, email in merge and changelog?
[22:51] <asac> no... changelog
[22:51] <asac> credit is already in the merge source
[22:51] <asac> debcommit removes that automatically
[22:51] <micahg> ok, so email and name in changelog?
[22:52] <micahg> why does dch not do that, it only adds the name
[22:52] <asac> because the email is mozillateam invention
[22:52] <asac> i wanted to update dch to do that at some point
[22:52] <asac> but never came to it
[22:52] <micahg> asac: also, what about the xul-dev Q
[22:53] <asac> basically we addewd it because launchpad parses the email and links to your profile
[22:53] <micahg> asac: ok, so I should do that manually?
[22:53] <asac> which gives much better credit
[22:53] <asac> yes
[22:53] <micahg> k
[22:53] <asac> i always add it manually
[22:53] <micahg> and bump dh_xul docs to minumum >= 1.9.1.7
[22:53] <micahg> or do I need the whole version string?
[22:55] <micahg> asac: in addition to ^^, do I need to list the files in either the merge comment or changelog for dh_xulrunner?
[22:57] <asac> micahg: they should be in changelog as usual. if you use decommit -e that will be in the commit as well
[22:58] <micahg> asac: k, what about the version in teh dh_xul docs?
[22:59] <asac> thats manpage, right?
[22:59] <micahg> yep
[22:59] <asac> we should have the version where we first ship it in there
[22:59] <micahg> asac: so, it'll be 1.9.1.7?
[23:00] <micahg> asac: actually it's POD doc
[23:03] <asac> POD?
[23:03] <asac> yes 1.9.1.7 is ok
[23:03] <micahg> perl doc
[23:03] <micahg> k
[23:03] <micahg> I added all the filenames to the changelog
[23:04] <asac> thx
[23:04] <asac> thats usually the service we provide for contributors
[23:04] <asac> they dont know about the syntax
[23:05] <asac> we could comment so they know in future, but shouldnt reject a contribution because of changelog format (unless he wants to become mt member)
[23:06] <micahg> asac: I made my changes to the merge before commit, is that ok?  I figured on adding a comment with the merge that I modified the version that it will first ship in
[23:08] <asac> micahg: thats the right approach
[23:08] <asac> run bzr merge
[23:08] <micahg> cool
[23:08] <asac> adjust ...
[23:08] <asac> commit
[23:08] <bdrung> asac: am i allowed to drop the deprecated MOZ_XPI_MOZILLA_DIRS variable?
[23:08] <asac> if nothing in the archive uses that
[23:08] <asac> grep -r
[23:08] <asac> ;)
[23:08] <asac> does it cause any problem?
[23:08] <asac> if not, keep it
[23:09] <bdrung> asac: how do i get a list of all xul extensions?
[23:10] <micahg> asac: just push after?
[23:10] <asac> dunno. grepping through all diff.gz will help ;)
[23:10] <asac> bdrung: in any case. does it hurt?
[23:10] <asac> if not ... dont remove it
[23:11] <bdrung> asac: it needs some effort to support with the new design.
[23:15]  * micahg completed his first bzr merge :)
[23:15] <asac> congrats
[23:16] <micahg> asac: now, about the patch name for arm...bz532198_lp488354_ns_invokebyindex_not_thumb2_safe.patch
[23:16] <asac> is that a problem?
[23:16] <micahg> it's over 80 characters
[23:17] <micahg>     - add debian/patches/bz532198_lp488354_ns_invokebyindex_not_thumb2_safe.patch
[23:17] <asac> thats normal and the reason why we started to put filenames below the changelog
[23:18] <asac> i would expect there are more than just that ;)
[23:18] <micahg> k, so if that line wraps I shouldn't worry
[23:18] <asac> wraps?
[23:18] <asac> keep it in one line ;)
[23:18] <micahg> >80
[23:18] <micahg> right
[23:18] <micahg> one line
[23:18] <asac> good. then it isnt wrapped ;)
[23:19] <micahg> it wraps in an 80 char terminal
[23:19] <asac> heh
[23:19] <asac> your standards are too high ;)
[23:19] <asac> also 80 char is a bit old. 100 is better ;)
[23:19] <fta> ripps|sleep, u there? i have a patch to support epochs in the bot
[23:19] <micahg> k, do I need to push the arm patch to 1.9.2 and 1.9.3 or just dh_xul?
[23:20] <asac> micahg: just for 1.9.1 ... we dont want it to stay there that long
[23:20] <asac> the upstream patch will get committed hopefully
[23:20] <micahg> k, I'll try to push it upstream
[23:21] <asac> we are just not yet sure how to support debian  ;)
[23:21] <micahg> a little later
[23:21] <asac> micahg: upstream? ... it already was pushed upstream and they wanted clarfication. we are currently working on a better patch ;)
[23:22] <asac> i will probably sumit that tomorrow
[23:22] <asac> but for us that patch is perfect :)
[23:22] <micahg> asac: k, I thought you said before that upstream moz needed the arm patch
[23:22] <asac> it needs to get committed ;)
[23:22] <asac> updated
[23:22] <micahg> ah
[23:22] <asac> sorry for not being clear
[23:23] <micahg> ok, so I can just merge the dh_xul rev from 1.9.1 into 1.9.2 and 1.9.3, right?
[23:24] <asac> yep. and add the arm patch to xul 1.9.1 ... then make a release on .head
[23:24] <asac> one second
[23:24] <asac> jdstrand: there? usn's for ffox/xul update?
[23:24] <micahg> asac: arm is already in
[23:24] <asac> good
[23:24] <micahg> I'll do dh_xul on the other branches later this wek
[23:24] <micahg> *week
[23:24] <jdstrand> asac: just about missed me-- you need a new usn? how many?
[23:24] <asac> sure. thats fine
[23:25] <asac> jdstrand: the usual set.
[23:25] <asac> e.g. ffox 3.0 and 3.5
[23:25] <asac> (with the xuls)
[23:25] <micahg> my only question, is the version in the docs should still be 1.9.1.7 since that'll be the only one in an official archive?
[23:25] <jdstrand> asac: 877-1 and 878-1
[23:25] <asac> micahg: i think thats fine everywhere
[23:25] <asac> jdstrand: thanks ... enjoy your evening ;)
[23:26] <micahg> asac: k
[23:26] <jdstrand> asac: thanks, you too :)
[23:26] <asac> micahg: not sure what docs says, but i think they say what the first version was etc.
[23:26] <asac> micahg: so after all is done, see how i document security/stability updates ... and do the same with the number from above
[23:26] <asac> at best in the "bump" commit
[23:27] <asac> use 878-1 for 1.9.1.7 and 3.5.7
[23:27] <micahg> asac: you want me to spin the release?
[23:27] <asac> USN-878-1
[23:27] <asac> on .head for sure
[23:27]  * micahg can't upload
[23:27] <asac> since you did all i want to sponsore that
[23:27] <asac> thats not a problem ;)
[23:27] <micahg> k
[23:27] <micahg> let me look at past changelogs
[23:27] <asac> search for USN-
[23:28] <asac> that should be same almost everywhere
[23:28] <micahg> so, I don't need to keep an unreleased version in the changelofg, right?
[23:28] <asac> usually we have UNRELEASED on top
[23:28] <asac> that one probably is 6~... something atm
[23:29] <asac> when all is done you could bump the version to .7 ... and add the stability/security upgrade part
[23:29] <asac> then do a release commit with just dch -r -Dlucid
[23:29] <asac> like ... when done ... add the header i add for thos updates (with USN- etc) to changelog
[23:29] <asac> bump changelog version
[23:29] <asac> debcommit
[23:30] <asac> dch -r -Dlucid
[23:30] <asac> debcommit -r
[23:32] <fta> ripps|sleep, committed, please test and let me know if it works for you
[23:35] <micahg> asac: is it ok, if I have an extra line between 2 changes in the changelog (drop patch and new arm patch)
[23:35] <micahg> or should I delete it in one of these commits?
[23:40] <asac> it shouldnt have happened in first place ;)
[23:40] <asac> but well... you can just sneak fix it
[23:40] <micahg> asac: does it matter which of the 2 commits?
[23:41] <asac> so the release commit is usually just changing version and date, so i would think use the other commit :)
[23:41] <micahg> k
[23:41] <asac> but your decision. we dont want to do art here ;) ... just high quality commits in average ;)
[23:43] <micahg> k
[23:43] <micahg> I uncommitted locally and fixed it in the first commit :)
[23:43] <micahg> ok
[23:43] <micahg> I ran all the commands
[23:43] <micahg> now I just push?
[23:45] <asac> did the changes look reasonable?
[23:45] <asac> you can do bzr log -p | less
[23:45] <asac> to do a quick review
[23:45] <asac> when you are happy push ;)
[23:45] <asac> i will check
[23:46] <micahg> yep
[23:46] <micahg> pushed
[23:49] <micahg> now what?
[23:50] <asac> done?
[23:50] <asac> hehe
[23:50] <asac> let me pull
[23:50] <micahg> just did xul 191
[23:50] <asac> ah
[23:50]  * asac stops ffox pull
[23:50] <micahg> you want me to do ff?
[23:51] <asac> sure
[23:51] <micahg> k
[23:51]  * micahg will work on it
[23:51] <asac> just bump and add the same header you added to xul
[23:51] <asac> micahg: so you have one bogus line at the end of changelog in xul 1.9.1
[23:52] <asac> like the first line after the last line with text
[23:52] <asac> there are whitespaces
[23:52] <asac> and there are two empty lines
[23:52] <micahg> ugh
[23:53] <asac> hehe
[23:53] <asac> micahg: uncommit
[23:53] <asac> push --overwrite
[23:53] <asac> after checking that you didnt uncommit too much
[23:53] <asac> we have a 5 minute soft rule for uncommitting if there is a bad mistake ;)
[23:53] <asac> micahg: after uncommitting you need to delete the tag
[23:53] <asac> bzr tag --delete TAGNAME
[23:54] <asac> otherwise debcommit -r will fail
[23:54] <asac> and we will end up with two heads ;)
[23:54] <micahg> asac: where's the whitespace and 2 extra lines?
[23:54] <micahg> I deleted the one at the bottom
[23:54] <asac> micahg:     - update debian/rules
[23:54] <asac>     - update debian/xulrunner-1.9.1-dev.install
[23:54] <asac> the line right after that one
[23:55] <asac> that was an empty line with whitespaces
[23:55] <micahg> yeah, I got rid of that
[23:56] <micahg> ah, ok
[23:57] <micahg> asac: my name under the USN was correct?