On 05/28/2013 03:11 PM, Emmanuel Bourg wrote: > Le 28/05/2013 15:42, Florian Rothmaier a écrit : > >> You could try (I give the commands from the beginning): >> >> git clone http://anonscm.debian.org/git/debian-science/packages/jsamp.git >> cd jsamp/ >> git checkout -b upstream origin/upstream >> git checkout debian >> git-buildpackage -us -uc --git-debian-branch=debian --git-upstream-tree=branch --git-upstream-branch=upstream >> >> This way I was able to build the package. > > I was able to build with: > > git-buildpackage --git-debian-branch=debian --git-upstream-tree=branch > > > I'm not an expert with the Git tool chain and I would understand if you > say this layout is required for a specific reason. As an amateur > maintainer I would just say that I really appreciate when > git-buildpackage works out of the box without extra arguments. That's > one less hurdle for maintaining the package. I agree with Emmanuel that it would be nice to have "debcheckout $foo; cd $foo ; git-buildpackage" always work without any additional steps. The convention is to build from "master" for pkg-java packages, but other teams may be using other conventions. (And in fact, not all pkg-java packages currently build this way - perhaps we could clarify some conventions.) Anyway, one way to address issues like this is to add a debian/gbp.conf file and set the name of the branch (and any other settings required). In this case, the file would contain: [DEFAULT] debian-branch = debian This is also helpful when a packaging repository contains multiple branches - e.g. one for experimental, one for sid, one for stable security, etc. Post-release it is useful to create a branch for security - e.g. tomcat7 will need a "wheezy" branch for security updates. Should that be called "security/wheezy" or just "wheezy" ? (BTW, tomcat7 currently uses exp/master for experimental.) I'm not aware of a set of established conventions for this for the Java team, but perhaps there are some out there. Can anyone point to GBP branch naming convention in use by another team? Thank you, tony
Attachment:
signature.asc
Description: OpenPGP digital signature