Hi Charles, On Wed, Oct 8, 2014 at 11:30 PM, Charles Plessy <[email protected]> wrote:
> Le Wed, Oct 08, 2014 at 02:15:59PM +0100, Jorge Sebastião Soares a écrit : > > Hi all, > > > > I've reinitiated work on package Fastaq: > > > > https://github.com/sanger-pathogens/Fastaq > > http://anonscm.debian.org/cgit/debian-med/fastaq.git/ > > … > > > I got: > > > > gbp:error: > > Repository does not have branch 'upstream' for upstream sources. If there > > is none see > > > file:///usr/share/doc/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.CONVERT > > on howto create it otherwise use --upstream-branch to specify it. > > Hi Jorge, > > for packages where there is an upstream Git repository, and especially when > their release tarballs are identical to their Git tags, I do not use > git-import-orig anymore. I just use the full upstream master branch as gbp > upstream branch (you can either use the name ‘upstream’ or the original > name > after editing debian/gbp.conf accordingly), and I register the upstream > source > archive using the pristine-tar command directly. > Just to see if I understood this properly. So essentially the gbp upstream branch will point to the upstream master branch. Then to push the upstream source you simply: *pristine-tar commit* tarball tag > This way we get the best of both worlds: a layout fully compatible with the > use of git-buildpackage with pristine-tar, and the full upstream commit > history. > I understand the reason. Otherwise the history of the upstream branch is lost, unless you do some git magic. I think I'm going to delete the fastaq.git project on git alioth and create a new project. Since the code is python3 only I will call it python3-fastaq. And use this new strategy. > > See > http://debian-med.alioth.debian.org/docs/policy.html#updating-git-package > if > you are interested in following that way, and feel free to suggests > enhancements > to that section. > > I think it makes sense and I will follow it. As for suggestions, maybe later when I'm more experienced. :) > Have a nice day, > Thank you. It's probably night there already. So have a good night. Regards, Jorge
