We've been using the name "upstream-repo" for an additional local Git
remote pointing to upstream's Git repository since 2013 or 2014.

Recently it looks like tools (git-buildpackage) and people (cf. a
recent thread on -devel) are converging on the name "upstreamvcs".
Since one is not better than the other I think we should just follow,
change our stuff and be done with it.

For that purpose, 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).

(For updating local clones it should be enough to run
`dpt-upstreamvcs' in a loop over all directories for the renaming.)

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.


Cheers,
gregor, from DebCamp

--
.''`. https://info.comodo.priv.at -- Debian Developer https://www.debian.org
: :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06
`. `' Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe
`-

-----BEGIN PGP SIGNATURE-----

iQKTBAEBCgB9FiEE0eExbpOnYKgQTYX6uzpoAYZJqgYFAmhvjuJfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEQx RTEzMTZFOTNBNzYwQTgxMDREODVGQUJCM0E2ODAxODY0OUFBMDYACgkQuzpoAYZJ qgaG8g//fyBCIz289JckmCrVD4UudjNhalcWE0Z0DKl3KR7EcD1vIPOuJSpI13ba H6NbD8MatoqgFJOb8Jd/NfhmR2cWLQhXXmp/1hbVjzUHi7VM1JZrq39zxB26o1t8 i6F8Dlcmg2e+c0OY2P1cGgdxiG5FB9C+Y5ewm7f18WKPLz9pUtfsBAFQo20QFH01 TYocr36kKjC5yZY2gFcWleaIDngehm0/vCCdmul335K4ooPMWi8h43eqFnpPhkNQ uj73fsh1Xd0ZoU+qIKVjkjOwFv/ul6KyRPM4chLj3ZTtb2lPVNi3vybxfPeclRLF 7flLREf4VcBLHRugbZ5Ag6aPUYtQnfAE9gOaZYlvhSlrjEPfWzcL8wTZxNYHkBwc xMV3XQ2TqxCEIGXYhnmRpgAzSpa0sFHDpyD8AKYwR4xmNGikgYo9s0kIu1eEzpwe 0xPc3FPVIHgylTQfUIHVYOKAZnsLobWaNRpRUZ0EkjEc/P9HtgEWmtMMIqy4mQ0F OlJIq3Hthv/jTcuX8Nq/B+gIm+gUqbhTCYwPYQGbvUH1gAjAqB24zsE2AGcGgOpL 4UNb55yYLMgsMXh9tIriPRdylui2D7wAt8eHumJv0BiZT78ZmRSGlWGqsv7P6Xuz 7s0ncrMARwea9jVpYaNEK8eP6+yH0E/Wlj6AZjV8AMeh/AywonA=
=AOmA
-----END PGP SIGNATURE-----

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

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 '[email protected]: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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
: :' : 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

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEj5GyJ8fW8rGUjII2eTz2fo8NEdoFAmh+jykACgkQeTz2fo8N Edq8/xAAgeZ6mflWUrvScZ5VZbNOEZkftUJpA1RAnQSEQeDVGdsVDKYpKqXNv1Ke M70+P+ml5L0okNlANFfiUSiAVjt51wjzvO7UJ8GwfQJrIXX5xvyArAW7+VhGO3x5 wrh9dyzVNsMS3PNa6S6xH8m7aMZgexrHzQf1eQyckUKH7Pe3Wf0m/n8iSBia2Sgp DVlwDwt0QP7rHEAE152+9rr8EY5HRRYoe9uU8FalV+Pj7GN5Z24OIwIs6Cn9MD4X ShMt8Ez6tHiY5HziIrneO+rNJUYchpD/MWKUVVAtPRQmXg1+h9IfwZL5diq2a0my W439hvB8586il/njft1OlLgDnRbLdH5QixlaBd65OysH8meAFEIJ3T9rnTvAFBpH fmJRi7eAKzl898i8kb8BCsQ6E54Muzl9hqCvqmNIoKvSe5h+97mxByOU4B/wZKzk tp4Sj49IWZKqQ8QPUaGokbXhJBaqszc7EBcEGtk0cijsxZq6i01t7ua3swTRtc+2 ArI/6+dl6ey+eOODJ3ihljt9KXUCvL6i/rNC02ytiKIiCefsufH6MTqMVrk511/N 9YDJduSwCxch3aBxZgQAD9Jl30L080bt+0g4vH9i/DyatihXSzcuAylgV2dbAa4r 2T/oEGcGtdVwgL5aVtFbYNGWJyZF/LXhH3H8p

On Mon, 21 Jul 2025 21:04:09 +0200, �tienne Mollier wrote:

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:

Thanks for testing!

$ 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:

Ack, this is all just about an additional local Git remote.

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:

That's the whole idea of dpt-upstream{-repo,vcs} :)

And this should also happen with `mr up' with our fancy .mrconfig
(from meta.git). Did you have a chance to test this as well or can
someone else, who uses this tool, test it (with the 'upstreamvcs'
branch in meta.git)?

Therefore, I have no objections in seeing the upstreamvcs change
merged in the main branch of pkg-perl-tools.

Great, thanks!

(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

Nice!

This looks to do the trick. I added some delay to avoid
hammering github or other forges.

That shouldn't be necessary, as the changes only affect the local
repo.


Cheers,
gregor

--
.''`. https://info.comodo.priv.at -- Debian Developer https://www.debian.org
: :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06
`. `' Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe
`-

-----BEGIN PGP SIGNATURE-----

iQKTBAEBCgB9FiEE0eExbpOnYKgQTYX6uzpoAYZJqgYFAmh+tShfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEQx RTEzMTZFOTNBNzYwQTgxMDREODVGQUJCM0E2ODAxODY0OUFBMDYACgkQuzpoAYZJ qgYvSA//WYGcnVEKy1/yO3QaeGEnks6kEFLBwmxz6bPXQqn3rp0qqSEY/P57g4zO Ij1rks7GUFY8duUC8/Yhjt6+1dLVFDEWhJFMoB+ofHuTX5Z+LiB+fGxiUKaHjdNF 30jp/ijExDTkgWSJ+KltlJYRD9f63uJb5I4iIJeh/inUpNlvWvX4ZHye+dU2WD4H tzKX1HEFYfooPivmSoxAhbG/+TBXniYChA5RbLDJK0C7/NzzkXg6wmg3nw3GVn6u nHKa8BFhvSUz9DYJxt75qANciObzCrDys5LMIohB7y/mrKJFDy1DcyLDOK718Mzk 1Y78waiYSp2fvEqCNlG4Rvfd2WN1wTi1sAPexc2gCH21rb/vPkrs1qIY+1YazhX0 AkAlqcDYzKFeoLxGCPcTn4upmY163VGWN1D8Hvf1HReNhKjdcfpPsHxuy0r2b7vo wqvDMNsiLRjZsCOh2OqcE8dQQJC3w1qMMzOoofFD0uSbLtE/CADW8oeWh/5Qv6dh
Y4GE