[00:46] <shtylman_> when merging in changes... is it customary to get a clean checkout of the current trunk... then merge my branch into that creating just one commit and push that back?
[00:54] <evand> you generally resolve conflicts on your separate branch using bzr merge every now and again, this way the final merge applies cleanly, and you use something like bzr commit -m "Merge with my foobar branch."
[00:54] <evand> gotta run though
[00:54] <evand> bedtime
[01:01] <shtylman_> night
[07:36] <phurl> reprepro Error: Distribution doooh contains an architecture called 'all'. any ideaS?
[09:24] <cjwatson> shtylman_: generally you shouldn't touch translations at all; the most you should do is run debconf-updatepo, which updates .pot and .po files automatically from the .templates file
[09:24] <cjwatson> shtylman_: there's no need to provide English translations - those are automatic
[13:00] <stefanWW> Hello! Did any of you guys experienced any problems with installing and running ubuntu server 804 LTS on proliant servers G6 ?
[13:00] <stefanWW> it is just freezing during install
[13:52] <mterry> shtylman_, the new breadcrumbs for the kde frontend; are they translatable?
[19:58] <kirkland> evand: around?
[19:58] <kirkland> evand: i think i see a bug in the user-setup ecryptfs code
[20:01] <kirkland> cjwatson: ^
[20:02] <kirkland> cjwatson: i don't think this commit is correct: http://bazaar.launchpad.net/~ubuntu-core-dev/user-setup/ubuntu/revision/187
[20:03] <kirkland> cjwatson: the /dev/shm/.ecryptfs-$USER would exist in the chroot
[21:09] <kirkland> cjwatson: actually, i think it's more basic than that
[21:09] <kirkland> cjwatson: it appears to me that initial user password setting has changed fundamentally in some way since Jaunty
[21:09] <kirkland> cjwatson: such that it is walking the PAM stack
[21:10] <kirkland> cjwatson: in which case, the whole /dev/shm hack in user-setup-apply can go away
[21:10] <kirkland> cjwatson: i just tested this in a vm, and it works
[21:10] <kirkland> cjwatson: however, i won't commit until I confirm with you what it is in user password setting has changed
[21:11] <kirkland> http://bazaar.launchpad.net/~ubuntu-core-dev/user-setup/ubuntu/revision/179#user-setup-apply
[21:11] <kirkland> boom there it is!
[21:11] <kirkland>  
[21:11] <kirkland> 34
[21:11] <kirkland>         if $chroot $ROOT dpkg --compare-versions "$VERSION" ge "1:4.1.4-1"; then
[21:11] <kirkland>  
[21:11] <kirkland> 35
[21:11] <kirkland>                 # support for versions with PAM support (Squeeze)
[21:11] <kirkland>  
[21:11] <kirkland> 36
[21:11] <kirkland>                 if [ "$3" = true ]; then
[21:11] <kirkland>  
[21:11] <kirkland> 37
[21:11] <kirkland>                         $chroot $ROOT usermod --password=$PASSWD $USER
[21:12] <kirkland> cjwatson: i'm going to send a patch
[23:00] <kirkland> cjwatson: actually, the fix was pretty straightforward, i think.  i committed an uploaded.
[23:00] <kirkland> cjwatson: your review in retrospect would be appreciated.