On Fri, 16 Jun 2017 13:07:04 +0100 Sean Whitton <spwhit...@spwhitton.name> wrote: > On Fri, Jun 16, 2017 at 10:45:35AM +0200, Johannes Schauer wrote: > > currently, when following the dgit-maint-merge man page on how to > > debianize a new upstream project that releases tarballs only, one runs > > into the following problem: > > > > % gbp import-orig ../foo_1.2.2.orig.tar.xz > > 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. > > > > So the instructions are missing a step that creates the new branch. > > Thanks for reporting this. Here's a patch, though I think we need to wait > for #864881.
Your patch makes the whole process quite convoluted. How about this instead: $ mkdir foo $ cd foo $ git init $ gbp import-orig --upstream-branch=upstream --debian-branch=master --upstream-tag='%(version)s' --sign-tags --no-pristine-tar ... This also avoids an empty commit at the root of the upstream branch. Also, did you test this approach? I'm getting: gbp:info: Importing '/home/josch/git/deb/searx_0.12.0+dfsg1.orig.tar.xz' to branch 'upstream'... gbp:info: Source package is searx gbp:info: Upstream version is 0.12.0+dfsg1 gbp:info: Merging to 'master' gbp:error: Automatic merge failed. gbp:error: Error detected, Will roll back changes. Maybe one should also look into the config file again because options like pristine-tar-commit do not appear in /etc/git-buildpackage/gbp.conf and do not even seem to have a corresponding command line equivalent and other options like sign-tags seem to belong into the [buildpackage] section instead of the [default] section. Thanks! cheers, josch
signature.asc
Description: signature
