Path: csiph.com!fu-berlin.de!bofh.it!news.nic.it!robomod From: Peter Wienemann Newsgroups: linux.debian.maint.python Subject: Re: Upload request: psrecord (NEW) Date: Sun, 01 Dec 2024 17:50:01 +0100 Message-ID: References: X-Original-To: Alexandru Mihail X-Mailbox-Line: From debian-python-request@lists.debian.org Sun Dec 1 16:48:39 2024 Old-Return-Path: X-Amavis-Spam-Status: No, score=-109.849 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DKIMWL_WL_HIGH=-0.34, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, LDO_WHITELIST=-5, RCVD_IN_DNSWL_MED=-2.3, UNPARSEABLE_RELAY=0.001, USER_IN_DKIM_WELCOMELIST=-0.01, USER_IN_DKIM_WHITELIST=-100] autolearn=ham autolearn_force=no MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Debian-User: wiene X-Mailing-List: archive/latest/22586 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/e9da7171-880a-47e7-abf3-7954675596e1@debian.org Approved: robomod@news.nic.it Lines: 56 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Cc: debian-python@lists.debian.org X-Original-Date: Sun, 1 Dec 2024 17:48:21 +0100 X-Original-Message-ID: X-Original-References: <80fe104d-453c-4555-b656-c3123a3bbe35@debian.org> <2f0bf5b0ed4df279b81295343eacf66f9d5ddf35.camel@gmail.com> <3145534b-cf5e-4cd9-b0f6-23133f24914a@debian.org> Xref: csiph.com linux.debian.maint.python:16506 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