Re: Upload request: psrecord (NEW)

[Peter Wienemann <wiene@debian.org>]

Hi Alexandru,

On 2024-11-30 14:00:19, Alexandru Mihail wrote:
> Yes, there were some rogue commits in [upstream], I reimported upstream
> tar.gz and redone the whole process, it seems to build fine for me now
> in an empty sbuild.
> Seems fine now, thanks for the time; upload when you think OK.

I still see contents in the "upstream" branch which does not belong 
there, namely the "debian" directory containing your packaging files.

How do you manage the "upstream" and the "pristine-tar" branches? Those 
branches are somewhat special. There is usually no reason to touch those 
branches by hand. If you use "gbp import-orig", it takes care of those 
branches for you (see "man gbp import-orig"). It also automatically 
creates an upstream release tag for you (I do not see any in your 
repository).

An initial upstream code import could look like this:

$ mkdir psrecord && cd $_
$ git init
$ gbp import-orig --debian-branch=debian/master 
https://github.com/astrofrog/psrecord/archive/refs/tags/v1.4.tar.gz

This results in:

$ git branch
* debian/master
  pristine-tar
  upstream

$ git tag
upstream/1.4

The work on packaging the upstream code happens in the "debian" 
directory which must only be committed to the "debian/master" branch. 
Neglecting more complicated cases (uploads to distributions different 
from "unstable", handling patches, etc.) you always commit to the 
"debian/master" branch. The next commits to the "pristine-tar" and the 
"upstream" branches are added when you run "gbp import-orig" the next 
time to import a new upstream release. Again those commits to 
"pristine-tar" and "upstream" (and a new upstream release tag) are 
handled by "gbp import-orig". Importing new upstream releases can be 
done e. g. by running

$ gbp import-orig --uscan

provided you have a correctly set up gbp.conf and watch file.

I hope this clarifies the gbp workflow a bit. Sorry for not providing 
more in-depth information in my previous comments.

Best regards

Peter