Hi!

I'll start renaming the HEAD git branches to main for all dpkg.org git
repos. The dpkg one I'll defer until I've released 1.20.8 and opened
HEAD for 1.21.x.

The rationale is that, while I'm far removed from a direct environment
where the current name could be interpreted as offensive or triggering, language defines our thought and society. It's an easy gesture to do
when this can affect other people. The provenance of the current name
is not great either. And the new name is shorter, more descriptive,
various hosting sites are already defaulting to it, and newer git
releases will default to it soonish.

To update your work directories you can do something like the
following once the main branch appears:

,---
git fetch origin
git remote set-head origin main
git remote prune origin
git branch -u origin/main
git branch -m main
git remote -v
git branch -a
`---

Thanks,
Guillem

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

This is great work.. THANKYOU

<div dir="auto">This is great work.. THANKYOU</div>

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

On Sat, 2021-03-20 at 02:26:31 +0100, Guillem Jover wrote:

I'll start renaming the HEAD git branches to main for all dpkg.org git
repos. The dpkg one I'll defer until I've released 1.20.8 and opened
HEAD for 1.21.x.

This is done now for all of them.

Thanks,
Guillem

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

Hi Helge!

On Wed, 2021-04-14 at 04:37:45 +0200, Guillem Jover wrote:

On Sat, 2021-03-20 at 02:26:31 +0100, Guillem Jover wrote:

I'll start renaming the HEAD git branches to main for all dpkg.org git repos. The dpkg one I'll defer until I've released 1.20.8 and opened
HEAD for 1.21.x.

This is done now for all of them.

It seems like you pushed into master (revivifying it) instead of main.
I've removed the master branch again and added a check in a hook to
avoid this in the future, should have done that initially. :) But no
worries, really. I've also queued the commit you pushed into the update
I'm preparing, but feel free to push it yourself in case you've got
other queued work that you want to push. Otherwise I'll try to push it
during the weekend or so.

Thanks,
Guillem

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

This is a MIME-formatted message. If you see this text it means that your E-mail software does not support MIME-formatted messages.

Hello Guillem,
On Sat, Aug 21, 2021 at 06:39:35AM +0200, Guillem Jover wrote:

On Wed, 2021-04-14 at 04:37:45 +0200, Guillem Jover wrote:

On Sat, 2021-03-20 at 02:26:31 +0100, Guillem Jover wrote:

I'll start renaming the HEAD git branches to main for all dpkg.org git repos. The dpkg one I'll defer until I've released 1.20.8 and opened
HEAD for 1.21.x.

This is done now for all of them.

It seems like you pushed into master (revivifying it) instead of main.

Sorry. I usually try to use the right branch. To make sure I don't
make further mistakes:

I currently see (with "git branch"):
1.16.x
1.17.x
1.18.x
1.19.x
backup-1.19.x
fehler
lenny
* master
sid
squeeze
stable

So I would issue
git branch -r origin/main main
git checkout main

And would work on this one, correct?
(Would it be possible to delete the master branch locally as well, so
that I could not even switch to this? - sorry for my limited git
knowledge and thanks).

Also which branch will be for future bullseye backports versions?

I've removed the master branch again and added a check in a hook to
avoid this in the future, should have done that initially. :) But no

Thanks.

worries, really. I've also queued the commit you pushed into the update
I'm preparing, but feel free to push it yourself in case you've got
other queued work that you want to push. Otherwise I'll try to push it
during the weekend or so.

Actually the very same submitter has sent me quite a few further
potential fixes I was going to review and commit over the weekend. But
I can hold this off as long as it is necessary for you to prepare.

Greetings

Helge

--
Dr. Helge Kreutzmann debian@helgefjell.de
Dipl.-Phys. http://www.helgefjell.de/debian.php
64bit GNU powered gpg signed mail preferred
Help keep free software "libre": http://www.ffii.de/

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

iQIzBAABCAAdFiEEbZZfteMW0gNUynuwQbqlJmgq5nAFAmEgiPwACgkQQbqlJmgq 5nDsqw/9EDeI5AvJ4uu2/IfHx1GJsGorEEGF9qBPoeT0bjsPsKaVluAt/tMnlZAq JcBQUKs/vLqSkrGYGMlhkGGRHd/AJCfocZ+JQyLqx0xm8xyrdRIFTs9TnHEOLoRY N2pn7D1BzoVZ4Uv8ewyKCh95WNWiYiNvPmejP9cfNe4msgZDgaVurU4NmJmhSV9d YlbclRpuIQRixFZV+sSRlhFizhO6X7kxhQ2OWFlM3FNjyRsKV5jOu48XCOS+cJRN qD64+JcvYH8RnaP94DOOlDcuBmZQCFkQPnlooS32slrMMKC4fp88pug7/ts2Rajn i1ygImriFbNMmyxo/Pyh0Vcs4EITamvdrdlBbQa3pdTv5RGEcndId5/dHqM8A2hp ogC6DcMmmEh67iN0UCc7CXuAzdwPo8km2UjiZUvy+FgFUxxMQi0I7YtxSeTPN9yH lk7j950VM3lbmgroMUEoPE4e+/GIxkxWIQKMjcZGggakcFWuXF18f3oIuIoDlcHG YUV4RO+cV2+atQxdNh1gaBv/9D38VtnP2lEE7li2LXRfeG1rL1LDD2RTJJgpBJ3H IrLC5n3BUfdie4wPB/f4HTa/0CtXefszW4mcUCU

This is a MIME-formatted message. If you see this text it means that your E-mail software does not support MIME-formatted messages.

Hallo Guillem,
On Sat, Aug 21, 2021 at 07:03:45AM +0200, Helge Kreutzmann wrote:

On Sat, Aug 21, 2021 at 06:39:35AM +0200, Guillem Jover wrote:

On Wed, 2021-04-14 at 04:37:45 +0200, Guillem Jover wrote:

On Sat, 2021-03-20 at 02:26:31 +0100, Guillem Jover wrote:

I'll start renaming the HEAD git branches to main for all dpkg.org git repos. The dpkg one I'll defer until I've released 1.20.8 and opened HEAD for 1.21.x.

This is done now for all of them.

It seems like you pushed into master (revivifying it) instead of main.

So I would issue
git branch -r origin/main main
git checkout main

I used "git switch main". I hope this works.

And would work on this one, correct?
(Would it be possible to delete the master branch locally as well, so
that I could not even switch to this? - sorry for my limited git
knowledge and thanks).

Also which branch will be for future bullseye backports versions?

I assume "bullseye"

Actually the very same submitter has sent me quite a few further
potential fixes I was going to review and commit over the weekend. But
I can hold this off as long as it is necessary for you to prepare.

I integrated them now, I hope this time correctly.

Btw. I saw the following in git log:
While we do not generate this file at build time, but dpkg(1) does parse
it for its --verify command, and generates it if missing from the binary
package on unpack.

Does this page appear in the po(t) file? How is it translated?


Greetings

Helge

--
Dr. Helge Kreutzmann debian@helgefjell.de
Dipl.-Phys. http://www.helgefjell.de/debian.php
64bit GNU powered gpg signed mail preferred
Help keep free software "libre": http://www.ffii.de/

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

iQIzBAABCAAdFiEEbZZfteMW0gNUynuwQbqlJmgq5nAFAmFHW+UACgkQQbqlJmgq 5nBA7BAArySw239nHMeiSGAiDZ2kekdCnp/jflrBz7FPb+cwNeUpEOJi0pOLA41Y uHblvJXyx29acE6/k8YkCVJwzkmvPVviFKT9NHbqnOxzSjRp3zKhFWpEnqyAzMnm g6XfNGDGXZ/QOjVkR9fdXAVnCn/VqbebsnLuHyznTxbRt40WWk/JPaOkaIJcLRhT 65p770fUdMjqA0HKhAk8NZNd5PTPPP9zTVwYFM5f7RD/9KEmsNRgPiMRXsGVHa03 5WQIuopFNARPCkjWqQvs+QXyDxCD+vPZCGOsIeGlr7+qtbYkyEFB3YsXp/fldz0C pA3rLApTnREtx9Uk2wv+mauTcuh28kb5luen51RdOTduUcx44g79QGYb4qtEUO/Y z+SmhgjPzf43OSK7sZPTwuyFA2T5ufXdqsRRqJlNLj11JBqM7YZ63n2f1+fXzGiF s2Tmk8K80k9v+Z8iVLwS0MVJTUJIIw9nX3HqqbRqNcyl2p7acPz5C/Dxq0MR28bj zJb5MBUuESmR0y5hCDPENNGO2YWfkkSP9numVvU98LgOhnBpKz5/D1B6B+5eNvw7 72zwkGL36qQYdO2BjMb/FM4T+bPboFvvKpvdnOJ

Hi!

[ Sorry, it seems I never followed up. I think you figured it all out,
but in any case. ]

On Sun, 2021-09-19 at 17:48:56 +0200, Helge Kreutzmann wrote:

On Sat, Aug 21, 2021 at 07:03:45AM +0200, Helge Kreutzmann wrote:

On Sat, Aug 21, 2021 at 06:39:35AM +0200, Guillem Jover wrote:

On Wed, 2021-04-14 at 04:37:45 +0200, Guillem Jover wrote:

On Sat, 2021-03-20 at 02:26:31 +0100, Guillem Jover wrote:

I'll start renaming the HEAD git branches to main for all dpkg.org git
repos. The dpkg one I'll defer until I've released 1.20.8 and opened HEAD for 1.21.x.

This is done now for all of them.

It seems like you pushed into master (revivifying it) instead of main.

So I would issue
git branch -r origin/main main
git checkout main

I used "git switch main". I hope this works.

That would switch to another branch, you might still want to see
whether you have some pending commits in your local master branch, and
once you've cherry-pick'ed them you can remove the branch with:

git branch -D master

(watch out the -D is destructive and will force the removal even if
there is a delta.)

And would work on this one, correct?
(Would it be possible to delete the master branch locally as well, so
that I could not even switch to this? - sorry for my limited git
knowledge and thanks).

Also which branch will be for future bullseye backports versions?

I assume "bullseye"

Indeed.

Actually the very same submitter has sent me quite a few further
potential fixes I was going to review and commit over the weekend. But
I can hold this off as long as it is necessary for you to prepare.

I integrated them now, I hope this time correctly.

Right, sorry I queued them but they sat locally for too long.

Btw. I saw the following in git log:
While we do not generate this file at build time, but dpkg(1) does parse
it for its --verify command, and generates it if missing from the binary
package on unpack.

Does this page appear in the po(t) file? How is it translated?

Hmm, sorry the commit message was not very clear. I was referring to
the md5sums file shipped in a .deb here, the man page is translated
and generated as usual. So this should be fine.

Thanks,
Guillem

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