On 6 May 2016, at 9:13 PM, Martín Ferrari <tin...@tincho.org> wrote: > > Hi Tim, > > On 06/05/16 02:12, Potter, Tim (HPE Linux Support) wrote: > >> Hi Martin. Here's my process for creating a backport from an existing >> pkg-go repository. I >> might be able to get some help to do this for the ~160 packages if you are >> willing to do >> the uploads. >> >> $ git clone $REPO >> $ git checkout -b debian/sid # initial branch is master >> $ git checkout -b debian/jessie-backports > >> $ vi debian/gbp.conf # create new or update existing file >> [DEFAULT] >> pristine-tar = True >> debian-branch = debian/sid >> upstream-branch = master > > Not completely sure what does this do, but looks wrong to me :)
Right, that is more confusing now than when I wrote it last week. I'm still OK with the philosophy behind DEP-14 and maybe some tool configuration will become obvious after time has passed. I like the proposal that we keep master as the ongoing development branch. Merges could be done between the master and debian/sid branches before release. >> $ dch -i >> [Create new changelog entry with jessie-backports suite and ~bpo8+1 version >> suffix] >> $ git commit debian/changelog -m "Upload to backports" >> $ git tag debian/$VERSION~bpo+1 >> $ git push origin --tags master debian/sid debian/jessie-backports > > This seems convoluted and too complicated... What I have been doing for > prearing backports (but I only started a week ago), is this: > > $ git checkout -b debian/jessie-backports (from either master or debian/sid) > $ dch --bpo "" && sed -i 4d debian/changelog Ah, that's a much better idea. I didn't realise dch had support for backports like that. [...] > A couple of things to take into account: you most probably will need to > set versioned dependencies in dh-golang (if the package is using > xs-import-path you need 1.10), and golang-go (because hipster > programmers :)) Good point. I had forgotten about that. I think it's a mix of versioned and non-versioned, with and without the trailing ~ also so care would need to be taken. Tim. >> I'm not sure whether you want to delete the master branch and set >> debian-branch to >> debian/sid. I think this is what you have done in some of the other pkg-go >> repos you >> are maintainer for. Happy to go with whatever you think is right. > > In the packages I prepared, debian/sid is the initial branch from the > start. THere is no big deal about keeping master, but I prefer > debian/sid personally, it's consistent and explicit. Also, it gives me > no extra work, beause I set the repo so it is the default branch. > > > -- > Martín Ferrari (Tincho)
signature.asc
Description: Message signed with OpenPGP using GPGMail
_______________________________________________ Pkg-go-maintainers mailing list Pkg-go-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-go-maintainers