Hi gregor,
gregor herrmann, on 2025-07-10:
[…]
> I've pushed a branch called 'upstreamvcs' to
> perl-team/modules/packages/pkg-perl-tools.git which changes
> dpt-upstream-repo to dpt-upstreamvcs and updates all names and references,
> and a branch also called 'upstreamvcs' to perl-team/modules/meta.git where
> the only change is in our .mrconfig (to try dpt-upstreamvcs before
> dpt-upstream-repo).
[…]
> Please review, test, comment on, improve these branches!
> I'd like to merge them (and upload pkg-perl-tools to experimental) in a
> couple of days.
I have tested `dpt upstreamvcs` and it looks to do the job just
alright, e.g. on my copy of libzonemaster-ldns-perl:
$ git branch --all
* debian/latest
pristine-tar
upstream
remotes/dgit/dgit/sid
remotes/origin/debian/latest
remotes/origin/pristine-tar
remotes/origin/upstream
remotes/upstream-repo/develop
remotes/upstream-repo/master
remotes/upstream-repo/releases/v2023.2.2
^^^^^^^^^^^^^
$ dpt upstreamvcs
I: Rename Git remote 'upstream-repo' to 'upstreamvcs'.
Renaming remote references: 100% (3/3), done.
I: Found Git remote 'upstreamvcs':
* remote upstreamvcs
Fetch URL: https://github.com/zonemaster/zonemaster-ldns.git
Push URL: https://github.com/zonemaster/zonemaster-ldns.git
HEAD branch: master
Remote branches:
develop tracked
master tracked
refs/remotes/upstreamvcs/releases/v2023.2.2 stale (use 'git remote prune' to remove)
From https://github.com/zonemaster/zonemaster-ldns
- [deleted] (none) -> upstreamvcs/releases/v2023.2.2
remote: Enumerating objects: 307, done.
remote: Counting objects: 100% (155/155), done.
remote: Compressing objects: 100% (86/86), done.
remote: Total 307 (delta 89), reused 86 (delta 65), pack-reused 152 (from 2)
Receiving objects: 100% (307/307), 136.14 KiB | 5.04 MiB/s, done.
Resolving deltas: 100% (140/140), completed with 16 local objects.
e94c0f3..3bf01b0 develop -> upstreamvcs/develop
6bcb885..1c5834d master -> upstreamvcs/master
[…] ^^^^^^^^^^^
$ git branch --all
* debian/latest
pristine-tar
upstream
remotes/dgit/dgit/sid
remotes/origin/debian/latest
remotes/origin/pristine-tar
remotes/origin/upstream
remotes/upstreamvcs/HEAD -> upstreamvcs/master
remotes/upstreamvcs/develop
remotes/upstreamvcs/master
^^^^^^^^^^^
This looks to be a local-only change requiring no coordination
whatsoever on Salsa:
$ dpt push
Everything up-to-date
$ git push --branches
Everything up-to-date
I see this is also integrated into `dpt checkout`:
$ dpt checkout zonemaster-cli
gbp:info: Cloning from 'git@salsa.debian.org:perl-team/modules/packages/zonemaster-cli.git'
zonemaster-cli ready in /home/emollier/area/debian/pkg-perl/packages/zonemaster-cli
I: Git remote 'upstreamvcs' not found, trying to add it ...
I: Adding Git remote 'upstreamvcs' with URL 'https://github.com/zonemaster/zonemaster-cli.git' ...
remote: Enumerating objects: 199, done.
remote: Counting objects: 100% (86/86), done.
remote: Compressing objects: 100% (34/34), done.
remote: Total 199 (delta 58), reused 59 (delta 52), pack-reused 113 (from 2)
Receiving objects: 100% (199/199), 67.22 KiB | 5.17 MiB/s, done.
Resolving deltas: 100% (83/83), completed with 9 local objects.
From https://github.com/zonemaster/zonemaster-cli
* [new branch] develop -> upstreamvcs/develop
* [new branch] master -> upstreamvcs/master
[…] ^^^^^^^^^^^
I mentionned a weird case on IRC with libmath-matrixreal-perl,
but that was mostly because I seem to have poorly integrated the
upstream branch when wrapping up the package five years ago.
Running dpt upstreamvcs or dpt checkout will spawn an
upstreamvcs branch which did not exist initially:
$ git log upstream
commit 29c62de6f9dfdfc50b9482ebc80582d50ebbe90c (tag: upstream/2.13, origin/upstream, upstream)
Author: Etienne Mollier <etienne.mollier@mailoo.org>
Date: Wed May 20 20:59:20 2020 +0200
Import original source of Math-MatrixReal 2.13
$ git log upstreamvcs | head
commit f42a4dedd92c569e033fd282bff825cbebad80e5
Merge: 9c7685a 3235c4d
Author: Duke Leto <duke@leto.net>
Date: Fri May 22 20:01:31 2020 -0700
Merge pull request #22 from emollier/patch-typos
fix typos landing in documentation
commit 3235c4d57b788b9e4f0414d4aeb537bc0c4a8f55
But as I mentioned, that is on me for not having properly
wrapped up the package in the first place. I think the same
behavior would have occurred with upstream-repo, and have
confidence that upstreamvcs is set just right.
Therefore, I have no objections in seeing the upstreamvcs change
merged in the main branch of pkg-perl-tools.
> (For updating local clones it should be enough to run `dpt-upstreamvcs' in a
> loop over all directories for the renaming.)
I have run the below command from my packages/ directory:
$ for dir in */; do echo "$dir"; test "$dir" != artifacts/ || continue; cd "$dir"; dpt upstreamvcs; cd ..; sleep 5; done
This looks to do the trick. I added some delay to avoid
hammering github or other forges.
Have a nice day, :)
--
.''`. Étienne Mollier <emollier@debian.org>
: :' : pgp: 8f91 b227 c7d6 f2b1 948c 8236 793c f67e 8f0d 11da
`. `' sent from /dev/pts/2, please excuse my verbosity
`- on air: Thank You Scientist - Fxmldr
Attachment:
signature.asc
Description: PGP signature