[06:53] <mdke> jbicha: thanks for taking care of yelp, that's right. I'm not sure about synching gnome-user-docs from Debian - I don't know what the state of it in Debian is. I was planning just to sync it with upstream git
[06:56] <mdke> jbicha: oh, I see that you've synched from Debian already. I guess that makes this branch out of date now - https://code.launchpad.net/~ubuntu-core-doc/gnome-user-docs/oneiric
[06:57] <mdke> jbicha: what I've been doing is maintaining that branch so that it can be easily synched from the latest upstream via "bzr merge lp:gnome-user-docs", that way we don't have to rely on Debian or upstream releases but can use the latest git
[07:01] <jbicha> mdke: whatever you like, not much has been happening in Gnome recently
[07:02] <jbicha> I figured syncing with Debian was a good start though
[07:03] <mdke> jbicha: I guess what we should do it sync the packaging of the latest package which you uploaded to that branch, so that it stays up to date, and we can keep synching with upstream Gnome when appropriate - does that make sense?
[07:04] <jbicha> mdke: you mean ship git snapshots of upstream Gnome?
[07:05] <mdke> yes, that's what we've always done in the past
[07:05] <mdke> lp:gnome-user-docs is a bzr import of the upstream git
[07:07] <jbicha> mdke: ok, that's fine, it just hadn't been pushed to the repositories yet, we were still using a rather old snapshot
[07:09] <mdke> sure
[07:09] <mdke> jbicha: do you have upload privileges?
[07:10] <jbicha> mdke: not yet...
[07:11] <mdke> it would be good to have someone who can take care of yelp uploads and so forth
[07:13] <jbicha> I help with the Desktop Team & they sponsor my uploads
[07:13] <mdke> that's great
[07:18] <mdke> jbicha: would you be able to merge the package that you uploaded to the ~ubuntu-core-doc/gnome-user-docs/oneiric branch? I could try to do it but might get stuck if there are many packaging changes - I don't understand things like quilt
[07:24] <mdke> (if you agree that it makes sense to keep that branch going)
[07:27] <jbicha> mdke: sure, but the packaging is pretty simple
[07:29] <mdke> I can give it a try this weekend otherwise
[07:36] <jbicha> mdke: what about just overwriting the branch with debian's svn experimental branch? or do you want all 1946 revisions in the source tree?
[07:46] <mdke> jbicha: I think that keeping the revisions means that we can sync more easily from the upstream branch, unless I've misunderstood
[07:46] <mdke> I may be wrong about that though
[07:47] <mdke> the branches are based on the same base
[07:53] <mdke> -> work
[07:53] <jbicha> lp:ubuntu/gnome-user-docs only has 44 revisions, I could copy that over instead
[19:55] <mdke> jbicha: I don't that lp:ubuntu/gnome-user-docs could sync from lp:gnome-user-docs, because they have different bases, but again, I may be wrong about that
[20:00] <mdke> jbicha: I recall that failing in the past but I don't know whether bzr has changed its behaviour
[20:05] <jbicha> mdke: probably not, you could just take the current oneiric branch and copy and paste the upstream git pages into it
[20:05] <jbicha> I don't know how to make it more automated and work
[20:06] <jbicha> PPA recipes can do that I believe but that's not what we're wanting
[20:07] <jbicha> I noticed today that upstream's releases exclude the .stub and .page-old, I need to add a filter like that in our rules file
[20:08] <mdke> My approach would be to copy the packaging changes that you have made manually over to lp:~ubuntu-core-doc/gnome-user-docs/oneiric, and then synching with upstream is as simple as "bzr merge lp:gnome-user-docs". But I may not have understood your response
[20:14] <jbicha> mdke: oh ok, maybe that would work, I don't have a lot of experience with merging branches
[20:15] <mdke> I think it should work, that was the whole point of maintaining gnome-user-docs in those branches